From: <kai.kang@windriver.com>
To: <libc-alpha@sourceware.org>
Subject: [RFC PATCH] math-vector-fortran.h: fix multilib conflict
Date: Wed, 17 Apr 2024 11:35:59 +0800 [thread overview]
Message-ID: <20240417033559.1372027-1-kai.kang@windriver.com> (raw)
From: Kai Kang <kai.kang@windriver.com>
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 <kai.kang@windriver.com>
---
.../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
! <https://www.gnu.org/licenses/>.
-!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
--
2.34.1
next reply other threads:[~2024-04-17 3:36 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-17 3:35 kai.kang [this message]
2024-04-29 13:45 ` [RFC PATCH] math-vector-fortran.h: fix multilib conflict Florian Weimer
2024-04-29 14:09 ` Szabolcs Nagy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/libc/involved.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240417033559.1372027-1-kai.kang@windriver.com \
--to=kai.kang@windriver.com \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).