aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2012-05-16 10:19:17 -0700
committerH.J. Lu <hjl.tools@gmail.com>2012-05-16 10:19:17 -0700
commitce5d54b0d6b097c74835dd1df660720223284373 (patch)
treea607e24b8ccc9bc15930db42afc1d48d916a882c
parent13dc9eac616b866ff19098c971dd46e29d0ba30b (diff)
downloadglibc-ce5d54b0d6b097c74835dd1df660720223284373.zip
glibc-ce5d54b0d6b097c74835dd1df660720223284373.tar.gz
glibc-ce5d54b0d6b097c74835dd1df660720223284373.tar.bz2
Use ULL suffix on DR_CONTROL_RESERVED
-rw-r--r--ChangeLog6
-rw-r--r--sysdeps/unix/sysv/linux/x86_64/sys/debugreg.h7
2 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 7210511..133ed98 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2012-05-16 H.J. Lu <hongjiu.lu@intel.com>
+ * sysdeps/unix/sysv/linux/x86_64/sys/debugreg.h: Don't include
+ <bits/wordsize.h>. Check __x86_64__ instead of __WORDSIZE.
+ (DR_CONTROL_RESERVED): Use ULL instead of UL suffix.
+
+2012-05-16 H.J. Lu <hongjiu.lu@intel.com>
+
* sysdeps/unix/sysv/linux/x86_64/sigcontextinfo.h: Include
<stdint.h>.
(GET_PC): Cast to uintptr_t first.
diff --git a/sysdeps/unix/sysv/linux/x86_64/sys/debugreg.h b/sysdeps/unix/sysv/linux/x86_64/sys/debugreg.h
index 170431e..ef64ef3 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 <bits/wordsize.h>
/* 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