Move some #define-d constants into the VKI department, where I should

have put them in the first place.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@3860

diff --git a/coregrind/m_syscalls/syscalls-amd64-linux.c b/coregrind/m_syscalls/syscalls-amd64-linux.c
index 4efbdb37d9cf73965284c873965ec7786498f7a4..4ac9f31c80923e4f84675e29b3c94406dd7ffdb8 100644 (file)
--- a/coregrind/m_syscalls/syscalls-amd64-linux.c
+++ b/coregrind/m_syscalls/syscalls-amd64-linux.c
@@ -48,12 +48,6 @@
 
 #include "vki_unistd.h"              /* for the __NR_* constants */
 
-/* COPIED FROM /usr/include/asm-i386/prctl.h (amd64-linux) */
-#define ARCH_SET_GS 0x1001
-#define ARCH_SET_FS 0x1002
-#define ARCH_GET_FS 0x1003
-#define ARCH_GET_GS 0x1004
-
 
 /* ---------------------------------------------------------------------
    Stacks, thread wrappers
@@ -682,7 +676,7 @@ PRE(sys_arch_prctl)
    // PRE_MEM_READs/PRE_MEM_WRITEs as necessary...
 
    /* "do" the syscall ourselves; the kernel never sees it */
-   vg_assert(ARG1 == ARCH_SET_FS);
+   vg_assert(ARG1 == VKI_ARCH_SET_FS);
    tst = VG_(get_ThreadState)(tid);
    tst->arch.vex.guest_FS_ZERO = ARG2;
 

diff --git a/include/vki-amd64-linux.h b/include/vki-amd64-linux.h
index d97dbd626d4df0b4c4e196a039e271742ec4c2fa..1da219c55c8eeaaddbd8a499a1a17fb7ccdb2c24 100644 (file)
--- a/include/vki-amd64-linux.h
+++ b/include/vki-amd64-linux.h
@@ -483,6 +483,13 @@ struct vki_ucontext {
 #define VKI_GDT_ENTRY_TLS_MIN 11
 #define VKI_GDT_ENTRY_TLS_MAX 13
 
+// These are actually from linux-???/include/asm-i386/prctl.h.
+// But they appear to be needed on amd64.
+#define VKI_ARCH_SET_GS 0x1001
+#define VKI_ARCH_SET_FS 0x1002
+#define VKI_ARCH_GET_FS 0x1003
+#define VKI_ARCH_GET_GS 0x1004
+
 //----------------------------------------------------------------------
 // From linux-2.6.9/include/asm-x86_64/ldt.h
 //----------------------------------------------------------------------