From b865fb6228bea8e956e6413002e7641f10d6e5e6 Mon Sep 17 00:00:00 2001 Message-Id: From: Florian Weimer Date: Mon, 24 Jan 2022 11:19:53 +0100 Subject: [PATCH] powerpc64le: Filter out -mabi=*longdouble in 64-bit double tests To: libc-alpha@sourceware.org GCC 12 configured with --with-long-double-format=ieee does not accept -mabi=ibmlongdouble in combination with -mlong-double-64, but this was how glibc tries to build these tests before this change. sysdeps/unix/sysv/linux/configure adds -mabi=ibmlongdouble to CFLAGS, so this variable has to be filtered as well. --- sysdeps/powerpc/powerpc64/le/Makefile | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/sysdeps/powerpc/powerpc64/le/Makefile b/sysdeps/powerpc/powerpc64/le/Makefile index 7c036b45fc..2aaed2b75a 100644 --- a/sysdeps/powerpc/powerpc64/le/Makefile +++ b/sysdeps/powerpc/powerpc64/le/Makefile @@ -95,8 +95,12 @@ $(foreach suf,$(all-object-suffixes),\ $(objpfx)test-narrow-macros-ldbl-64$(suf) \ $(objpfx)test-nldbl-redirect$(suf) \ $(objpfx)test-redirection-ldbl-64$(suf) \ - ): sysdep-CFLAGS := $(filter-out -mabi=ieeelongdouble,$(sysdep-CFLAGS)) - + ): CFLAGS := $(filter-out -mabi=%longdouble,$(CFLAGS)) +$(foreach suf,$(all-object-suffixes),\ + $(objpfx)test-narrow-macros-ldbl-64$(suf) \ + $(objpfx)test-nldbl-redirect$(suf) \ + $(objpfx)test-redirection-ldbl-64$(suf) \ + ): sysdep-CFLAGS := $(filter-out -mabi=%longdouble,$(sysdep-CFLAGS)) endif # Newer GCC (>7) doesn't like -mabi=* and -mlong-double-64 @@ -104,14 +108,21 @@ ifeq ($(subdir),misc) $(foreach suf,$(all-object-suffixes),\ $(objpfx)tst-nldbl-warn$(suf) \ $(objpfx)tst-nldbl-error$(suf) \ - ): sysdep-CFLAGS := $(filter-out -mabi=ieeelongdouble,$(sysdep-CFLAGS)) + ): CFLAGS := $(filter-out -mabi=%longdouble,$(CFLAGS)) +$(foreach suf,$(all-object-suffixes),\ + $(objpfx)tst-nldbl-warn$(suf) \ + $(objpfx)tst-nldbl-error$(suf) \ + ): sysdep-CFLAGS := $(filter-out -mabi=%longdouble,$(sysdep-CFLAGS)) endif # Newer GCC (>7) doesn't like -mabi=* and -mlong-double-64 ifeq ($(subdir),argp) $(foreach suf,$(all-object-suffixes),\ $(objpfx)tst-nldbl-argp$(suf) \ - ): sysdep-CFLAGS := $(filter-out -mabi=ieeelongdouble,$(sysdep-CFLAGS)) + ): CFLAGS := $(filter-out -mabi=%longdouble,$(CFLAGS)) +$(foreach suf,$(all-object-suffixes),\ + $(objpfx)tst-nldbl-argp$(suf) \ + ): sysdep-CFLAGS := $(filter-out -mabi=%longdouble,$(sysdep-CFLAGS)) endif -- 2.34.1