diff options
author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2012-06-01 21:32:32 +0000 |
---|---|---|
committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2012-06-01 21:32:32 +0000 |
commit | 0a57a4f8f1e443295267885e3d2048f6bbb0899f (patch) | |
tree | 2b33c4c6e67c3a7a0240e7e8ec164aa9294987f8 /libc/sysdeps/unix | |
parent | b7c6870709b68725080ae00a7accbc0463bce578 (diff) | |
download | eglibc2-0a57a4f8f1e443295267885e3d2048f6bbb0899f.tar.gz |
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')
-rw-r--r-- | libc/sysdeps/unix/sysv/linux/i386/Makefile | 1 | ||||
-rw-r--r-- | libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/Makefile | 3 | ||||
-rw-r--r-- | libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/Makefile | 2 | ||||
-rw-r--r-- | libc/sysdeps/unix/sysv/linux/s390/s390-32/Makefile | 3 | ||||
-rw-r--r-- | libc/sysdeps/unix/sysv/linux/s390/s390-64/Makefile | 3 | ||||
-rw-r--r-- | libc/sysdeps/unix/sysv/linux/sparc/sparc32/Makefile | 3 | ||||
-rw-r--r-- | libc/sysdeps/unix/sysv/linux/sparc/sparc64/Makefile | 3 | ||||
-rw-r--r-- | libc/sysdeps/unix/sysv/linux/x86/Makefile | 4 | ||||
-rw-r--r-- | libc/sysdeps/unix/sysv/linux/x86/bits/wchar.h (renamed from libc/sysdeps/unix/sysv/linux/i386/bits/wchar.h) | 0 | ||||
-rw-r--r-- | libc/sysdeps/unix/sysv/linux/x86/sys/elf.h (renamed from libc/sysdeps/unix/sysv/linux/i386/sys/elf.h) | 0 | ||||
-rw-r--r-- | libc/sysdeps/unix/sysv/linux/x86/sys/vm86.h (renamed from libc/sysdeps/unix/sysv/linux/i386/sys/vm86.h) | 0 | ||||
-rw-r--r-- | libc/sysdeps/unix/sysv/linux/x86_64/Makefile | 1 | ||||
-rw-r--r-- | libc/sysdeps/unix/sysv/linux/x86_64/sys/debugreg.h | 4 |
13 files changed, 24 insertions, 3 deletions
diff --git a/libc/sysdeps/unix/sysv/linux/i386/Makefile b/libc/sysdeps/unix/sysv/linux/i386/Makefile index f4585d788..acc30219e 100644 --- a/libc/sysdeps/unix/sysv/linux/i386/Makefile +++ b/libc/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/libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/Makefile b/libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/Makefile index 966a7689e..84324aa7e 100644 --- a/libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/Makefile +++ b/libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/Makefile @@ -1,3 +1,6 @@ +# See Makeconfig regarding the use of default-abi. +default-abi := 32 + ifeq ($(subdir),resource) sysdep_routines += oldgetrlimit64 endif diff --git a/libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/Makefile b/libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/Makefile new file mode 100644 index 000000000..3ba3b1f6e --- /dev/null +++ b/libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/Makefile @@ -0,0 +1,2 @@ +# See Makeconfig regarding the use of default-abi. +default-abi := 64 diff --git a/libc/sysdeps/unix/sysv/linux/s390/s390-32/Makefile b/libc/sysdeps/unix/sysv/linux/s390/s390-32/Makefile index a509c9312..3216804f7 100644 --- a/libc/sysdeps/unix/sysv/linux/s390/s390-32/Makefile +++ b/libc/sysdeps/unix/sysv/linux/s390/s390-32/Makefile @@ -1,3 +1,6 @@ +# See Makeconfig regarding the use of default-abi. +default-abi := 32 + ifeq ($(subdir),login) sysdep_routines += utmp32 utmpx32 libutil-routines += login32 diff --git a/libc/sysdeps/unix/sysv/linux/s390/s390-64/Makefile b/libc/sysdeps/unix/sysv/linux/s390/s390-64/Makefile index 283361b3f..1f6ad2106 100644 --- a/libc/sysdeps/unix/sysv/linux/s390/s390-64/Makefile +++ b/libc/sysdeps/unix/sysv/linux/s390/s390-64/Makefile @@ -1,3 +1,6 @@ +# See Makeconfig regarding the use of default-abi. +default-abi := 64 + ifeq ($(subdir),misc) sysdep_headers += sys/elf.h endif diff --git a/libc/sysdeps/unix/sysv/linux/sparc/sparc32/Makefile b/libc/sysdeps/unix/sysv/linux/sparc/sparc32/Makefile index 8f7e76be2..21c7dc168 100644 --- a/libc/sysdeps/unix/sysv/linux/sparc/sparc32/Makefile +++ b/libc/sysdeps/unix/sysv/linux/sparc/sparc32/Makefile @@ -1,3 +1,6 @@ +# See Makeconfig regarding the use of default-abi. +default-abi := 32 + asm-CPPFLAGS = -D__ASSEMBLY__ ASFLAGS-.os += -fPIC LD += -melf32_sparc diff --git a/libc/sysdeps/unix/sysv/linux/sparc/sparc64/Makefile b/libc/sysdeps/unix/sysv/linux/sparc/sparc64/Makefile index df4533af6..3e29dd841 100644 --- a/libc/sysdeps/unix/sysv/linux/sparc/sparc64/Makefile +++ b/libc/sysdeps/unix/sysv/linux/sparc/sparc64/Makefile @@ -1,2 +1,5 @@ +# See Makeconfig regarding the use of default-abi. +default-abi := 64 + sysdep-CFLAGS += -fcall-used-g6 LD += -melf64_sparc diff --git a/libc/sysdeps/unix/sysv/linux/x86/Makefile b/libc/sysdeps/unix/sysv/linux/x86/Makefile index cf4a55cf0..6412a9ef3 100644 --- a/libc/sysdeps/unix/sysv/linux/x86/Makefile +++ b/libc/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/libc/sysdeps/unix/sysv/linux/i386/bits/wchar.h b/libc/sysdeps/unix/sysv/linux/x86/bits/wchar.h index ec0f34a47..ec0f34a47 100644 --- a/libc/sysdeps/unix/sysv/linux/i386/bits/wchar.h +++ b/libc/sysdeps/unix/sysv/linux/x86/bits/wchar.h diff --git a/libc/sysdeps/unix/sysv/linux/i386/sys/elf.h b/libc/sysdeps/unix/sysv/linux/x86/sys/elf.h index 1f4524cba..1f4524cba 100644 --- a/libc/sysdeps/unix/sysv/linux/i386/sys/elf.h +++ b/libc/sysdeps/unix/sysv/linux/x86/sys/elf.h diff --git a/libc/sysdeps/unix/sysv/linux/i386/sys/vm86.h b/libc/sysdeps/unix/sysv/linux/x86/sys/vm86.h index c41b55d7b..c41b55d7b 100644 --- a/libc/sysdeps/unix/sysv/linux/i386/sys/vm86.h +++ b/libc/sysdeps/unix/sysv/linux/x86/sys/vm86.h 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 |