From ea32bcdd3d567a61617bbe0ec8099c79c46f2489 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Fri, 1 Jun 2012 21:19:28 +0000 Subject: [PATCH] Add default-abi definitions for powerpc, s390 and sparc. --- ChangeLog | 12 ++++++++++++ sysdeps/unix/sysv/linux/powerpc/powerpc32/Makefile | 3 +++ sysdeps/unix/sysv/linux/powerpc/powerpc64/Makefile | 2 ++ sysdeps/unix/sysv/linux/s390/s390-32/Makefile | 3 +++ sysdeps/unix/sysv/linux/s390/s390-64/Makefile | 3 +++ sysdeps/unix/sysv/linux/sparc/sparc32/Makefile | 3 +++ sysdeps/unix/sysv/linux/sparc/sparc64/Makefile | 3 +++ 7 files changed, 29 insertions(+) create mode 100644 sysdeps/unix/sysv/linux/powerpc/powerpc64/Makefile diff --git a/ChangeLog b/ChangeLog index 09ef682128..49daa0e352 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,17 @@ 2012-06-01 Joseph Myers + * sysdeps/unix/sysv/linux/powerpc/powerpc32/Makefile + (default-abi): New variable. + * sysdeps/unix/sysv/linux/powerpc/powerpc64/Makefile: New file. + * sysdeps/unix/sysv/linux/s390/s390-32/Makefile (default-abi): New + variable. + * sysdeps/unix/sysv/linux/s390/s390-64/Makefile (default-abi): + Likewise. + * sysdeps/unix/sysv/linux/sparc/sparc32/Makefile (default-abi): + Likewise. + * sysdeps/unix/sysv/linux/sparc/sparc64/Makefile (default-abi): + Likewise. + * Makeconfig [abi-variants && !default-abi] (default-abi): Remove definition. Document in comment. diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/Makefile b/sysdeps/unix/sysv/linux/powerpc/powerpc32/Makefile index 966a7689e2..84324aa7e1 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/Makefile +++ b/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/sysdeps/unix/sysv/linux/powerpc/powerpc64/Makefile b/sysdeps/unix/sysv/linux/powerpc/powerpc64/Makefile new file mode 100644 index 0000000000..3ba3b1f6e2 --- /dev/null +++ b/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/sysdeps/unix/sysv/linux/s390/s390-32/Makefile b/sysdeps/unix/sysv/linux/s390/s390-32/Makefile index a509c9312b..3216804f7b 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/Makefile +++ b/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/sysdeps/unix/sysv/linux/s390/s390-64/Makefile b/sysdeps/unix/sysv/linux/s390/s390-64/Makefile index 283361b3f4..1f6ad21064 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-64/Makefile +++ b/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/sysdeps/unix/sysv/linux/sparc/sparc32/Makefile b/sysdeps/unix/sysv/linux/sparc/sparc32/Makefile index 8f7e76be2a..21c7dc1680 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc32/Makefile +++ b/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/sysdeps/unix/sysv/linux/sparc/sparc64/Makefile b/sysdeps/unix/sysv/linux/sparc/sparc64/Makefile index df4533af6c..3e29dd8413 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/Makefile +++ b/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 -- 2.43.5