* [PATCH 1/4] musl: doesn't support riscv32
@ 2024-01-17 15:07 ross.burton
2024-01-17 15:07 ` [PATCH 2/4] libunwind: merge .inc and .bb ross.burton
` (3 more replies)
0 siblings, 4 replies; 8+ messages in thread
From: ross.burton @ 2024-01-17 15:07 UTC (permalink / raw)
To: openembedded-core
From: Ross Burton <ross.burton@arm.com>
musl doesn't support riscv32, so set COMPATIBLE_HOST appropriately.
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
meta/recipes-core/musl/musl.inc | 3 +++
1 file changed, 3 insertions(+)
diff --git a/meta/recipes-core/musl/musl.inc b/meta/recipes-core/musl/musl.inc
index 66468e92ff0..6ca52b186a5 100644
--- a/meta/recipes-core/musl/musl.inc
+++ b/meta/recipes-core/musl/musl.inc
@@ -25,6 +25,9 @@ MIPS_INSTRUCTION_SET = "mips"
ARM_INSTRUCTION_SET:armv5 = "arm"
ARM_INSTRUCTION_SET:armv4 = "arm"
+# 1.2.4 doesn't support riscv32
+COMPATIBLE_HOST:riscv32 = "null"
+
# Enable out of tree build
B = "${WORKDIR}/build"
--
2.34.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 2/4] libunwind: merge .inc and .bb 2024-01-17 15:07 [PATCH 1/4] musl: doesn't support riscv32 ross.burton @ 2024-01-17 15:07 ` ross.burton 2024-01-17 17:19 ` [OE-core] " Etienne Cordonnier 2024-01-17 15:07 ` [PATCH 3/4] libunwind: refresh patches ross.burton ` (2 subsequent siblings) 3 siblings, 1 reply; 8+ messages in thread From: ross.burton @ 2024-01-17 15:07 UTC (permalink / raw) To: openembedded-core From: Ross Burton <ross.burton@arm.com> There's no need to these to be split, so merge them together. Signed-off-by: Ross Burton <ross.burton@arm.com> --- meta/recipes-support/libunwind/libunwind.inc | 23 --------------- .../libunwind/libunwind_1.6.2.bb | 28 +++++++++++++++++-- 2 files changed, 25 insertions(+), 26 deletions(-) delete mode 100644 meta/recipes-support/libunwind/libunwind.inc diff --git a/meta/recipes-support/libunwind/libunwind.inc b/meta/recipes-support/libunwind/libunwind.inc deleted file mode 100644 index bf74f9fa3c7..00000000000 --- a/meta/recipes-support/libunwind/libunwind.inc +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "Library for obtaining the call-chain of a program" -DESCRIPTION = "a portable and efficient C programming interface (API) to determine the call-chain of a program" -HOMEPAGE = "http://www.nongnu.org/libunwind" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=2d80c8ed4062b8339b715f90fa68cc9f" -DEPENDS += "libatomic-ops" -DEPENDS:append:libc-musl = " libucontext" - -inherit autotools multilib_header - -PACKAGECONFIG ??= "" -PACKAGECONFIG[lzma] = "--enable-minidebuginfo,--disable-minidebuginfo,xz" -PACKAGECONFIG[latexdocs] = "--enable-documentation, --disable-documentation, latex2man-native" - -EXTRA_OECONF:arm = "--enable-debug-frame" -EXTRA_OECONF:armeb = "--enable-debug-frame" -EXTRA_OECONF:aarch64 = "--enable-debug-frame" - -do_install:append () { - oe_multilib_header libunwind.h -} - -BBCLASSEXTEND = "native" diff --git a/meta/recipes-support/libunwind/libunwind_1.6.2.bb b/meta/recipes-support/libunwind/libunwind_1.6.2.bb index d67862608c1..650e2c9ec40 100644 --- a/meta/recipes-support/libunwind/libunwind_1.6.2.bb +++ b/meta/recipes-support/libunwind/libunwind_1.6.2.bb @@ -1,4 +1,10 @@ -require libunwind.inc +SUMMARY = "Library for obtaining the call-chain of a program" +DESCRIPTION = "a portable and efficient C programming interface (API) to determine the call-chain of a program" +HOMEPAGE = "http://www.nongnu.org/libunwind" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=2d80c8ed4062b8339b715f90fa68cc9f" +DEPENDS += "libatomic-ops" +DEPENDS:append:libc-musl = " libucontext" SRC_URI = "http://download.savannah.nongnu.org/releases/libunwind/libunwind-${PV}.tar.gz \ file://0003-x86-Stub-out-x86_local_resume.patch \ @@ -11,15 +17,31 @@ SRC_URI:append:libc-musl = " file://musl-header-conflict.patch" SRC_URI[sha256sum] = "4a6aec666991fb45d0889c44aede8ad6eb108071c3554fcdff671f9c94794976" +inherit autotools multilib_header + +COMPATIBLE_HOST:riscv32 = "null" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[lzma] = "--enable-minidebuginfo,--disable-minidebuginfo,xz" +PACKAGECONFIG[latexdocs] = "--enable-documentation, --disable-documentation, latex2man-native" + +EXTRA_OECONF:arm = "--enable-debug-frame" +EXTRA_OECONF:armeb = "--enable-debug-frame" +EXTRA_OECONF:aarch64 = "--enable-debug-frame" + EXTRA_OECONF:append:libc-musl = " --disable-documentation --disable-tests --enable-static" # http://errors.yoctoproject.org/Errors/Details/20487/ ARM_INSTRUCTION_SET:armv4 = "arm" ARM_INSTRUCTION_SET:armv5 = "arm" -COMPATIBLE_HOST:riscv32 = "null" - LDFLAGS += "-Wl,-z,relro,-z,now ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" SECURITY_LDFLAGS:append:libc-musl = " -lssp_nonshared" CACHED_CONFIGUREVARS:append:libc-musl = " LDFLAGS='${LDFLAGS} -lucontext'" + +do_install:append () { + oe_multilib_header libunwind.h +} + +BBCLASSEXTEND = "native" -- 2.34.1 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [OE-core] [PATCH 2/4] libunwind: merge .inc and .bb 2024-01-17 15:07 ` [PATCH 2/4] libunwind: merge .inc and .bb ross.burton @ 2024-01-17 17:19 ` Etienne Cordonnier 2024-01-17 17:25 ` Ross Burton 0 siblings, 1 reply; 8+ messages in thread From: Etienne Cordonnier @ 2024-01-17 17:19 UTC (permalink / raw) To: Ross Burton; +Cc: openembedded-core [-- Attachment #1: Type: text/plain, Size: 6564 bytes --] Hi Ross, I thought the main reason of having .inc files was to have a stable git history, since the bb files get constantly renamed with each update? There are many recipes using a split .inc file without a need for it, so I assumed this is the standard codestyle of poky? Is it not the case? Etienne On Wed, Jan 17, 2024 at 4:07 PM Ross Burton <ross.burton@arm.com> wrote: > From: Ross Burton <ross.burton@arm.com> > > There's no need to these to be split, so merge them together. > > Signed-off-by: Ross Burton <ross.burton@arm.com> > --- > meta/recipes-support/libunwind/libunwind.inc | 23 --------------- > .../libunwind/libunwind_1.6.2.bb | 28 +++++++++++++++++-- > 2 files changed, 25 insertions(+), 26 deletions(-) > delete mode 100644 meta/recipes-support/libunwind/libunwind.inc > > diff --git a/meta/recipes-support/libunwind/libunwind.inc > b/meta/recipes-support/libunwind/libunwind.inc > deleted file mode 100644 > index bf74f9fa3c7..00000000000 > --- a/meta/recipes-support/libunwind/libunwind.inc > +++ /dev/null > @@ -1,23 +0,0 @@ > -SUMMARY = "Library for obtaining the call-chain of a program" > -DESCRIPTION = "a portable and efficient C programming interface (API) to > determine the call-chain of a program" > -HOMEPAGE = " > https://urldefense.proofpoint.com/v2/url?u=http-3A__www.nongnu.org_libunwind&d=DwIFAg&c=ncDTmphkJTvjIDPh0hpF_4vCHvabgGkICC2epckfdiw&r=AhkbNonVuMIGRfPx_Qj9TsRih1DULJTKUkSGa66m67E&m=P8pttzCM0snL4m0mo5VJm8mOnj0IfhCrI_TI3FJlan6TDSqW2WJLwYJEhK9Xwt3l&s=lWmWqF8G-xAViw4gogbniL5C4TmmC_Z-U_7q3yHJJe8&e= > " > -LICENSE = "MIT" > -LIC_FILES_CHKSUM = "file://COPYING;md5=2d80c8ed4062b8339b715f90fa68cc9f" > -DEPENDS += "libatomic-ops" > -DEPENDS:append:libc-musl = " libucontext" > - > -inherit autotools multilib_header > - > -PACKAGECONFIG ??= "" > -PACKAGECONFIG[lzma] = "--enable-minidebuginfo,--disable-minidebuginfo,xz" > -PACKAGECONFIG[latexdocs] = "--enable-documentation, > --disable-documentation, latex2man-native" > - > -EXTRA_OECONF:arm = "--enable-debug-frame" > -EXTRA_OECONF:armeb = "--enable-debug-frame" > -EXTRA_OECONF:aarch64 = "--enable-debug-frame" > - > -do_install:append () { > - oe_multilib_header libunwind.h > -} > - > -BBCLASSEXTEND = "native" > diff --git a/meta/recipes-support/libunwind/libunwind_1.6.2.bb > b/meta/recipes-support/libunwind/libunwind_1.6.2.bb > index d67862608c1..650e2c9ec40 100644 > --- a/meta/recipes-support/libunwind/libunwind_1.6.2.bb > +++ b/meta/recipes-support/libunwind/libunwind_1.6.2.bb > @@ -1,4 +1,10 @@ > -require libunwind.inc > +SUMMARY = "Library for obtaining the call-chain of a program" > +DESCRIPTION = "a portable and efficient C programming interface (API) to > determine the call-chain of a program" > +HOMEPAGE = " > https://urldefense.proofpoint.com/v2/url?u=http-3A__www.nongnu.org_libunwind&d=DwIFAg&c=ncDTmphkJTvjIDPh0hpF_4vCHvabgGkICC2epckfdiw&r=AhkbNonVuMIGRfPx_Qj9TsRih1DULJTKUkSGa66m67E&m=P8pttzCM0snL4m0mo5VJm8mOnj0IfhCrI_TI3FJlan6TDSqW2WJLwYJEhK9Xwt3l&s=lWmWqF8G-xAViw4gogbniL5C4TmmC_Z-U_7q3yHJJe8&e= > " > +LICENSE = "MIT" > +LIC_FILES_CHKSUM = "file://COPYING;md5=2d80c8ed4062b8339b715f90fa68cc9f" > +DEPENDS += "libatomic-ops" > +DEPENDS:append:libc-musl = " libucontext" > > SRC_URI = " > https://urldefense.proofpoint.com/v2/url?u=http-3A__download.savannah.nongnu.org_releases_libunwind_libunwind-2D-24-257BPV-257D.tar.gz&d=DwIFAg&c=ncDTmphkJTvjIDPh0hpF_4vCHvabgGkICC2epckfdiw&r=AhkbNonVuMIGRfPx_Qj9TsRih1DULJTKUkSGa66m67E&m=P8pttzCM0snL4m0mo5VJm8mOnj0IfhCrI_TI3FJlan6TDSqW2WJLwYJEhK9Xwt3l&s=DzppDAaiQpwcwHtq6BJCCnV8IRnwe8BOlE-V1z_AkfA&e= > \ > file://0003-x86-Stub-out-x86_local_resume.patch \ > @@ -11,15 +17,31 @@ SRC_URI:append:libc-musl = " > file://musl-header-conflict.patch" > > SRC_URI[sha256sum] = > "4a6aec666991fb45d0889c44aede8ad6eb108071c3554fcdff671f9c94794976" > > +inherit autotools multilib_header > + > +COMPATIBLE_HOST:riscv32 = "null" > + > +PACKAGECONFIG ??= "" > +PACKAGECONFIG[lzma] = "--enable-minidebuginfo,--disable-minidebuginfo,xz" > +PACKAGECONFIG[latexdocs] = "--enable-documentation, > --disable-documentation, latex2man-native" > + > +EXTRA_OECONF:arm = "--enable-debug-frame" > +EXTRA_OECONF:armeb = "--enable-debug-frame" > +EXTRA_OECONF:aarch64 = "--enable-debug-frame" > + > EXTRA_OECONF:append:libc-musl = " --disable-documentation --disable-tests > --enable-static" > > # > https://urldefense.proofpoint.com/v2/url?u=http-3A__errors.yoctoproject.org_Errors_Details_20487_&d=DwIFAg&c=ncDTmphkJTvjIDPh0hpF_4vCHvabgGkICC2epckfdiw&r=AhkbNonVuMIGRfPx_Qj9TsRih1DULJTKUkSGa66m67E&m=P8pttzCM0snL4m0mo5VJm8mOnj0IfhCrI_TI3FJlan6TDSqW2WJLwYJEhK9Xwt3l&s=SKDMc7SnpmHxBq9SlFgKMBVybrXAwMHEjQ5vnXg4nAA&e= > ARM_INSTRUCTION_SET:armv4 = "arm" > ARM_INSTRUCTION_SET:armv5 = "arm" > > -COMPATIBLE_HOST:riscv32 = "null" > - > LDFLAGS += "-Wl,-z,relro,-z,now ${@bb.utils.contains('DISTRO_FEATURES', > 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" > > SECURITY_LDFLAGS:append:libc-musl = " -lssp_nonshared" > CACHED_CONFIGUREVARS:append:libc-musl = " LDFLAGS='${LDFLAGS} -lucontext'" > + > +do_install:append () { > + oe_multilib_header libunwind.h > +} > + > +BBCLASSEXTEND = "native" > -- > 2.34.1 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#193920): > https://urldefense.proofpoint.com/v2/url?u=https-3A__lists.openembedded.org_g_openembedded-2Dcore_message_193920&d=DwIFaQ&c=ncDTmphkJTvjIDPh0hpF_4vCHvabgGkICC2epckfdiw&r=AhkbNonVuMIGRfPx_Qj9TsRih1DULJTKUkSGa66m67E&m=P8pttzCM0snL4m0mo5VJm8mOnj0IfhCrI_TI3FJlan6TDSqW2WJLwYJEhK9Xwt3l&s=rRLXP74Dh2XnyVmQM6aYtOyPF2ZlWsMFKlYfrMUmt34&e= > Mute This Topic: > https://urldefense.proofpoint.com/v2/url?u=https-3A__lists.openembedded.org_mt_103787498_7048771&d=DwIFaQ&c=ncDTmphkJTvjIDPh0hpF_4vCHvabgGkICC2epckfdiw&r=AhkbNonVuMIGRfPx_Qj9TsRih1DULJTKUkSGa66m67E&m=P8pttzCM0snL4m0mo5VJm8mOnj0IfhCrI_TI3FJlan6TDSqW2WJLwYJEhK9Xwt3l&s=_OPUyWCjt0FVC1ckEUV57eYVcd3jh3-hCZLg-paODBw&e= > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: > https://urldefense.proofpoint.com/v2/url?u=https-3A__lists.openembedded.org_g_openembedded-2Dcore_unsub&d=DwIFaQ&c=ncDTmphkJTvjIDPh0hpF_4vCHvabgGkICC2epckfdiw&r=AhkbNonVuMIGRfPx_Qj9TsRih1DULJTKUkSGa66m67E&m=P8pttzCM0snL4m0mo5VJm8mOnj0IfhCrI_TI3FJlan6TDSqW2WJLwYJEhK9Xwt3l&s=zMPlfcTWwai56yU_5P41Df59-erBRGJVEKyunoV5CS4&e= > [ecordonnier@snap.com] > -=-=-=-=-=-=-=-=-=-=-=- > > [-- Attachment #2: Type: text/html, Size: 10982 bytes --] ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [OE-core] [PATCH 2/4] libunwind: merge .inc and .bb 2024-01-17 17:19 ` [OE-core] " Etienne Cordonnier @ 2024-01-17 17:25 ` Ross Burton 2024-01-17 22:37 ` Etienne Cordonnier 0 siblings, 1 reply; 8+ messages in thread From: Ross Burton @ 2024-01-17 17:25 UTC (permalink / raw) To: Etienne Cordonnier; +Cc: openembedded-core@lists.openembedded.org On 17 Jan 2024, at 17:19, Etienne Cordonnier <ecordonnier@snap.com> wrote: > > Hi Ross, > I thought the main reason of having .inc files was to have a stable git history, since the bb files get constantly renamed with each update? There are many recipes using a split .inc file without a need for it, so I assumed this is the standard codestyle of poky? Is it not the case? It originates from when openembedded had multiple versions for each recipe, to share logic. Some people say that it helps track history, but unless you put _only_ the checksums in the versioned file then you need to track the renamed file anyway, and git’s “—follow” option does a reasonable job. I don’t consider this a sufficient advantage considering the inconvenience of having a recipe split arbitrarily between two files. Ross ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [OE-core] [PATCH 2/4] libunwind: merge .inc and .bb 2024-01-17 17:25 ` Ross Burton @ 2024-01-17 22:37 ` Etienne Cordonnier 0 siblings, 0 replies; 8+ messages in thread From: Etienne Cordonnier @ 2024-01-17 22:37 UTC (permalink / raw) To: Ross Burton; +Cc: Etienne Cordonnier, openembedded-core@lists.openembedded.org OK, good to know. I mostly use gitk and it doesn't do a good job at following renames, so I thought that was the reason for this file structure. Etienne On Wed, Jan 17, 2024 at 6:26 PM Ross Burton <ross.burton@arm.com> wrote: > > On 17 Jan 2024, at 17:19, Etienne Cordonnier <ecordonnier@snap.com> wrote: > > > > Hi Ross, > > I thought the main reason of having .inc files was to have a stable git history, since the bb files get constantly renamed with each update? There are many recipes using a split .inc file without a need for it, so I assumed this is the standard codestyle of poky? Is it not the case? > > It originates from when openembedded had multiple versions for each recipe, to share logic. > > Some people say that it helps track history, but unless you put _only_ the checksums in the versioned file then you need to track the renamed file anyway, and git’s “—follow” option does a reasonable job. I don’t consider this a sufficient advantage considering the inconvenience of having a recipe split arbitrarily between two files. > > Ross > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#193940): https://lists.openembedded.org/g/openembedded-core/message/193940 > Mute This Topic: https://lists.openembedded.org/mt/103787498/7259375 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [cordonnier.etienne@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- > ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 3/4] libunwind: refresh patches 2024-01-17 15:07 [PATCH 1/4] musl: doesn't support riscv32 ross.burton 2024-01-17 15:07 ` [PATCH 2/4] libunwind: merge .inc and .bb ross.burton @ 2024-01-17 15:07 ` ross.burton 2024-01-17 15:07 ` [PATCH 4/4] libunwind: clean up configuration ross.burton 2024-01-17 17:51 ` [OE-core] [PATCH 1/4] musl: doesn't support riscv32 Khem Raj 3 siblings, 0 replies; 8+ messages in thread From: ross.burton @ 2024-01-17 15:07 UTC (permalink / raw) To: openembedded-core From: Ross Burton <ross.burton@arm.com> 0001-src-Gtrace-remove-unguarded-print-calls.patch has been merged, so update the Upstream-Status. 0003-x86-Stub-out-x86_local_resume.patch has been hopefully obsoleted by the use of libucontext, remove. Split 004-Fix-build-on-mips-musl.patch into two, as there's two independent issues here. 0006-Fix-for-X32.patch appears to have been fixed with 31738a upstream, in 1.6.0. musl-header-conflict.patch was obsoleted by recipe-specific-sysroots, remove it. Signed-off-by: Ross Burton <ross.burton@arm.com> --- ...-Gtrace-remove-unguarded-print-calls.patch | 4 +- .../0003-x86-Stub-out-x86_local_resume.patch | 55 ---------- .../0004-Fix-build-on-mips-musl.patch | 84 --------------- .../libunwind/0006-Fix-for-X32.patch | 29 ----- .../libunwind/libunwind/mips-byte-order.patch | 35 ++++++ .../libunwind/mips-coredump-register.patch | 100 ++++++++++++++++++ .../libunwind/musl-header-conflict.patch | 44 -------- .../libunwind/libunwind_1.6.2.bb | 6 +- 8 files changed, 139 insertions(+), 218 deletions(-) delete mode 100644 meta/recipes-support/libunwind/libunwind/0003-x86-Stub-out-x86_local_resume.patch delete mode 100644 meta/recipes-support/libunwind/libunwind/0004-Fix-build-on-mips-musl.patch delete mode 100644 meta/recipes-support/libunwind/libunwind/0006-Fix-for-X32.patch create mode 100644 meta/recipes-support/libunwind/libunwind/mips-byte-order.patch create mode 100644 meta/recipes-support/libunwind/libunwind/mips-coredump-register.patch delete mode 100644 meta/recipes-support/libunwind/libunwind/musl-header-conflict.patch diff --git a/meta/recipes-support/libunwind/libunwind/0001-src-Gtrace-remove-unguarded-print-calls.patch b/meta/recipes-support/libunwind/libunwind/0001-src-Gtrace-remove-unguarded-print-calls.patch index fdadcd3b25a..5840c2b4f62 100644 --- a/meta/recipes-support/libunwind/libunwind/0001-src-Gtrace-remove-unguarded-print-calls.patch +++ b/meta/recipes-support/libunwind/libunwind/0001-src-Gtrace-remove-unguarded-print-calls.patch @@ -1,4 +1,4 @@ -From 87d24ee47fd0e0461fca32d17564f21d76cbcb92 Mon Sep 17 00:00:00 2001 +From 9b27fa9bcd5cadd4c841c42710f41a090377e531 Mon Sep 17 00:00:00 2001 From: Ross Burton <ross.burton@arm.com> Date: Fri, 24 Mar 2023 16:18:44 +0000 Subject: [PATCH] src/Gtrace: remove unguarded print() calls @@ -19,7 +19,7 @@ needs to be implemented. Fixes #482. -Upstream-Status: Submitted [https://github.com/libunwind/libunwind/pull/483] +Upstream-Status: Backport [9b27fa9bcd5cadd4c841c42710f41a090377e531] Signed-off-by: Ross Burton <ross.burton@arm.com> --- src/arm/Gtrace.c | 4 ++-- diff --git a/meta/recipes-support/libunwind/libunwind/0003-x86-Stub-out-x86_local_resume.patch b/meta/recipes-support/libunwind/libunwind/0003-x86-Stub-out-x86_local_resume.patch deleted file mode 100644 index f02f13f79c1..00000000000 --- a/meta/recipes-support/libunwind/libunwind/0003-x86-Stub-out-x86_local_resume.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 0b2243f19d4ea12a2a68478a5aed503947a800af Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 22 Mar 2016 16:19:29 +0000 -Subject: [PATCH] x86: Stub out x86_local_resume() - -its purpose seems -to be unwinding across signal handler boundaries, which cannot happen -in correct programs anyway. Replacing the whole function with -something like *(volatile char *)0=0; (i.e. crash), gets a working -libunwind - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- - src/x86/Gos-linux.c | 26 +------------------------- - 1 file changed, 1 insertion(+), 25 deletions(-) - -diff --git a/src/x86/Gos-linux.c b/src/x86/Gos-linux.c -index d448dce..c25ae0c 100644 ---- a/src/x86/Gos-linux.c -+++ b/src/x86/Gos-linux.c -@@ -284,31 +284,7 @@ x86_r_uc_addr (ucontext_t *uc, int reg) - HIDDEN int - x86_local_resume (unw_addr_space_t as, unw_cursor_t *cursor, void *arg) - { -- struct cursor *c = (struct cursor *) cursor; -- ucontext_t *uc = c->uc; -- -- /* Ensure c->pi is up-to-date. On x86, it's relatively common to be -- missing DWARF unwind info. We don't want to fail in that case, -- because the frame-chain still would let us do a backtrace at -- least. */ -- dwarf_make_proc_info (&c->dwarf); -- -- if (unlikely (c->sigcontext_format != X86_SCF_NONE)) -- { -- struct sigcontext *sc = (struct sigcontext *) c->sigcontext_addr; -- -- Debug (8, "resuming at ip=%x via sigreturn(%p)\n", c->dwarf.ip, sc); --#if !defined(__ANDROID__) -- x86_sigreturn (sc); --#endif -- } -- else -- { -- Debug (8, "resuming at ip=%x via setcontext()\n", c->dwarf.ip); --#if !defined(__ANDROID__) -- setcontext (uc); --#endif -- } -+ *(volatile char *)0=0; - return -UNW_EINVAL; - } - diff --git a/meta/recipes-support/libunwind/libunwind/0004-Fix-build-on-mips-musl.patch b/meta/recipes-support/libunwind/libunwind/0004-Fix-build-on-mips-musl.patch deleted file mode 100644 index 124d0e00b19..00000000000 --- a/meta/recipes-support/libunwind/libunwind/0004-Fix-build-on-mips-musl.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 6bdab5cc8f1e2ec5f84fc9f59f1699a726980709 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 23 Mar 2016 06:08:59 +0000 -Subject: [PATCH 4/6] Fix build on mips/musl - -Do not include endian.h on musl it includes -further headers which can not be compiled in __ASSEMBLER__ - mode - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- - src/coredump/_UCD_internal.h | 35 +++++++++++++++++++++++++++++++++++ - src/mips/getcontext.S | 3 +-- - 2 files changed, 36 insertions(+), 2 deletions(-) - -diff --git a/src/coredump/_UCD_internal.h b/src/coredump/_UCD_internal.h -index 3c95a2a..21ed1c3 100644 ---- a/src/coredump/_UCD_internal.h -+++ b/src/coredump/_UCD_internal.h -@@ -44,6 +44,41 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - - #include "libunwind_i.h" - -+#ifndef __GLIBC__ -+#include <sys/reg.h> -+ -+#define EF_REG0 6 -+#define EF_REG1 7 -+#define EF_REG2 8 -+#define EF_REG3 9 -+#define EF_REG4 10 -+#define EF_REG5 11 -+#define EF_REG6 12 -+#define EF_REG7 13 -+#define EF_REG8 14 -+#define EF_REG9 15 -+#define EF_REG10 16 -+#define EF_REG11 17 -+#define EF_REG12 18 -+#define EF_REG13 19 -+#define EF_REG14 20 -+#define EF_REG15 21 -+#define EF_REG16 22 -+#define EF_REG17 23 -+#define EF_REG18 24 -+#define EF_REG19 25 -+#define EF_REG20 26 -+#define EF_REG21 27 -+#define EF_REG22 28 -+#define EF_REG23 29 -+#define EF_REG24 30 -+#define EF_REG25 31 -+#define EF_REG28 34 -+#define EF_REG29 35 -+#define EF_REG30 36 -+#define EF_REG31 37 -+#endif -+ - - #if SIZEOF_OFF_T == 4 - typedef uint32_t uoff_t; -diff --git a/src/mips/getcontext.S b/src/mips/getcontext.S -index d1dbd57..de9b681 100644 ---- a/src/mips/getcontext.S -+++ b/src/mips/getcontext.S -@@ -24,12 +24,11 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - - #include "offsets.h" --#include <endian.h> - - .text - - #if _MIPS_SIM == _ABIO32 --# if __BYTE_ORDER == __BIG_ENDIAN -+# if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ - # define OFFSET 4 - # else - # define OFFSET 0 --- -2.20.1 - diff --git a/meta/recipes-support/libunwind/libunwind/0006-Fix-for-X32.patch b/meta/recipes-support/libunwind/libunwind/0006-Fix-for-X32.patch deleted file mode 100644 index 9941612387f..00000000000 --- a/meta/recipes-support/libunwind/libunwind/0006-Fix-for-X32.patch +++ /dev/null @@ -1,29 +0,0 @@ -From f2eae0af620925b3686410470fc6fbc66ec1dc52 Mon Sep 17 00:00:00 2001 -From: Christopher Larson <chris_larson@mentor.com> -Date: Tue, 13 Dec 2016 09:50:34 -0700 -Subject: [PATCH] Fix for X32 - -Apply patch to fix the X32 build from https://github.com/sjnewbury/x32. - -Upstream-Status: Pending -Signed-off-by: Christopher Larson <chris_larson@mentor.com> - ---- - src/x86_64/Gos-linux.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/x86_64/Gos-linux.c b/src/x86_64/Gos-linux.c -index b489329..0550005 100644 ---- a/src/x86_64/Gos-linux.c -+++ b/src/x86_64/Gos-linux.c -@@ -146,8 +146,8 @@ x86_64_sigreturn (unw_cursor_t *cursor) - - Debug (8, "resuming at ip=%llx via sigreturn(%p)\n", - (unsigned long long) c->dwarf.ip, sc); -- __asm__ __volatile__ ("mov %0, %%rsp;" -- "mov %1, %%rax;" -+ __asm__ __volatile__ ("mov %q0, %%rsp;" -+ "mov %q1, %%rax;" - "syscall" - :: "r"((uint64_t)sc), "i"(SYS_rt_sigreturn) - : "memory"); diff --git a/meta/recipes-support/libunwind/libunwind/mips-byte-order.patch b/meta/recipes-support/libunwind/libunwind/mips-byte-order.patch new file mode 100644 index 00000000000..8848780fd1b --- /dev/null +++ b/meta/recipes-support/libunwind/libunwind/mips-byte-order.patch @@ -0,0 +1,35 @@ +From dbbf8110ed3fd2cbac20a8ec2ac769e13c67bab1 Mon Sep 17 00:00:00 2001 +From: Ross Burton <ross.burton@arm.com> +Date: Tue, 16 Jan 2024 18:22:38 +0000 +Subject: [PATCH 2/2] byte order + +endian.h on musl/mips can't be included in __ASSEMBLER__ mode, +so use the __BYTE_ORDER__ symbol instead. + +Upstream-Status: Pending +Signed-off-by: Ross Burton <ross.burton@arm.com> +--- + src/mips/getcontext.S | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/src/mips/getcontext.S b/src/mips/getcontext.S +index d1dbd579..de9b6818 100644 +--- a/src/mips/getcontext.S ++++ b/src/mips/getcontext.S +@@ -24,12 +24,11 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ + + #include "offsets.h" +-#include <endian.h> + + .text + + #if _MIPS_SIM == _ABIO32 +-# if __BYTE_ORDER == __BIG_ENDIAN ++# if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ + # define OFFSET 4 + # else + # define OFFSET 0 +-- +2.34.1 + diff --git a/meta/recipes-support/libunwind/libunwind/mips-coredump-register.patch b/meta/recipes-support/libunwind/libunwind/mips-coredump-register.patch new file mode 100644 index 00000000000..68adcd1d712 --- /dev/null +++ b/meta/recipes-support/libunwind/libunwind/mips-coredump-register.patch @@ -0,0 +1,100 @@ +From 7750e2a29b084ee033acc82abab410035e220d3f Mon Sep 17 00:00:00 2001 +From: Ross Burton <ross.burton@arm.com> +Date: Tue, 16 Jan 2024 18:21:26 +0000 +Subject: [PATCH 1/2] coredump-mips-register + +glibc and musl have different names for the registers, add a +macro that generates the names appropriately. + +Upstream-Status: Pending +Signed-off-by: Ross Burton <ross.burton@arm.com> + +--- + src/coredump/_UCD_access_reg_linux.c | 69 ++++++++++++++++------------ + 1 file changed, 39 insertions(+), 30 deletions(-) + +diff --git a/src/coredump/_UCD_access_reg_linux.c b/src/coredump/_UCD_access_reg_linux.c +index 27eef123..beefdb47 100644 +--- a/src/coredump/_UCD_access_reg_linux.c ++++ b/src/coredump/_UCD_access_reg_linux.c +@@ -67,38 +67,47 @@ _UCD_access_reg (unw_addr_space_t as, + goto badreg; + #else + #if defined(UNW_TARGET_MIPS) ++ ++/* glibc and musl use different names */ ++#ifdef __GLIBC__ ++#define EF_REG(x) EF_REG ## x ++#else ++#include <sys/reg.h> ++#define EF_REG(x) EF_R ## x ++#endif ++ + static const uint8_t remap_regs[] = + { +- [UNW_MIPS_R0] = EF_REG0, +- [UNW_MIPS_R1] = EF_REG1, +- [UNW_MIPS_R2] = EF_REG2, +- [UNW_MIPS_R3] = EF_REG3, +- [UNW_MIPS_R4] = EF_REG4, +- [UNW_MIPS_R5] = EF_REG5, +- [UNW_MIPS_R6] = EF_REG6, +- [UNW_MIPS_R7] = EF_REG7, +- [UNW_MIPS_R8] = EF_REG8, +- [UNW_MIPS_R9] = EF_REG9, +- [UNW_MIPS_R10] = EF_REG10, +- [UNW_MIPS_R11] = EF_REG11, +- [UNW_MIPS_R12] = EF_REG12, +- [UNW_MIPS_R13] = EF_REG13, +- [UNW_MIPS_R14] = EF_REG14, +- [UNW_MIPS_R15] = EF_REG15, +- [UNW_MIPS_R16] = EF_REG16, +- [UNW_MIPS_R17] = EF_REG17, +- [UNW_MIPS_R18] = EF_REG18, +- [UNW_MIPS_R19] = EF_REG19, +- [UNW_MIPS_R20] = EF_REG20, +- [UNW_MIPS_R21] = EF_REG21, +- [UNW_MIPS_R22] = EF_REG22, +- [UNW_MIPS_R23] = EF_REG23, +- [UNW_MIPS_R24] = EF_REG24, +- [UNW_MIPS_R25] = EF_REG25, +- [UNW_MIPS_R28] = EF_REG28, +- [UNW_MIPS_R29] = EF_REG29, +- [UNW_MIPS_R30] = EF_REG30, +- [UNW_MIPS_R31] = EF_REG31, ++ [UNW_MIPS_R0] = EF_REG(0), ++ [UNW_MIPS_R1] = EF_REG(1), ++ [UNW_MIPS_R2] = EF_REG(2), ++ [UNW_MIPS_R3] = EF_REG(3), ++ [UNW_MIPS_R4] = EF_REG(4), ++ [UNW_MIPS_R5] = EF_REG(5), ++ [UNW_MIPS_R6] = EF_REG(6), ++ [UNW_MIPS_R7] = EF_REG(7), ++ [UNW_MIPS_R8] = EF_REG(8), ++ [UNW_MIPS_R9] = EF_REG(9), ++ [UNW_MIPS_R10] = EF_REG(10), ++ [UNW_MIPS_R11] = EF_REG(11), ++ [UNW_MIPS_R12] = EF_REG(12), ++ [UNW_MIPS_R13] = EF_REG(13), ++ [UNW_MIPS_R14] = EF_REG(14), ++ [UNW_MIPS_R15] = EF_REG(15), ++ [UNW_MIPS_R16] = EF_REG(16), ++ [UNW_MIPS_R17] = EF_REG(17), ++ [UNW_MIPS_R18] = EF_REG(18), ++ [UNW_MIPS_R19] = EF_REG(19), ++ [UNW_MIPS_R20] = EF_REG(20), ++ [UNW_MIPS_R21] = EF_REG(21), ++ [UNW_MIPS_R22] = EF_REG(22), ++ [UNW_MIPS_R23] = EF_REG(23), ++ [UNW_MIPS_R24] = EF_REG(24), ++ [UNW_MIPS_R25] = EF_REG(25), ++ [UNW_MIPS_R28] = EF_REG(28), ++ [UNW_MIPS_R29] = EF_REG(29), ++ [UNW_MIPS_R30] = EF_REG(30), ++ [UNW_MIPS_R31] = EF_REG(31), + [UNW_MIPS_PC] = EF_CP0_EPC, + }; + #elif defined(UNW_TARGET_X86) +-- +2.34.1 + diff --git a/meta/recipes-support/libunwind/libunwind/musl-header-conflict.patch b/meta/recipes-support/libunwind/libunwind/musl-header-conflict.patch deleted file mode 100644 index 49985b5b3c7..00000000000 --- a/meta/recipes-support/libunwind/libunwind/musl-header-conflict.patch +++ /dev/null @@ -1,44 +0,0 @@ -From e1de5a5b42062dc02769f320c7785928b2ee0c57 Mon Sep 17 00:00:00 2001 -From: Richard Purdie <richard.purdie@linuxfoundation.org> -Date: Thu, 18 Aug 2016 14:46:32 +0100 -Subject: [PATCH] If you: - -TCLIBC=musl bitbake unwind -TCLIBC=musl bitbake gcc-runtime -c cleansstate -TCLIBC=musl bitbake gcc-runtime - -you will see libstdc++ fail to build due to finding libunwind's header file. - -Khem: "When we build any of gcc components they expect to use internal version -and that works with glibc based gcc since the search headers first look into gcc -headers, however with musl the gcc headers are searched after the standard -headers ( which is by design the right thing )." - -This patch hacks around the issue by looking for a define used during gcc-runtime's -build and skipping to the internal header in that case. - -[YOCTO #10129] - -RP 2016/8/18 - -Upstream-Status: Inappropriate [really need to fix gcc] - ---- - include/unwind.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/include/unwind.h b/include/unwind.h -index 93780fa..c812414 100644 ---- a/include/unwind.h -+++ b/include/unwind.h -@@ -23,6 +23,10 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION - OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - -+#ifdef _GLIBCXX_SHARED -+#include_next <unwind.h> -+#endif -+ - #ifndef _UNWIND_H - #define _UNWIND_H - diff --git a/meta/recipes-support/libunwind/libunwind_1.6.2.bb b/meta/recipes-support/libunwind/libunwind_1.6.2.bb index 650e2c9ec40..d40a2af26d3 100644 --- a/meta/recipes-support/libunwind/libunwind_1.6.2.bb +++ b/meta/recipes-support/libunwind/libunwind_1.6.2.bb @@ -7,13 +7,11 @@ DEPENDS += "libatomic-ops" DEPENDS:append:libc-musl = " libucontext" SRC_URI = "http://download.savannah.nongnu.org/releases/libunwind/libunwind-${PV}.tar.gz \ - file://0003-x86-Stub-out-x86_local_resume.patch \ - file://0004-Fix-build-on-mips-musl.patch \ + file://mips-byte-order.patch \ + file://mips-coredump-register.patch \ file://0005-ppc32-Consider-ucontext-mismatches-between-glibc-and.patch \ - file://0006-Fix-for-X32.patch \ file://0001-src-Gtrace-remove-unguarded-print-calls.patch \ " -SRC_URI:append:libc-musl = " file://musl-header-conflict.patch" SRC_URI[sha256sum] = "4a6aec666991fb45d0889c44aede8ad6eb108071c3554fcdff671f9c94794976" -- 2.34.1 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 4/4] libunwind: clean up configuration 2024-01-17 15:07 [PATCH 1/4] musl: doesn't support riscv32 ross.burton 2024-01-17 15:07 ` [PATCH 2/4] libunwind: merge .inc and .bb ross.burton 2024-01-17 15:07 ` [PATCH 3/4] libunwind: refresh patches ross.burton @ 2024-01-17 15:07 ` ross.burton 2024-01-17 17:51 ` [OE-core] [PATCH 1/4] musl: doesn't support riscv32 Khem Raj 3 siblings, 0 replies; 8+ messages in thread From: ross.burton @ 2024-01-17 15:07 UTC (permalink / raw) To: openembedded-core From: Ross Burton <ross.burton@arm.com> Add a PACKAGECONFIG for the support for zlib-compressed debuginfo. There's no need to explicitly enable reading of .debug_frame segments as this is enabled automatically for arm/aarch64. Enable static globally, there's not much to gain by making this musl-specific. Don't disable the tests on musl as they verify that libunwind can link, which is important with external libucontext libraries. No need to disable documentation on musl, as it's already disabled out of the box. Signed-off-by: Ross Burton <ross.burton@arm.com> --- meta/recipes-support/libunwind/libunwind_1.6.2.bb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/meta/recipes-support/libunwind/libunwind_1.6.2.bb b/meta/recipes-support/libunwind/libunwind_1.6.2.bb index d40a2af26d3..3208785124a 100644 --- a/meta/recipes-support/libunwind/libunwind_1.6.2.bb +++ b/meta/recipes-support/libunwind/libunwind_1.6.2.bb @@ -21,13 +21,10 @@ COMPATIBLE_HOST:riscv32 = "null" PACKAGECONFIG ??= "" PACKAGECONFIG[lzma] = "--enable-minidebuginfo,--disable-minidebuginfo,xz" +PACKAGECONFIG[zlib] = "--enable-zlibdebuginfo,--disable-zlibdebuginfo,zlib" PACKAGECONFIG[latexdocs] = "--enable-documentation, --disable-documentation, latex2man-native" -EXTRA_OECONF:arm = "--enable-debug-frame" -EXTRA_OECONF:armeb = "--enable-debug-frame" -EXTRA_OECONF:aarch64 = "--enable-debug-frame" - -EXTRA_OECONF:append:libc-musl = " --disable-documentation --disable-tests --enable-static" +EXTRA_OECONF = "--enable-static" # http://errors.yoctoproject.org/Errors/Details/20487/ ARM_INSTRUCTION_SET:armv4 = "arm" -- 2.34.1 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [OE-core] [PATCH 1/4] musl: doesn't support riscv32 2024-01-17 15:07 [PATCH 1/4] musl: doesn't support riscv32 ross.burton ` (2 preceding siblings ...) 2024-01-17 15:07 ` [PATCH 4/4] libunwind: clean up configuration ross.burton @ 2024-01-17 17:51 ` Khem Raj 3 siblings, 0 replies; 8+ messages in thread From: Khem Raj @ 2024-01-17 17:51 UTC (permalink / raw) To: Ross Burton; +Cc: openembedded-core On Wed, Jan 17, 2024 at 7:07 AM Ross Burton <ross.burton@arm.com> wrote: > > From: Ross Burton <ross.burton@arm.com> > > musl doesn't support riscv32, so set COMPATIBLE_HOST appropriately. > > Signed-off-by: Ross Burton <ross.burton@arm.com> > --- > meta/recipes-core/musl/musl.inc | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/meta/recipes-core/musl/musl.inc b/meta/recipes-core/musl/musl.inc > index 66468e92ff0..6ca52b186a5 100644 > --- a/meta/recipes-core/musl/musl.inc > +++ b/meta/recipes-core/musl/musl.inc > @@ -25,6 +25,9 @@ MIPS_INSTRUCTION_SET = "mips" > ARM_INSTRUCTION_SET:armv5 = "arm" > ARM_INSTRUCTION_SET:armv4 = "arm" > > +# 1.2.4 doesn't support riscv32 > +COMPATIBLE_HOST:riscv32 = "null" there is a port in meta-riscv for RV32 which is WIP for upstreaming. I think it is better to direct folks to use meta-riscv until then > + > # Enable out of tree build > B = "${WORKDIR}/build" > > -- > 2.34.1 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#193919): https://lists.openembedded.org/g/openembedded-core/message/193919 > Mute This Topic: https://lists.openembedded.org/mt/103787497/1997914 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [raj.khem@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- > ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2024-01-17 22:37 UTC | newest] Thread overview: 8+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2024-01-17 15:07 [PATCH 1/4] musl: doesn't support riscv32 ross.burton 2024-01-17 15:07 ` [PATCH 2/4] libunwind: merge .inc and .bb ross.burton 2024-01-17 17:19 ` [OE-core] " Etienne Cordonnier 2024-01-17 17:25 ` Ross Burton 2024-01-17 22:37 ` Etienne Cordonnier 2024-01-17 15:07 ` [PATCH 3/4] libunwind: refresh patches ross.burton 2024-01-17 15:07 ` [PATCH 4/4] libunwind: clean up configuration ross.burton 2024-01-17 17:51 ` [OE-core] [PATCH 1/4] musl: doesn't support riscv32 Khem Raj
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox