[RFC] math-vector-fortran.h: fix multilib conflict
Checks
Context |
Check |
Description |
redhat-pt-bot/TryBot-apply_patch |
success
|
Patch applied to master at the time it was sent
|
linaro-tcwg-bot/tcwg_glibc_build--master-aarch64 |
success
|
Testing passed
|
redhat-pt-bot/TryBot-32bit |
success
|
Build for i686
|
linaro-tcwg-bot/tcwg_glibc_check--master-aarch64 |
success
|
Testing passed
|
linaro-tcwg-bot/tcwg_glibc_build--master-arm |
success
|
Testing passed
|
linaro-tcwg-bot/tcwg_glibc_check--master-arm |
success
|
Testing passed
|
Commit Message
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
Comments
* kai kang:
> 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
This is an installed header.
> 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
So this one should be one, too? Ist there a libmvec ABI defined for
32-bit Arm? What is the expectation here?
Thanks,
Florian
The 04/17/2024 11:35, kai.kang@windriver.com wrote:
> 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.
what kind of multilib are you talking about?
aarch64 and armhf on the same system?
i think those cannot share header files on the same system.
> +!GCC$ builtin (acos) attributes simd (notinbranch) if('aarch64')
note this would disable the simd attribute on aarch64_be
(which is technically supported by glibc)
@@ -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')
new file mode 120000
@@ -0,0 +1 @@
+../../../aarch64/fpu/finclude/math-vector-fortran.h
\ No newline at end of file