From ee17d4e99af9e49378217209d3708053ef148032 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Mon, 28 Aug 2017 13:47:25 +0200 Subject: Remove abi-*-options compiler flags These options are no longer needed since commit 2dba5ce7b8115d6a2789bf279892263621088e74 (: Use an arch-independent system call list on Linux). --- ChangeLog | 24 +++++++++++++++++++ sysdeps/unix/sysv/linux/aarch64/Makefile | 3 --- sysdeps/unix/sysv/linux/arm/Makefile | 2 -- sysdeps/unix/sysv/linux/mips/Makefile | 36 ---------------------------- sysdeps/unix/sysv/linux/powerpc/Makefile | 3 --- sysdeps/unix/sysv/linux/s390/Makefile | 2 -- sysdeps/unix/sysv/linux/sparc/Makefile | 2 -- sysdeps/unix/sysv/linux/tile/tilegx/Makefile | 2 -- sysdeps/unix/sysv/linux/x86/Makefile | 3 --- 9 files changed, 24 insertions(+), 53 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2fae663af5..5d7c8cace1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,27 @@ +2017-08-28 Florian Weimer + + * sysdeps/unix/sysv/linux/aarch64/Makefile (abi-lp64-options) + (abi-lp64_be-options): Remove. + * sysdeps/unix/sysv/linux/arm/Makefile (abi-soft-options) + (abi-hard-options): Likewise. + * sysdeps/unix/sysv/linux/mips/Makefile(abi-o32_soft-options) + (abi-o32_hard-options, abi-o32_soft_2008-options) + (abi-o32_hard_2008-options, abi-n32_soft-options) + (abi-n32_hard-options, abi-n32_soft_2008-options) + (abi-n32_hard_2008-options, abi-n64_soft-options) + (abi-n64_hard-options, abi-n64_soft_2008-options) + (abi-n64_hard_2008-options): Likewise. + * sysdeps/unix/sysv/linux/powerpc/Makefile (abi-32-options) + (abi-64-v1-options, abi-64-v2-options): Likewise. + * sysdeps/unix/sysv/linux/s390/Makefile (abi-32-options) + (abi-64-options): Likewise. + * sysdeps/unix/sysv/linux/sparc/Makefile (abi-32-options) + (abi-64-options): Likewise. + * sysdeps/unix/sysv/linux/tile/tilegx/Makefile (abi-32-options) + (abi-64-options): Likewise. + * sysdeps/unix/sysv/linux/x86/Makefile (abi-32-options) + (abi-64-options, abi-x32-options): Likewise. + 2017-08-28 Florian Weimer Store supported list of SYS_* system calls in the source tree. diff --git a/sysdeps/unix/sysv/linux/aarch64/Makefile b/sysdeps/unix/sysv/linux/aarch64/Makefile index 6b4e620896..57bbfeaac6 100644 --- a/sysdeps/unix/sysv/linux/aarch64/Makefile +++ b/sysdeps/unix/sysv/linux/aarch64/Makefile @@ -28,8 +28,5 @@ ifeq (,$(filter $(default-abi),$(abi-variants))) Unknown ABI, must be one of $(abi-variants) endif -abi-lp64-options := -U__AARCH64EB__ abi-lp64-condition := !defined __AARCH64EB__ - -abi-lp64_be-options := -D__AARCH64EB__ abi-lp64_be-condition := defined __AARCH64EB__ diff --git a/sysdeps/unix/sysv/linux/arm/Makefile b/sysdeps/unix/sysv/linux/arm/Makefile index b9b8f71721..4adc35de04 100644 --- a/sysdeps/unix/sysv/linux/arm/Makefile +++ b/sysdeps/unix/sysv/linux/arm/Makefile @@ -63,7 +63,5 @@ Unknown ABI, must be one of $(abi-variants) endif abi-includes := -abi-soft-options := -U__ARM_PCS_VFP abi-soft-condition := !defined __ARM_PCS_VFP -abi-hard-options := -D__ARM_PCS_VFP abi-hard-condition := defined __ARM_PCS_VFP diff --git a/sysdeps/unix/sysv/linux/mips/Makefile b/sysdeps/unix/sysv/linux/mips/Makefile index bca11d39e0..8217f42e75 100644 --- a/sysdeps/unix/sysv/linux/mips/Makefile +++ b/sysdeps/unix/sysv/linux/mips/Makefile @@ -19,75 +19,39 @@ endif abi-includes := sgidefs.h # _MIPS_SIM_ABI32 == 1, _MIPS_SIM_NABI32 == 2, _MIPS_SIM_ABI64 == 3 -abi-o32_soft-options := -U_MIPS_SIM -D_MIPS_SIM=1 \ - -D__mips_soft_float -U__mips_hard_float \ - -U__mips_nan2008 abi-o32_soft-condition := !defined(__mips_nan2008) \ && defined(__mips_soft_float) \ && (_MIPS_SIM == _MIPS_SIM_ABI32) -abi-o32_hard-options := -U_MIPS_SIM -D_MIPS_SIM=1 \ - -D__mips_hard_float -U__mips_soft_float \ - -U__mips_nan2008 abi-o32_hard-condition := !defined(__mips_nan2008) \ && defined(__mips_hard_float) \ && (_MIPS_SIM == _MIPS_SIM_ABI32) -abi-o32_soft_2008-options := -U_MIPS_SIM -D_MIPS_SIM=1 \ - -D__mips_soft_float -U__mips_hard_float \ - -D__mips_nan2008 abi-o32_soft_2008-condition := defined(__mips_nan2008) \ && defined(__mips_soft_float) \ && (_MIPS_SIM == _MIPS_SIM_ABI32) -abi-o32_hard_2008-options := -U_MIPS_SIM -D_MIPS_SIM=1 \ - -D__mips_hard_float -U__mips_soft_float \ - -D__mips_nan2008 abi-o32_hard_2008-condition := defined(__mips_nan2008) \ && defined(__mips_hard_float) \ && (_MIPS_SIM == _MIPS_SIM_ABI32) -abi-n32_soft-options := -U_MIPS_SIM -D_MIPS_SIM=2 \ - -D__mips_soft_float -U__mips_hard_float \ - -U__mips_nan2008 abi-n32_soft-condition := !defined(__mips_nan2008) \ && defined(__mips_soft_float) \ && (_MIPS_SIM == _MIPS_SIM_NABI32) -abi-n32_hard-options := -U_MIPS_SIM -D_MIPS_SIM=2 \ - -D__mips_hard_float -U__mips_soft_float \ - -U__mips_nan2008 abi-n32_hard-condition := !defined(__mips_nan2008) \ && defined(__mips_hard_float) \ && (_MIPS_SIM == _MIPS_SIM_NABI32) -abi-n32_soft_2008-options := -U_MIPS_SIM -D_MIPS_SIM=2 \ - -D__mips_soft_float -U__mips_hard_float \ - -D__mips_nan2008 abi-n32_soft_2008-condition := defined(__mips_nan2008) \ && defined(__mips_soft_float) \ && (_MIPS_SIM == _MIPS_SIM_NABI32) -abi-n32_hard_2008-options := -U_MIPS_SIM -D_MIPS_SIM=2 \ - -D__mips_hard_float -U__mips_soft_float \ - -D__mips_nan2008 abi-n32_hard_2008-condition := defined(__mips_nan2008) \ && defined(__mips_hard_float) \ && (_MIPS_SIM == _MIPS_SIM_NABI32) -abi-n64_soft-options := -U_MIPS_SIM -D_MIPS_SIM=3 \ - -D__mips_soft_float -U__mips_hard_float \ - -U__mips_nan2008 abi-n64_soft-condition := !defined(__mips_nan2008) \ && defined(__mips_soft_float) \ && (_MIPS_SIM == _MIPS_SIM_ABI64) -abi-n64_hard-options := -U_MIPS_SIM -D_MIPS_SIM=3 \ - -D__mips_hard_float -U__mips_soft_float \ - -U__mips_nan2008 abi-n64_hard-condition := !defined(__mips_nan2008) \ && defined(__mips_hard_float) \ && (_MIPS_SIM == _MIPS_SIM_ABI64) -abi-n64_soft_2008-options := -U_MIPS_SIM -D_MIPS_SIM=3 \ - -D__mips_soft_float -U__mips_hard_float \ - -D__mips_nan2008 abi-n64_soft_2008-condition := defined(__mips_nan2008) \ && defined(__mips_soft_float) \ && (_MIPS_SIM == _MIPS_SIM_ABI64) -abi-n64_hard_2008-options := -U_MIPS_SIM -D_MIPS_SIM=3 \ - -D__mips_hard_float -U__mips_soft_float \ - -D__mips_nan2008 abi-n64_hard_2008-condition := defined(__mips_nan2008) \ && defined(__mips_hard_float) \ && (_MIPS_SIM == _MIPS_SIM_ABI64) diff --git a/sysdeps/unix/sysv/linux/powerpc/Makefile b/sysdeps/unix/sysv/linux/powerpc/Makefile index c16172c677..19ac59d862 100644 --- a/sysdeps/unix/sysv/linux/powerpc/Makefile +++ b/sysdeps/unix/sysv/linux/powerpc/Makefile @@ -1,9 +1,6 @@ abi-variants := 32 64-v1 64-v2 -abi-32-options := -U__powerpc64__ abi-32-condition := __WORDSIZE == 32 -abi-64-v1-options := -D__powerpc64__ -U_CALL_ELF -D_CALL_ELF=1 abi-64-v1-condition := __WORDSIZE == 64 && _CALL_ELF != 2 -abi-64-v2-options := -D__powerpc64__ -U_CALL_ELF -D_CALL_ELF=2 abi-64-v2-condition := __WORDSIZE == 64 && _CALL_ELF == 2 ifeq ($(subdir),rt) diff --git a/sysdeps/unix/sysv/linux/s390/Makefile b/sysdeps/unix/sysv/linux/s390/Makefile index f30a6bb1f6..c5f544d139 100644 --- a/sysdeps/unix/sysv/linux/s390/Makefile +++ b/sysdeps/unix/sysv/linux/s390/Makefile @@ -1,7 +1,5 @@ abi-variants := 32 64 -abi-32-options := -U__s390x__ abi-32-condition := __WORDSIZE == 32 -abi-64-options := -D__s390x__ abi-64-condition := __WORDSIZE == 64 ifeq ($(subdir),rt) diff --git a/sysdeps/unix/sysv/linux/sparc/Makefile b/sysdeps/unix/sysv/linux/sparc/Makefile index a67d199eb5..b0d182a439 100644 --- a/sysdeps/unix/sysv/linux/sparc/Makefile +++ b/sysdeps/unix/sysv/linux/sparc/Makefile @@ -1,7 +1,5 @@ abi-variants := 32 64 -abi-32-options := -U__sparc_v9__ -U__arch64__ abi-32-condition := __WORDSIZE == 32 -abi-64-options := -D__sparc_v9__ -D__arch64__ abi-64-condition := __WORDSIZE == 64 ifeq ($(subdir),rt) diff --git a/sysdeps/unix/sysv/linux/tile/tilegx/Makefile b/sysdeps/unix/sysv/linux/tile/tilegx/Makefile index 4f101f334a..62a5be662a 100644 --- a/sysdeps/unix/sysv/linux/tile/tilegx/Makefile +++ b/sysdeps/unix/sysv/linux/tile/tilegx/Makefile @@ -1,6 +1,4 @@ # Provide biarch definitions. abi-variants := 64 32 -abi-64-options := -D__LP64__ abi-64-condition := __WORDSIZE == 64 -abi-32-options := -U__LP64__ abi-32-condition := __WORDSIZE == 32 diff --git a/sysdeps/unix/sysv/linux/x86/Makefile b/sysdeps/unix/sysv/linux/x86/Makefile index 9e6ec44b3a..c069570683 100644 --- a/sysdeps/unix/sysv/linux/x86/Makefile +++ b/sysdeps/unix/sysv/linux/x86/Makefile @@ -3,11 +3,8 @@ abi-includes := abi-variants := 32 64 x32 -abi-32-options := -D__i386__ -U__x86_64__ abi-32-condition := !defined __x86_64__ -abi-64-options := -U__i386__ -D__x86_64__ -U__ILP32__ -D__LP64__ abi-64-condition := defined __x86_64__ && defined __LP64__ -abi-x32-options := -U__i386__ -D__x86_64__ -D__ILP32__ -U__LP64__ abi-x32-condition := defined __x86_64__ && defined __ILP32__ ifeq ($(subdir),misc) -- cgit 1.4.1