From patchwork Fri Dec 1 23:58:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joseph Myers X-Patchwork-Id: 843833 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-87749-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="m+BbtsAu"; 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 3ypWSt55F8z9sMN for ; Sat, 2 Dec 2017 10:58:54 +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:date:from:to:subject:message-id:mime-version :content-type; q=dns; s=default; b=jPslyrLXVHjxxgMa12Y2FS4l4w9IF oyD8lkiBs8uo37yBODa78rsimyJeGPrgsrEy3BUMK3BpjCfZAdliinRB8WhtLGzY kb6l7/Dcy/8EPQnfsKnNR7UGUFcDCEeSojiD1o6qUAr83VtU1fAq6x0dnM8tZaX5 NMowol18xHyhWk= 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:date:from:to:subject:message-id:mime-version :content-type; s=default; bh=HtJ0qH44Lg0hUeXLR6UmMJ3nD4M=; b=m+B btsAuYX0BpkuGARQ3paatTrvtU9vDUB+mHDsQ7yalknI9mkWq2nVxWmVnvRpf/aL SaBkSRrAIPpnm3sTgUNCBl/2sOG0gjvDMOOiAZxtM850TiGPYWs6FPCnL2OMIcz/ r1IUZOgtxwARCXPrxawHr68lAIeXYrQN7HHmVQiI= Received: (qmail 59873 invoked by alias); 1 Dec 2017 23:58:49 -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 59860 invoked by uid 89); 1 Dec 2017 23:58:48 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.3 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KB_WAM_FROM_NAME_SINGLEWORD, RCVD_IN_DNSWL_NONE, SPF_PASS, URIBL_RED autolearn=ham version=3.3.2 spammy= X-HELO: relay1.mentorg.com Date: Fri, 1 Dec 2017 23:58:41 +0000 From: Joseph Myers To: Subject: Define powerpc64 lroundl compat symbol only once [committed] Message-ID: User-Agent: Alpine 2.20 (DEB 67 2015-01-07) MIME-Version: 1.0 X-ClientProxiedBy: svr-ies-mbx-01.mgc.mentorg.com (139.181.222.1) To svr-ies-mbx-02.mgc.mentorg.com (139.181.222.2) sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround.c defines the lroundl compat symbol, version GLIBC_2_1, twice, once based on llround and once based on __lround. Those are aliases for each other (llround weak, __lround strong), but defining it twice does not make sense. This patch changes it to define the compat symbol once only, matching how libm_alias_double defines it. Tested with build-many-glibcs.py for its powerpc64 configurations. Committed. 2017-12-01 Joseph Myers * sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround.c [LONG_DOUBLE_COMPAT(libm, GLIBC_2_1)] (lroundl): Do not define compat symbol based on llround. diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround.c b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround.c index cb1a446..b6c70c2 100644 --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround.c +++ b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround.c @@ -46,7 +46,6 @@ strong_alias (__llround, __llroundl) #endif #if LONG_DOUBLE_COMPAT(libm, GLIBC_2_1) compat_symbol (libm, __llround, llroundl, GLIBC_2_1); -compat_symbol (libm, llround, lroundl, GLIBC_2_1); #endif /* long has the same width as long long on PPC64. */