From patchwork Mon Aug 28 12:35:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 22377 Received: (qmail 112547 invoked by alias); 28 Aug 2017 12:35:50 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 112528 invoked by uid 89); 28 Aug 2017 12:35:49 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RP_MATCHES_RCVD, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy= X-HELO: mx1.redhat.com DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 2A005267C4 Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=fweimer@redhat.com Subject: Re: [PATCH] : Use an arch-independent system call list on Linux To: Joseph Myers Cc: Carlos O'Donell , Andreas Schwab , libc-alpha@sourceware.org, "Dmitry V. Levin" References: <0be44a08-16c1-e904-272a-6322f51e7b0c@redhat.com> <086d58f4-f74c-6b8b-52f7-e7b80c51bb40@redhat.com> <20170406143719.GA29170@altlinux.org> <1fd1a90c-1f79-5eef-d9d4-aef7ccc4965c@redhat.com> <87shl2x7xo.fsf@linux-m68k.org> <8737d1y6zo.fsf@linux-m68k.org> <87shl1vbsn.fsf@mid.deneb.enyo.de> <27e32f21-fc5c-d6cc-73d2-5a38b97ea47e@redhat.com> <87bmn4u7iy.fsf@mid.deneb.enyo.de> <017a6836-b5c6-06cb-b42d-562755437801@redhat.com> <5a51f0de-5daa-5f6c-eda9-59837944cf40@redhat.com> From: Florian Weimer Message-ID: <390bb62c-e8d6-9ae3-5e9f-5eca83df73a9@redhat.com> Date: Mon, 28 Aug 2017 14:35:41 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 In-Reply-To: On 08/28/2017 01:35 PM, Joseph Myers wrote: > Now this is in, I think all the abi-*-options settings in various sysdeps > Makefiles can be removed; they were only there for the old way of > generating a bits/syscall.h header with ABI conditionals. Is that what you had in mind? I still need to double-check that this does not change the set of installed headers. Thanks, Florian Remove abi-*-options compiler flags These options are no longer needed since commit 2dba5ce7b8115d6a2789bf279892263621088e74 (: Use an arch-independent system call list on Linux). 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. 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)