From patchwork Wed Apr 17 03:35:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kai X-Patchwork-Id: 1924484 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=windriver.com header.i=@windriver.com header.a=rsa-sha256 header.s=PPS06212021 header.b=hg+3kawd; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=8.43.85.97; helo=server2.sourceware.org; envelope-from=libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org; receiver=patchwork.ozlabs.org) Received: from server2.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 ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VK65X2c0qz1yZ2 for ; Wed, 17 Apr 2024 13:36:32 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 9C75F3858D20 for ; Wed, 17 Apr 2024 03:36:28 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by sourceware.org (Postfix) with ESMTPS id E8C6F3858D20 for ; Wed, 17 Apr 2024 03:36:12 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E8C6F3858D20 Authentication-Results: sourceware.org; dmarc=pass (p=reject dis=none) header.from=windriver.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=windriver.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org E8C6F3858D20 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=205.220.178.238 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713324976; cv=none; b=gTuligW+YrXQl5HGSFN1NTd7+5QqIID4zbeRKeVdlW/D33BWdtLBlSjwE8tPDwLHILycc+ukyNIdtob89nhrjkDYUVIydA0u2WEx8DE5oqb3U2T/ijUx+cG0pfolT72uV0gYdm6olxfsuE7z6TgD//ca/4DVYrWN4e7lOnyqwcE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713324976; c=relaxed/simple; bh=gXV5A+ZBNtM/v+5KtqnWUpZbpKvrlrpcD+MrgPE5Kcw=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=IvrF8Aa45hYCNobLIhgbFp//Ey2b2hUxJrH1vXK1V47gR8J3F/Iu7S6HJXRqlgkmGiCDiLSBIaKA/Be2GJsx0w96JISb7CkZrHcGV3YnX/i+WdhzYyDqZg/2opoGC45jl5WDfDd4rRH3IA3zsUx6iXxhcv7PSNgBHW1EnPsAOBM= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from pps.filterd (m0250811.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 43H3aCNp008708; Wed, 17 Apr 2024 03:36:12 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding:content-type; s=PPS06212021; bh=OcqlM b2+AlsKnvWZ9uEopOaLOfrMVORgd75pXC6Q3IE=; b=hg+3kawdK80Kze9GICmVs z7UQIPwz+YArIC4Aidjpyell/dzI3D/aGlvaxkT/16oMAnaLV921O5GZePjzU33x aSjJ2YR0S0O9LW+hUVg7pFoL3sviHH1a5CcHgSHAbyoTxr+6wqCYKHlLovum1Dwp RgXPIvtJx4QI04mPj63g3P3j6AhevFewnJhQGRUWixuFKZrpQmdrWjBhE5QMbjtC 0E7eqIA8Zck47GdPysC57BA2NAZrNqFygoka9VuAXvHtStuNWxPtXjRDpu/6yh2r jVIJptFi31iLTKGxJcTzb1efX4rT/YG7URf5rbEubG/lNkcAC0uomnAoV9iG5BPh w== Received: from ala-exchng01.corp.ad.wrs.com (ala-exchng01.wrs.com [147.11.82.252]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3xff8ybjbb-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Wed, 17 Apr 2024 03:36:12 +0000 (GMT) Received: from ala-exchng01.corp.ad.wrs.com (147.11.82.252) by ala-exchng01.corp.ad.wrs.com (147.11.82.252) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.37; Tue, 16 Apr 2024 20:36:10 -0700 Received: from pek-kkang-d2.wrs.com (128.224.34.219) by ala-exchng01.corp.ad.wrs.com (147.11.82.252) with Microsoft SMTP Server id 15.1.2507.37 via Frontend Transport; Tue, 16 Apr 2024 20:36:10 -0700 From: To: Subject: [RFC PATCH] math-vector-fortran.h: fix multilib conflict Date: Wed, 17 Apr 2024 11:35:59 +0800 Message-ID: <20240417033559.1372027-1-kai.kang@windriver.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Proofpoint-GUID: VZUJvpf2eo-Zwv-9HmAne0uxvMeo3zle X-Proofpoint-ORIG-GUID: VZUJvpf2eo-Zwv-9HmAne0uxvMeo3zle X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-04-17_02,2024-04-16_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 phishscore=0 priorityscore=1501 spamscore=0 suspectscore=0 adultscore=0 malwarescore=0 bulkscore=0 lowpriorityscore=0 mlxscore=0 mlxlogscore=857 clxscore=1011 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2404010003 definitions=main-2404170023 X-Spam-Status: No, score=-13.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, 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.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org From: Kai Kang The header files math-vector-fortran.h fail to install with confliction when multilib enabled. Update sysdeps/aarch64/fpu/finclude/math-vector-fortran.h to only valid for aarch64. And create a link for arm to fix the confliction. Signed-off-by: Kai Kang --- .../fpu/finclude/math-vector-fortran.h | 60 +++++++++---------- .../arm/fpu/finclude/math-vector-fortran.h | 1 + 2 files changed, 31 insertions(+), 30 deletions(-) create mode 120000 sysdeps/arm/fpu/finclude/math-vector-fortran.h diff --git a/sysdeps/aarch64/fpu/finclude/math-vector-fortran.h b/sysdeps/aarch64/fpu/finclude/math-vector-fortran.h index 92e15f0d6a..1c025c6041 100644 --- a/sysdeps/aarch64/fpu/finclude/math-vector-fortran.h +++ b/sysdeps/aarch64/fpu/finclude/math-vector-fortran.h @@ -15,33 +15,33 @@ ! You should have received a copy of the GNU Lesser General Public ! License along with the GNU C Library; if not, see ! . -!GCC$ builtin (acos) attributes simd (notinbranch) -!GCC$ builtin (acosf) attributes simd (notinbranch) -!GCC$ builtin (asin) attributes simd (notinbranch) -!GCC$ builtin (asinf) attributes simd (notinbranch) -!GCC$ builtin (atan) attributes simd (notinbranch) -!GCC$ builtin (atanf) attributes simd (notinbranch) -!GCC$ builtin (atan2) attributes simd (notinbranch) -!GCC$ builtin (atan2f) attributes simd (notinbranch) -!GCC$ builtin (cos) attributes simd (notinbranch) -!GCC$ builtin (cosf) attributes simd (notinbranch) -!GCC$ builtin (exp) attributes simd (notinbranch) -!GCC$ builtin (expf) attributes simd (notinbranch) -!GCC$ builtin (exp10) attributes simd (notinbranch) -!GCC$ builtin (exp10f) attributes simd (notinbranch) -!GCC$ builtin (exp2) attributes simd (notinbranch) -!GCC$ builtin (exp2f) attributes simd (notinbranch) -!GCC$ builtin (expm1) attributes simd (notinbranch) -!GCC$ builtin (expm1f) attributes simd (notinbranch) -!GCC$ builtin (log) attributes simd (notinbranch) -!GCC$ builtin (logf) attributes simd (notinbranch) -!GCC$ builtin (log10) attributes simd (notinbranch) -!GCC$ builtin (log10f) attributes simd (notinbranch) -!GCC$ builtin (log1p) attributes simd (notinbranch) -!GCC$ builtin (log1pf) attributes simd (notinbranch) -!GCC$ builtin (log2) attributes simd (notinbranch) -!GCC$ builtin (log2f) attributes simd (notinbranch) -!GCC$ builtin (sin) attributes simd (notinbranch) -!GCC$ builtin (sinf) attributes simd (notinbranch) -!GCC$ builtin (tan) attributes simd (notinbranch) -!GCC$ builtin (tanf) attributes simd (notinbranch) +!GCC$ builtin (acos) attributes simd (notinbranch) if('aarch64') +!GCC$ builtin (acosf) attributes simd (notinbranch) if('aarch64') +!GCC$ builtin (asin) attributes simd (notinbranch) if('aarch64') +!GCC$ builtin (asinf) attributes simd (notinbranch) if('aarch64') +!GCC$ builtin (atan) attributes simd (notinbranch) if('aarch64') +!GCC$ builtin (atanf) attributes simd (notinbranch) if('aarch64') +!GCC$ builtin (atan2) attributes simd (notinbranch) if('aarch64') +!GCC$ builtin (atan2f) attributes simd (notinbranch) if('aarch64') +!GCC$ builtin (cos) attributes simd (notinbranch) if('aarch64') +!GCC$ builtin (cosf) attributes simd (notinbranch) if('aarch64') +!GCC$ builtin (exp) attributes simd (notinbranch) if('aarch64') +!GCC$ builtin (expf) attributes simd (notinbranch) if('aarch64') +!GCC$ builtin (exp10) attributes simd (notinbranch) if('aarch64') +!GCC$ builtin (exp10f) attributes simd (notinbranch) if('aarch64') +!GCC$ builtin (exp2) attributes simd (notinbranch) if('aarch64') +!GCC$ builtin (exp2f) attributes simd (notinbranch) if('aarch64') +!GCC$ builtin (expm1) attributes simd (notinbranch) if('aarch64') +!GCC$ builtin (expm1f) attributes simd (notinbranch) if('aarch64') +!GCC$ builtin (log) attributes simd (notinbranch) if('aarch64') +!GCC$ builtin (logf) attributes simd (notinbranch) if('aarch64') +!GCC$ builtin (log10) attributes simd (notinbranch) if('aarch64') +!GCC$ builtin (log10f) attributes simd (notinbranch) if('aarch64') +!GCC$ builtin (log1p) attributes simd (notinbranch) if('aarch64') +!GCC$ builtin (log1pf) attributes simd (notinbranch) if('aarch64') +!GCC$ builtin (log2) attributes simd (notinbranch) if('aarch64') +!GCC$ builtin (log2f) attributes simd (notinbranch) if('aarch64') +!GCC$ builtin (sin) attributes simd (notinbranch) if('aarch64') +!GCC$ builtin (sinf) attributes simd (notinbranch) if('aarch64') +!GCC$ builtin (tan) attributes simd (notinbranch) if('aarch64') +!GCC$ builtin (tanf) attributes simd (notinbranch) if('aarch64') diff --git a/sysdeps/arm/fpu/finclude/math-vector-fortran.h b/sysdeps/arm/fpu/finclude/math-vector-fortran.h new file mode 120000 index 0000000000..8ee7994054 --- /dev/null +++ b/sysdeps/arm/fpu/finclude/math-vector-fortran.h @@ -0,0 +1 @@ +../../../aarch64/fpu/finclude/math-vector-fortran.h \ No newline at end of file