This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
PATCH: Use ULL suffix on DR_CONTROL_RESERVED
- From: "H.J. Lu" <hongjiu dot lu at intel dot com>
- To: GNU C Library <libc-alpha at sourceware dot org>
- Date: Wed, 16 May 2012 06:06:04 -0700
- Subject: PATCH: Use ULL suffix on DR_CONTROL_RESERVED
- Reply-to: "H.J. Lu" <hjl dot tools at gmail dot com>
Hi,
DR_CONTROL_RESERVED is int64 for x32 and x86-64. This patch changes
DR_CONTROL_RESERVED with ULL suffix. Tested on Linux/x86-64. OK
to install?
Thanks.
H.J.
---
* 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.
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