From ce5d54b0d6b097c74835dd1df660720223284373 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Wed, 16 May 2012 10:19:17 -0700 Subject: [PATCH] Use ULL suffix on DR_CONTROL_RESERVED --- ChangeLog | 6 ++++++ sysdeps/unix/sysv/linux/x86_64/sys/debugreg.h | 7 +++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7210511a4d..133ed98262 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012-05-16 H.J. Lu + + * sysdeps/unix/sysv/linux/x86_64/sys/debugreg.h: Don't include + . Check __x86_64__ instead of __WORDSIZE. + (DR_CONTROL_RESERVED): Use ULL instead of UL suffix. + 2012-05-16 H.J. Lu * sysdeps/unix/sysv/linux/x86_64/sigcontextinfo.h: Include diff --git a/sysdeps/unix/sysv/linux/x86_64/sys/debugreg.h b/sysdeps/unix/sysv/linux/x86_64/sys/debugreg.h index 170431ed00..ef64ef353a 100644 --- a/sysdeps/unix/sysv/linux/x86_64/sys/debugreg.h +++ b/sysdeps/unix/sysv/linux/x86_64/sys/debugreg.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001, 2003 Free Software Foundation, Inc. +/* Copyright (C) 2001, 2003, 2012 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -17,7 +17,6 @@ #ifndef _SYS_DEBUGREG_H #define _SYS_DEBUGREG_H 1 -#include /* Indicate the register numbers for a number of the specific debug registers. Registers 0-3 contain the addresses we wish to trap on */ @@ -76,8 +75,8 @@ -#if __WORDSIZE == 64 -# define DR_CONTROL_RESERVED (0xFFFFFFFF0000FC00UL) /* Reserved */ +#ifdef __x86_64__ +# define DR_CONTROL_RESERVED (0xFFFFFFFF0000FC00ULL) /* Reserved */ #else # define DR_CONTROL_RESERVED (0x00FC00U) /* Reserved */ #endif -- 2.43.5