glibc: Fix conflict error when enbale multilib on aarch64.
PATCH 1/1 glibc: Fix conflict error when enbale multilib on aarch64.
From: Lei Maohui <[email protected]>
Error: Transaction test error:
file /usr/include/finclude/math-vector-fortran.h from install of lib32-libc6-dev-2.39+git0+312e159626-r0.armv7ahf_neon conflicts with file from package libc6-dev-2.39+git0+312e159626-r0.aarch64
The difference of math-vector-fortran.h between 32bit and 64bit is as the following:
work/armv7ahf-neon-xmllib32-linux-gnueabi/lib32-glibc/2.39+git/image/usr/include/finclude/math-vector-fortran.h 2024-02-26 02:22:28.592000000 +0000 renamed from work/aarch64-linux/glibc/2.39+git/image/usr/include/finclude/math-vector-fortran.h 2024-02-26 03:41:59.560000000 +0000 +2 -30
@@ -15,33 +15,5 @@ ! 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) + +! No SIMD math functions are available for this platform.
--- meta/recipes-core/glibc/glibc-package.inc | 1 + 1 file changed, 1 insertion(+)
meta/recipes-core/glibc/glibc-package.inc +1 -0
@@ -167,6 +167,7 @@ do_install_armmultilib () { oe_multilib_header fpu_control.h gnu/lib-names.h gnu/stubs.h ieee754.h oe_multilib_header sys/elf.h sys/procfs.h sys/ptrace.h sys/ucontext.h sys/user.h + oe_multilib_header finclude/math-vector-fortran.h }
Signature · 1 line
2.34.1
lgtm.
Quoted 77 lines · leimaohui via lists.openembedded.org
From: Lei Maohui <[email protected]>
Error: Transaction test error:
file/usr/include/finclude/math-vector-fortran.hfrom install of lib32-libc6-dev-2.39+git0+312e159626-r0.armv7ahf_neon conflicts with file from package libc6-dev-2.39+git0+312e159626-r0.aarch64The difference of
math-vector-fortran.hbetween 32bit and 64bit is as the following:work/armv7ahf-neon-xmllib32-linux-gnueabi/lib32-glibc/2.39+git/image/usr/include/finclude/math-vector-fortran.h 2024-02-26 02:22:28.592000000 +0000 renamed from work/aarch64-linux/glibc/2.39+git/image/usr/include/finclude/math-vector-fortran.h 2024-02-26 03:41:59.560000000 +0000 +2
-30@@ -15,33 +15,5 @@ ! 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) + +! No SIMD math functions are available for this platform.Signed-off-by Lei Maohui <[email protected]>--- meta/recipes-core/glibc/glibc-package.inc | 1 + 1 file changed, 1 insertion(+)meta/recipes-core/glibc/glibc-package.inc +1
-1@@ -167,6 +167,7 @@ do_install_armmultilib () { oe_multilib_header fpu_control.h gnu/lib-names.h gnu/stubs.h ieee754.h oe_multilib_header sys/elf.h sys/procfs.h sys/ptrace.h sys/ucontext.h sys/user.h + oe_multilib_header finclude/math-vector-fortran.h } --2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#196179): https://lists.openembedded.org/g/openembedded-core/message/196179
Mute This Topic: https://lists.openembedded.org/mt/104577604/1997914
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Ping
Quoted 87 lines
-----Original Message-----
From: [email protected] <[email protected]> On Behalf Of Khem Raj
Sent: Monday, February 26, 2024 2:19 PM
To: Lei, Maohui <[email protected]>
Cc: [email protected]
Subject: Re: [OE-core] [PATCH] glibc: Fix conflict error when enbale multilib on aarch64.lgtm.
Quoted 8 lines · leimaohui via lists.openembedded.org
From: Lei Maohui <[email protected]>
Error: Transaction test error:
file/usr/include/finclude/math-vector-fortran.hfrom install of
lib32-libc6-dev-2.39+git0+312e159626-r0.armv7ahf_neon conflicts with file from package libc6-dev-2.39+git0+312e159626-r0.aarch64Quoted 4 lines
The difference of
math-vector-fortran.hbetween 32bit and 64bit is as the following:---
tmp/work/aarch64-linux/glibc/2.39+git/image/usr/include/finclude/math-vecto
r-fortran.h2024-02-26 03:41:59.560000000 +0000Quoted 60 lines
+++ tmp/work/armv7ahf-neon-xmllib32-linux-gnueabi/lib32-glibc/2.39+git +++ /image/usr/include/finclude/math-vector-fortran.h 2024-02-26 +++ 02:22:28.592000000 +0000
work/armv7ahf-neon-xmllib32-linux-gnueabi/lib32-glibc/2.39+git/image/usr/include/finclude/math-vector-fortran.h 2024-02-26 02:22:28.592000000 +0000 renamed from work/aarch64-linux/glibc/2.39+git/image/usr/include/finclude/math-vector-fortran.h 2024-02-26 03:41:59.560000000 +0000 +0
-1@@ -15,33 +15,5 @@ ! 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)
+
+! No SIMD math functions are available for this platform.Signed-off-by Lei Maohui <[email protected]>--- meta/recipes-core/glibc/glibc-package.inc | 1 + 1 file changed, 1 insertion(+)meta/recipes-core/glibc/glibc-package.inc +0
-0@@ -167,6 +167,7 @@ do_install_armmultilib () { oe_multilib_header fpu_control.h gnu/lib-names.h gnu/stubs.h
ieee754.h
oe_multilib_headersys/elf.hsys/procfs.hsys/ptrace.hsys/ucontext.hsys/user.h
+oe_multilib_headerfinclude/math-vector-fortran.h
}--
2.34.1
https://lore.kernel.org/all/b023614f7765fc003a4aa854440c0b66d200d27b.camel@linuxfoundation.org/
Quoted 101 lines · leimaohui via lists.openembedded.org
Ping
Quoted 81 lines
-----Original Message-----
From: [email protected] <[email protected]> On Behalf Of Khem Raj
Sent: Monday, February 26, 2024 2:19 PM
To: Lei, Maohui <[email protected]>
Cc: [email protected]
Subject: Re: [OE-core] [PATCH] glibc: Fix conflict error when enbale multilib on aarch64.lgtm.
Quoted 8 lines · leimaohui via lists.openembedded.org
From: Lei Maohui <[email protected]>
Error: Transaction test error:
file/usr/include/finclude/math-vector-fortran.hfrom install of
lib32-libc6-dev-2.39+git0+312e159626-r0.armv7ahf_neon conflicts with file from package libc6-dev-2.39+git0+312e159626-r0.aarch64Quoted 4 lines
The difference of
math-vector-fortran.hbetween 32bit and 64bit is as the following:---
tmp/work/aarch64-linux/glibc/2.39+git/image/usr/include/finclude/math-vecto
r-fortran.h2024-02-26 03:41:59.560000000 +0000Quoted 54 lines
+++ tmp/work/armv7ahf-neon-xmllib32-linux-gnueabi/lib32-glibc/2.39+git +++ /image/usr/include/finclude/math-vector-fortran.h 2024-02-26 +++ 02:22:28.592000000 +0000
work/armv7ahf-neon-xmllib32-linux-gnueabi/lib32-glibc/2.39+git/image/usr/include/finclude/math-vector-fortran.h 2024-02-26 02:22:28.592000000 +0000 renamed from work/aarch64-linux/glibc/2.39+git/image/usr/include/finclude/math-vector-fortran.h 2024-02-26 03:41:59.560000000 +0000 +0
-1@@ -15,33 +15,5 @@ ! 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)
+
+! No SIMD math functions are available for this platform.Signed-off-by Lei Maohui <[email protected]>--- meta/recipes-core/glibc/glibc-package.inc | 1 + 1 file changed, 1 insertion(+)meta/recipes-core/glibc/glibc-package.inc +0
-0@@ -167,6 +167,7 @@ do_install_armmultilib () { oe_multilib_header fpu_control.h gnu/lib-names.h gnu/stubs.h
ieee754.h
oe_multilib_headersys/elf.hsys/procfs.hsys/ptrace.hsys/ucontext.hsys/user.h
+oe_multilib_headerfinclude/math-vector-fortran.h
}Quoted 6 lines
Quoted 6 lines
--
2.34.1-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#196838): https://lists.openembedded.org/g/openembedded-core/message/196838
Mute This Topic: https://lists.openembedded.org/mt/104577604/3617179
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Signature · 3 lines
Alexandre Belloni, co-owner and COO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Hi,
Thank you very much. I'm sorry I didn't notice the same patch with me.
Best regards
Lei
Quoted 129 lines
-----Original Message-----
From: Alexandre Belloni <[email protected]>
Sent: Tuesday, March 12, 2024 6:26 AM
To: Lei, Maohui <[email protected]>
Cc: [email protected]
Subject: Re: [OE-core] [PATCH] glibc: Fix conflict error when enbale multilib on aarch64.https://lore.kernel.org/all/b023614f7765fc003a4aa854440c0b66d200d27b.cam
[email protected]/Quoted 30 lines · leimaohui via lists.openembedded.org
Ping
Quoted 26 lines
-----Original Message-----
From: [email protected] <[email protected]> On Behalf Of Khem Raj
Sent: Monday, February 26, 2024 2:19 PM
To: Lei, Maohui <[email protected]>
Cc: [email protected]
Subject: Re: [OE-core] [PATCH] glibc: Fix conflict error when enbale multilib on aarch64.lgtm.
Quoted 12 lines · leimaohui via lists.openembedded.org
From: Lei Maohui <[email protected]>
Error: Transaction test error:
file/usr/include/finclude/math-vector-fortran.hfrom install of
lib32-libc6-dev-2.39+git0+312e159626-r0.armv7ahf_neon conflicts with file from package libc6-dev-2.39+git0+312e159626-r0.aarch64The difference of
math-vector-fortran.hbetween 32bit and 64bit is as the following:---
tmp/work/aarch64-linux/glibc/2.39+git/image/usr/include/finclude/math-vecto
Quoted 72 lines
Quoted 63 lines
r-fortran.h2024-02-26 03:41:59.560000000 +0000Quoted 62 lines
+++ tmp/work/armv7ahf-neon-xmllib32-linux-gnueabi/lib32-glibc/2.39 +++ +git /image/usr/include/finclude/math-vector-fortran.h +++ 2024-02-26
+++ 02:22:28.592000000 +0000work/armv7ahf-neon-xmllib32-linux-gnueabi/lib32-glibc/2.39+git/image/usr/include/finclude/math-vector-fortran.h 2024-02-26 02:22:28.592000000 +0000 renamed from work/aarch64-linux/glibc/2.39+git/image/usr/include/finclude/math-vector-fortran.h 2024-02-26 03:41:59.560000000 +0000 +0
-1@@ -15,33 +15,5 @@ ! 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) +
+! No SIMD math functions are available for this platform.Signed-off-by Lei Maohui <[email protected]>--- meta/recipes-core/glibc/glibc-package.inc | 1 + 1 file changed, 1 insertion(+)meta/recipes-core/glibc/glibc-package.inc +0
-0@@ -167,6 +167,7 @@ do_install_armmultilib () { oe_multilib_header fpu_control.h gnu/lib-names.h
gnu/stubs.hieee754.h
oe_multilib_headersys/elf.hsys/procfs.hsys/ptrace.hsys/ucontext.hsys/user.h
+oe_multilib_headerfinclude/math-vector-fortran.h
}Quoted 6 lines
Quoted 6 lines
--
2.34.1-=-=-=-=-=-=-=-=-=-=-=-
Quoted 9 lines
Links: You receive all messages sent to this group. View/Reply Online (#196838):
https://lists.openembedded.org/g/openembedded-core/message/196838
Mute This Topic: https://lists.openembedded.org/mt/104577604/3617179
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=---
Alexandre Belloni, co-owner and COO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com