From patchwork Wed Mar 11 19:42:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: develop--- via Libc-alpha X-Patchwork-Id: 1253171 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=libc-alpha-bounces@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=sourceware.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=AV2BqUsc; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48d2SL3Rxgz9sPF for ; Thu, 12 Mar 2020 06:43:14 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D92D23938807; Wed, 11 Mar 2020 19:43:10 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D92D23938807 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1583955790; bh=9Py6g0UXstHXfyqBpli4wmJH6wFhOFnVC8VjNvl9syw=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=AV2BqUscFKZOqlXHjvCg9lJwOuSJMqm6h6xqA2O7IWeSywaRsZQpiSaTHuonphck1 scdSd6PKxJ6aWWzjJyTUgS9zfOwOv5+AZ2VM2XW1PVBN6U1fJNHJdBSVgaMjT9mkWU 6veBpwmz13bp5ny4ODXkx04pem5VNgnmFHe+ahoc= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by sourceware.org (Postfix) with ESMTPS id 9D6233937420 for ; Wed, 11 Mar 2020 19:43:08 +0000 (GMT) Received: from pps.filterd (m0098420.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 02BJewNl194142 for ; Wed, 11 Mar 2020 15:43:08 -0400 Received: from ppma01wdc.us.ibm.com (fd.55.37a9.ip4.static.sl-reverse.com [169.55.85.253]) by mx0b-001b2d01.pphosted.com with ESMTP id 2yq63grxwc-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 11 Mar 2020 15:43:02 -0400 Received: from pps.filterd (ppma01wdc.us.ibm.com [127.0.0.1]) by ppma01wdc.us.ibm.com (8.16.0.27/8.16.0.27) with SMTP id 02BJeAHl022047 for ; Wed, 11 Mar 2020 19:42:06 GMT Received: from b01cxnp23033.gho.pok.ibm.com (b01cxnp23033.gho.pok.ibm.com [9.57.198.28]) by ppma01wdc.us.ibm.com with ESMTP id 2ypjxqya6q-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 11 Mar 2020 19:42:06 +0000 Received: from b01ledav004.gho.pok.ibm.com (b01ledav004.gho.pok.ibm.com [9.57.199.109]) by b01cxnp23033.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 02BJg5oG45023708 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 11 Mar 2020 19:42:05 GMT Received: from b01ledav004.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id B5F7B112067 for ; Wed, 11 Mar 2020 19:42:05 +0000 (GMT) Received: from b01ledav004.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 86922112069 for ; Wed, 11 Mar 2020 19:42:05 +0000 (GMT) Received: from brokenarrow.ibmuc.com (unknown [9.85.184.204]) by b01ledav004.gho.pok.ibm.com (Postfix) with ESMTP for ; Wed, 11 Mar 2020 19:42:05 +0000 (GMT) To: libc-alpha@sourceware.org Subject: [PATCH] Makeconfig: sandwich gnulib-tests between libc/ld linking of tests Date: Wed, 11 Mar 2020 14:42:05 -0500 Message-Id: <20200311194205.31476-1-murphyp@linux.vnet.ibm.com> X-Mailer: git-send-email 2.21.1 MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.138, 18.0.572 definitions=2020-03-11_10:2020-03-11, 2020-03-11 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 spamscore=0 priorityscore=1501 mlxlogscore=999 malwarescore=0 suspectscore=0 mlxscore=0 lowpriorityscore=0 phishscore=0 adultscore=0 clxscore=1015 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2001150001 definitions=main-2003110109 X-Spam-Status: No, score=-27.6 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_NONE autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: "Paul E. Murphy via Libc-alpha" From: develop--- via Libc-alpha Reply-To: "Paul E. Murphy" Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" This is a continuation of the discussion from [1] and replaces the parent patch "powerpc64le: link tests against ld.so" [2]. I have tested this on ppc64le and x86-64 and it did not break any tests. [1] [2] ---8<--- This better resembles the default linking process with the gnulibs, and also resolves the increasingly difficult to maintain f128-loader-link usage on powerpc64le as some libgcc symbols are dependent on those found in the loader (ld). Likewise, rename link-libc-before-gnulib to link-libc-between-gnulib to more accurately describe what is happening. --- Makeconfig | 6 +++--- sysdeps/ieee754/ldbl-128ibm-compat/Makefile | 13 ------------- sysdeps/powerpc/powerpc64/le/Makefile | 17 ----------------- 3 files changed, 3 insertions(+), 33 deletions(-) diff --git a/Makeconfig b/Makeconfig index f252842979..b9e28f4f3d 100644 --- a/Makeconfig +++ b/Makeconfig @@ -564,13 +564,13 @@ else link-libc-tests-rpath-link = $(link-libc-rpath-link) endif # build-hardcoded-path-in-tests -link-libc-before-gnulib = $(common-objpfx)libc.so$(libc.so-version) \ +link-libc-between-gnulib = $(common-objpfx)libc.so$(libc.so-version) \ $(common-objpfx)$(patsubst %,$(libtype.oS),c) \ -Wl,--as-needed $(elf-objpfx)ld.so \ -Wl,--no-as-needed -link-libc = $(link-libc-before-gnulib) $(gnulib) +link-libc = $(link-libc-between-gnulib) $(gnulib) -link-libc-tests-after-rpath-link = $(link-libc-before-gnulib) $(gnulib-tests) +link-libc-tests-after-rpath-link = $(gnulib-tests) $(link-libc-between-gnulib) $(gnulib-tests) link-libc-tests = $(link-libc-tests-rpath-link) \ $(link-libc-tests-after-rpath-link) # Pretty printer test programs always require rpath instead of rpath-link. diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/Makefile b/sysdeps/ieee754/ldbl-128ibm-compat/Makefile index 42f974f85d..705424f7c2 100644 --- a/sysdeps/ieee754/ldbl-128ibm-compat/Makefile +++ b/sysdeps/ieee754/ldbl-128ibm-compat/Makefile @@ -30,7 +30,6 @@ tests-internal += test-wcstold-ibm128 test-wcstold-ieee128 CFLAGS-test-wcstold-ieee128.c += -mfloat128 -mabi=ieeelongdouble -Wno-psabi CFLAGS-test-wcstold-ibm128.c += -mabi=ibmlongdouble -Wno-psabi -$(objpfx)test-wcstold-ieee128: gnulib-tests += $(f128-loader-link) endif ifeq ($(subdir),stdio-common) @@ -89,26 +88,18 @@ tests-internal += test-scanf-ieee128 test-scanf-ibm128 CFLAGS-test-scanf-ieee128.c += -mfloat128 -mabi=ieeelongdouble -Wno-psabi -std=c89 -D_GNU_SOURCE CFLAGS-test-scanf-ibm128.c += -mabi=ibmlongdouble -Wno-psabi -std=c89 -D_GNU_SOURCE -$(objpfx)test-scanf-ieee128: gnulib-tests += $(f128-loader-link) - tests-internal += test-wscanf-ieee128 test-wscanf-ibm128 CFLAGS-test-wscanf-ieee128.c += -mfloat128 -mabi=ieeelongdouble -Wno-psabi -std=c89 -D_GNU_SOURCE CFLAGS-test-wscanf-ibm128.c += -mabi=ibmlongdouble -Wno-psabi -std=c89 -D_GNU_SOURCE -$(objpfx)test-wscanf-ieee128: gnulib-tests += $(f128-loader-link) - tests-internal += test-isoc99-scanf-ieee128 test-isoc99-scanf-ibm128 CFLAGS-test-isoc99-scanf-ieee128.c += -mfloat128 -mabi=ieeelongdouble -Wno-psabi -std=c99 CFLAGS-test-isoc99-scanf-ibm128.c += -mabi=ibmlongdouble -Wno-psabi -std=c99 -$(objpfx)test-isoc99-scanf-ieee128: gnulib-tests += $(f128-loader-link) - tests-internal += test-isoc99-wscanf-ieee128 test-isoc99-wscanf-ibm128 CFLAGS-test-isoc99-wscanf-ieee128.c += -mfloat128 -mabi=ieeelongdouble -Wno-psabi -std=c99 CFLAGS-test-isoc99-wscanf-ibm128.c += -mabi=ibmlongdouble -Wno-psabi -std=c99 -$(objpfx)test-isoc99-wscanf-ieee128: gnulib-tests += $(f128-loader-link) - ifeq ($(run-built-tests),yes) tests-special += $(objpfx)test-scanf-ieee128.out tests-special += $(objpfx)test-scanf-ibm128.out @@ -269,9 +260,6 @@ tests-internal += tst-ibm128-warn tst-ieee128-warn tests-internal += tst-ibm128-error tst-ieee128-error tests-internal += tst-ibm128-efgcvt tst-ieee128-efgcvt -$(objpfx)tst-ieee128-efgcvt: gnulib-tests += $(f128-loader-link) -$(objpfx)tst-ldbl-efgcvt: gnulib-tests += $(f128-loader-link) - $(objpfx)tst-ibm128-%.c: tst-ldbl-%.c cp $< $@ @@ -316,7 +304,6 @@ tests-internal += test-strfrom-ibm128 test-strfrom-ieee128 CFLAGS-test-strfrom-ieee128.c += -mfloat128 -mabi=ieeelongdouble -Wno-psabi CFLAGS-test-strfrom-ibm128.c += -mabi=ibmlongdouble -Wno-psabi -$(objpfx)test-strfrom-ieee128: gnulib-tests += $(f128-loader-link) endif ifeq ($(subdir),math) diff --git a/sysdeps/powerpc/powerpc64/le/Makefile b/sysdeps/powerpc/powerpc64/le/Makefile index 0ce3868c3c..f08994dfc3 100644 --- a/sysdeps/powerpc/powerpc64/le/Makefile +++ b/sysdeps/powerpc/powerpc64/le/Makefile @@ -1,11 +1,6 @@ # When building float128 we need to ensure -mfloat128 is # passed to all such object files. -# libgcc requires __tcb_parse_hwcap_and_convert_at_platform when built with -# a binary128 type. That symbol is provided by the loader on dynamically -# linked executables, forcing to link the loader after libgcc link. -f128-loader-link = -Wl,--as-needed $(elf-objpfx)ld.so -Wl,--no-as-needed - ifeq ($(subdir),math) # sqrtf128 requires emulation before POWER9. CPPFLAGS += -I../soft-fp @@ -28,13 +23,6 @@ CFLAGS-test-math-iscanonical.cc += -mfloat128 CFLAGS-test-math-iseqsig.cc += -mfloat128 CFLAGS-test-math-issignaling.cc += -mfloat128 CFLAGS-test-math-iszero.cc += -mfloat128 -$(foreach test, \ - test-float128% test-ifloat128% test-float64x% test-ifloat64x% \ - $(foreach pair,$(f128-pairs),test-$(pair)%) \ - test-math-iscanonical test-math-iseqsig test-math-issignaling \ - test-math-iszero, \ - $(objpfx)$(test)): \ - gnulib-tests += $(f128-loader-link) endif # Append flags to string <-> _Float128 routines. @@ -56,11 +44,6 @@ CFLAGS-tst-strfrom-locale.c += -mfloat128 CFLAGS-strfrom-skeleton.c += -mfloat128 CFLAGS-tst-strtod-nan-sign.c += -mfloat128 CFLAGS-tst-wcstod-nan-sign.c += -mfloat128 -$(foreach test,bug-strtod bug-strtod2 bug-strtod2 tst-strtod-round \ -tst-wcstod-round tst-strtod6 tst-strrom tst-strfrom-locale \ -tst-strtod-nan-locale tst-wcstod-nan-locale \ -strfrom-skeleton tst-strtod-nan-sign tst-wcstod-nan-sign, \ -$(objpfx)$(test)): gnulib-tests += $(f128-loader-link) # When building glibc with support for _Float128, the powers of ten tables in # fpioconst.c and in the string conversion functions must be extended. Some