From patchwork Mon Jun 28 11:01:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Liebler X-Patchwork-Id: 44034 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 1221A396983E for ; Mon, 28 Jun 2021 11:01:50 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1221A396983E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1624878110; bh=wwM4uVuyIJVFsosoI0mtwtlAH/q+Cr0OA0XTBfACmiI=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=WEM4eSpRwFRB84Z79yLY5yUd7ion3NmBx8fp9JZwfKNQzGO+pofFkcGsrUTBgX3Y6 mmAFc0tDMJvS38Lhy6FwrSaSm6a5on45YhHAQyZ8jdHLRMpAG91KAQEAHUnwrlPxOb ajsS37IWVMjVf9aN8sU9Hlw0fi4E+7C8K4qbMO3k= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by sourceware.org (Postfix) with ESMTPS id DDE8B395BC4A for ; Mon, 28 Jun 2021 11:01:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org DDE8B395BC4A Received: from pps.filterd (m0098417.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 15SAXvKv112132 for ; Mon, 28 Jun 2021 07:01:27 -0400 Received: from ppma06fra.de.ibm.com (48.49.7a9f.ip4.static.sl-reverse.com [159.122.73.72]) by mx0a-001b2d01.pphosted.com with ESMTP id 39fcja8x9e-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 28 Jun 2021 07:01:27 -0400 Received: from pps.filterd (ppma06fra.de.ibm.com [127.0.0.1]) by ppma06fra.de.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 15SB0Le2017394 for ; Mon, 28 Jun 2021 11:01:25 GMT Received: from b06cxnps4075.portsmouth.uk.ibm.com (d06relay12.portsmouth.uk.ibm.com [9.149.109.197]) by ppma06fra.de.ibm.com with ESMTP id 39dugh8cwv-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 28 Jun 2021 11:01:25 +0000 Received: from d06av26.portsmouth.uk.ibm.com (d06av26.portsmouth.uk.ibm.com [9.149.105.62]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 15SB1M3018416006 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 28 Jun 2021 11:01:22 GMT Received: from d06av26.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id EEC07AEF98; Mon, 28 Jun 2021 11:01:21 +0000 (GMT) Received: from d06av26.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 640EAAF016; Mon, 28 Jun 2021 11:01:14 +0000 (GMT) Received: from t35lp56.lnxne.boe (unknown [9.152.108.100]) by d06av26.portsmouth.uk.ibm.com (Postfix) with ESMTP; Mon, 28 Jun 2021 11:01:14 +0000 (GMT) To: libc-alpha@sourceware.org Subject: [PATCH] s390x: Update math: redirect roundeven function Date: Mon, 28 Jun 2021 13:01:07 +0200 Message-Id: <20210628110107.4039211-1-stli@linux.ibm.com> X-Mailer: git-send-email 2.31.1 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: xzM2z1NI0Hy5OxbWtauOEi9jk2L02Su7 X-Proofpoint-ORIG-GUID: xzM2z1NI0Hy5OxbWtauOEi9jk2L02Su7 X-Proofpoint-UnRewURL: 0 URL was un-rewritten MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.391, 18.0.790 definitions=2021-06-28_09:2021-06-25, 2021-06-28 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 clxscore=1015 priorityscore=1501 adultscore=0 phishscore=0 lowpriorityscore=0 mlxlogscore=999 spamscore=0 bulkscore=0 suspectscore=0 malwarescore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2104190000 definitions=main-2106280070 X-Spam-Status: No, score=-11.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP 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: Stefan Liebler via Libc-alpha From: Stefan Liebler Reply-To: Stefan Liebler Cc: Stefan Liebler Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" After recent commit 447954a206837b5f153869cfeeeab44631c3fac9 "math: redirect roundeven function", building on s390x fails with: Error: symbol `__roundevenl' is already defined Similar to aarch64/riscv fix, this patch redirects target specific functions for s390x: commit 3213ed770cbc5821920d16caa93c85e92dd7b9f6 "Update math: redirect roundeven function" --- sysdeps/s390/fpu/s_roundeven.c | 2 +- sysdeps/s390/fpu/s_roundevenf.c | 1 + sysdeps/s390/fpu/s_roundevenl.c | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/sysdeps/s390/fpu/s_roundeven.c b/sysdeps/s390/fpu/s_roundeven.c index 40b07e054b..0773adfed0 100644 --- a/sysdeps/s390/fpu/s_roundeven.c +++ b/sysdeps/s390/fpu/s_roundeven.c @@ -18,6 +18,7 @@ . */ #ifdef HAVE_S390_MIN_Z196_ZARCH_ASM_SUPPORT +# define NO_MATH_REDIRECT # include # include @@ -31,7 +32,6 @@ __roundeven (double x) __asm__ ("fidbra %0,4,%1,4" : "=f" (y) : "f" (x)); return y; } -hidden_def (__roundeven) libm_alias_double (__roundeven, roundeven) #else diff --git a/sysdeps/s390/fpu/s_roundevenf.c b/sysdeps/s390/fpu/s_roundevenf.c index d2fbf3d2b6..289785bc4a 100644 --- a/sysdeps/s390/fpu/s_roundevenf.c +++ b/sysdeps/s390/fpu/s_roundevenf.c @@ -18,6 +18,7 @@ . */ #ifdef HAVE_S390_MIN_Z196_ZARCH_ASM_SUPPORT +# define NO_MATH_REDIRECT # include # include diff --git a/sysdeps/s390/fpu/s_roundevenl.c b/sysdeps/s390/fpu/s_roundevenl.c index 29ab7a8616..94b6459ab4 100644 --- a/sysdeps/s390/fpu/s_roundevenl.c +++ b/sysdeps/s390/fpu/s_roundevenl.c @@ -18,6 +18,7 @@ . */ #ifdef HAVE_S390_MIN_Z196_ZARCH_ASM_SUPPORT +# define NO_MATH_REDIRECT # include # include # include