summaryrefslogtreecommitdiff
path: root/libc/sysdeps/unix/sysv/linux/x86_64
diff options
context:
space:
mode:
authorjoseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d>2012-06-01 21:32:32 +0000
committerjoseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d>2012-06-01 21:32:32 +0000
commit0a57a4f8f1e443295267885e3d2048f6bbb0899f (patch)
tree2b33c4c6e67c3a7a0240e7e8ec164aa9294987f8 /libc/sysdeps/unix/sysv/linux/x86_64
parentb7c6870709b68725080ae00a7accbc0463bce578 (diff)
Merge changes between r18892 and r18907 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@18908 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/sysdeps/unix/sysv/linux/x86_64')
-rw-r--r--libc/sysdeps/unix/sysv/linux/x86_64/Makefile1
-rw-r--r--libc/sysdeps/unix/sysv/linux/x86_64/sys/debugreg.h4
2 files changed, 3 insertions, 2 deletions
diff --git a/libc/sysdeps/unix/sysv/linux/x86_64/Makefile b/libc/sysdeps/unix/sysv/linux/x86_64/Makefile
index dd4ab59c5..d6a9d360d 100644
--- a/libc/sysdeps/unix/sysv/linux/x86_64/Makefile
+++ b/libc/sysdeps/unix/sysv/linux/x86_64/Makefile
@@ -1,6 +1,5 @@
ifeq ($(subdir),misc)
sysdep_routines += ioperm iopl
-sysdep_headers += sys/perm.h sys/reg.h sys/debugreg.h sys/io.h
endif
ifeq ($(subdir),stdlib)
diff --git a/libc/sysdeps/unix/sysv/linux/x86_64/sys/debugreg.h b/libc/sysdeps/unix/sysv/linux/x86_64/sys/debugreg.h
index 84a901743..de10277e2 100644
--- a/libc/sysdeps/unix/sysv/linux/x86_64/sys/debugreg.h
+++ b/libc/sysdeps/unix/sysv/linux/x86_64/sys/debugreg.h
@@ -54,7 +54,9 @@
#define DR_LEN_1 (0x0) /* Settings for data length to trap on */
#define DR_LEN_2 (0x4)
#define DR_LEN_4 (0xC)
-#define DR_LEN_8 (0x8)
+#ifdef __x86_64__
+# define DR_LEN_8 (0x8)
+#endif
/* The low byte to the control register determine which registers are
enabled. There are 4 fields of two bits. One bit is "local", meaning