From 3bd872c4c481664542c6c5797730f3830e827b92 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Fri, 1 Jun 2012 13:22:46 -0700 Subject: [PATCH] Use i386 sys/elf.h and sys/vm86.h for i386 and x86-64 --- ChangeLog | 13 +++++++++++++ sysdeps/unix/sysv/linux/i386/Makefile | 1 - sysdeps/unix/sysv/linux/x86/Makefile | 4 ++++ sysdeps/unix/sysv/linux/{i386 => x86}/sys/elf.h | 0 sysdeps/unix/sysv/linux/{i386 => x86}/sys/vm86.h | 0 sysdeps/unix/sysv/linux/x86_64/Makefile | 1 - 6 files changed, 17 insertions(+), 2 deletions(-) rename sysdeps/unix/sysv/linux/{i386 => x86}/sys/elf.h (100%) rename sysdeps/unix/sysv/linux/{i386 => x86}/sys/vm86.h (100%) diff --git a/ChangeLog b/ChangeLog index e5f68f3383..470aa8577f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,19 @@ 2012-06-01 H.J. Lu [BZ #14117] + * sysdeps/unix/sysv/linux/i386/Makefile (sysdep_headers): + Don't add sys/elf.h sys/perm.h sys/reg.h sys/vm86.h + sys/debugreg.h sys/io.h here. + * sysdeps/unix/sysv/linux/x86/Makefile (sysdep_headers): Add + sys/elf.h sys/perm.h sys/reg.h sys/vm86.h sys/debugreg.h + sys/io.h. + * sysdeps/unix/sysv/linux/x86_64/Makefile (sysdep_headers): + Don't add sys/perm.h sys/reg.h sys/debugreg.h sys/io.h here. + * sysdeps/unix/sysv/linux/i386/sys/elf.h: Renamed to ... + * sysdeps/unix/sysv/linux/x86/sys/elf.h: This. + * sysdeps/unix/sysv/linux/i386/sys/vm86.h: Renamed to ... + * sysdeps/unix/sysv/linux/x86/sys/vm86.h: This. + * sysdeps/unix/sysv/linux/x86_64/sys/debugreg.h (DR_LEN_8): Define only if __x86_64__ is defined. diff --git a/sysdeps/unix/sysv/linux/i386/Makefile b/sysdeps/unix/sysv/linux/i386/Makefile index f4585d788a..acc30219e8 100644 --- a/sysdeps/unix/sysv/linux/i386/Makefile +++ b/sysdeps/unix/sysv/linux/i386/Makefile @@ -3,7 +3,6 @@ default-abi := 32 ifeq ($(subdir),misc) sysdep_routines += ioperm iopl vm86 call_pselect6 call_fallocate -sysdep_headers += sys/elf.h sys/perm.h sys/reg.h sys/vm86.h sys/debugreg.h sys/io.h endif ifeq ($(subdir),elf) diff --git a/sysdeps/unix/sysv/linux/x86/Makefile b/sysdeps/unix/sysv/linux/x86/Makefile index cf4a55cf0c..6412a9ef36 100644 --- a/sysdeps/unix/sysv/linux/x86/Makefile +++ b/sysdeps/unix/sysv/linux/x86/Makefile @@ -12,3 +12,7 @@ abi-64-ld-soname := ld-linux-x86-64.so.2 abi-x32-options := -U__i386__ -D__x86_64__ -D__ILP32__ -U__LP64__ abi-x32-condition := defined __x86_64__ && defined __ILP32__ abi-x32-ld-soname := ld-linux-x32.so.2 + +ifeq ($(subdir),misc) +sysdep_headers += sys/elf.h sys/perm.h sys/reg.h sys/vm86.h sys/debugreg.h sys/io.h +endif diff --git a/sysdeps/unix/sysv/linux/i386/sys/elf.h b/sysdeps/unix/sysv/linux/x86/sys/elf.h similarity index 100% rename from sysdeps/unix/sysv/linux/i386/sys/elf.h rename to sysdeps/unix/sysv/linux/x86/sys/elf.h diff --git a/sysdeps/unix/sysv/linux/i386/sys/vm86.h b/sysdeps/unix/sysv/linux/x86/sys/vm86.h similarity index 100% rename from sysdeps/unix/sysv/linux/i386/sys/vm86.h rename to sysdeps/unix/sysv/linux/x86/sys/vm86.h diff --git a/sysdeps/unix/sysv/linux/x86_64/Makefile b/sysdeps/unix/sysv/linux/x86_64/Makefile index dd4ab59c5a..d6a9d360d1 100644 --- a/sysdeps/unix/sysv/linux/x86_64/Makefile +++ b/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) -- 2.43.5