From patchwork Fri Feb 14 16:10:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Paul E. Murphy" X-Patchwork-Id: 1238152 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=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-109741-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=linux.vnet.ibm.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha1 header.s=default header.b=ipNg0fMH; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48Jz072ld0z9sSH for ; Sat, 15 Feb 2020 03:11:35 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; q=dns; s= default; b=kjVBbztFfocyJptHx5RBcfHFr3u7wuzmQsEDiGWR09/asXLm7WowN gPT9Ik3lNnpIbOMXnhDKI755DVsxZ4zexPp07usVvV+MVL2pvohW8KT9Yv7tVzDG taK7MVWy7jfIVUpX/0A5AEBKNmtEEXD2LZDTtyJQRDGw3rIFSAxVks= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; s=default; bh=2WnCxO3lavFKtNo5pB8ZJ/Z8BeY=; b=ipNg0fMHymoj6Bw8w0ldhESkDixk d9sbdQczAeoVhkVZnlbYsH5i1KMFfRlXg8H3K4BMCRYmqCesFTu98CxCd0MtKMzM 939WqJP4UkeXiNB/b2C/lG0wEKZ4UWMt3uEAC6RORig8uot14RIvioe32wO8Ujeg 1nIWAFa6Q/Aww7I= Received: (qmail 62635 invoked by alias); 14 Feb 2020 16:11:03 -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 62547 invoked by uid 89); 14 Feb 2020 16:11:02 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.0 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 spammy=misplaced, HContent-Transfer-Encoding:8bit X-HELO: mx0b-001b2d01.pphosted.com From: "Paul E. Murphy" To: libc-alpha@sourceware.org Subject: [PATCH 4/7] ldbl-128ibm-compat: fixup subdir location of several funcs Date: Fri, 14 Feb 2020 10:10:48 -0600 Message-Id: <20200214161051.32579-5-murphyp@linux.vnet.ibm.com> In-Reply-To: <20200214161051.32579-1-murphyp@linux.vnet.ibm.com> References: <20200214161051.32579-1-murphyp@linux.vnet.ibm.com> MIME-Version: 1.0 We want to ensure that if a second file is built to support ieee128 long double, we built it's companion implementation with ibm128 long double. The shared object versions of these files build correctly because the aliasing is sufficiently complex to prevent the redirects from applying when defining them. However, this does not prevent the static object variants from becoming quietly broken due to redirects. This is intentionally avoided by marking such objects to be built with -mabi=ibmlongdouble. Shuffle the misplaced routines to build against the subdir which defines the needed symbols. --- sysdeps/ieee754/ldbl-128ibm-compat/Makefile | 32 ++++++++++----------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/Makefile b/sysdeps/ieee754/ldbl-128ibm-compat/Makefile index 2dceb658e7..e40ae08469 100644 --- a/sysdeps/ieee754/ldbl-128ibm-compat/Makefile +++ b/sysdeps/ieee754/ldbl-128ibm-compat/Makefile @@ -1,9 +1,21 @@ ifeq ($(subdir),libio) ldbl-extra-routines += fwscanf \ + fwprintf \ + obprintf \ swscanf \ + swprintf \ wscanf \ + vasprintf \ + vdprintf \ + vscanf \ + vsprintf \ + vsnprintf \ + vsscanf \ + vswprintf \ vswscanf \ - vwscanf + vwprintf \ + vwscanf \ + wprintf endif ifeq ($(subdir),wcsmbs) @@ -29,28 +41,14 @@ ldbl-extra-routines += printf_size \ printf \ snprintf \ sprintf \ - vasprintf \ - vdprintf \ vfprintf \ vprintf \ - vsnprintf \ - vsprintf \ - fwprintf \ - swprintf \ - wprintf \ vfwprintf \ - vswprintf \ - vwprintf \ fscanf \ scanf \ sscanf \ vfscanf \ - vscanf \ - vsscanf \ vfwscanf \ - obprintf \ - obstack_chk \ - vobstack_chk \ isoc99_fscanf \ isoc99_scanf \ isoc99_sscanf \ @@ -211,7 +209,9 @@ ldbl-extra-routines += asprintf_chk \ wprintf_chk \ vfwprintf_chk \ vswprintf_chk \ - vwprintf_chk + vwprintf_chk \ + obstack_chk \ + vobstack_chk tests-internal += test-printf-chk-ieee128 test-printf-chk-ibm128 CFLAGS-test-printf-chk-ieee128.c += -mfloat128 -mabi=ieeelongdouble -Wno-psabi