| Message ID | 20221120090654.312078-1-alexander.lukichev@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/1] package/openpgm: fix build for non-x86 targets | expand |
Alexander, All, On 2022-11-20 11:06 +0200, Alexander Lukichev spake thusly: > openpgm-5-3-128 has assembly code for x86 that is not guarded by > architecture defines. A patch to fix that has been merged upstream > some time ago, and the next release will have it. This includes > that patch for the time being. > > Fixes: http://autobuild.buildroot.net/results/338291e5bf0671cb7ed7a32cc10e546c7a521acc > Fixes: http://autobuild.buildroot.net/results/3ab6d7f9ee841fa18c1c220d722b1c06ca1fff30 > Fixes: http://autobuild.buildroot.net/results/68e840b1fec8f14775cef0b6a14d9b847337324b > > Signed-off-by: Alexander Lukichev <alexander.lukichev@gmail.com> Applied to master, thanks. But see below for a little nit... > --- > .../openpgm/0003-fix-build-on-macOS-ARM.patch | 34 +++++++++++++++++++ > 1 file changed, 34 insertions(+) > create mode 100644 package/openpgm/0003-fix-build-on-macOS-ARM.patch > > diff --git a/package/openpgm/0003-fix-build-on-macOS-ARM.patch b/package/openpgm/0003-fix-build-on-macOS-ARM.patch > new file mode 100644 > index 0000000000..be52fb27a6 > --- /dev/null > +++ b/package/openpgm/0003-fix-build-on-macOS-ARM.patch > @@ -0,0 +1,34 @@ > +From 43dfc3e3a66b8e4584eb46219b129197a2428181 Mon Sep 17 00:00:00 2001 > +From: Michael Cho <cho-m@tuta.io> > +Date: Thu, 10 Mar 2022 22:46:29 -0800 > +Subject: [PATCH] fix build on macOS ARM > + > +Signed-off-by: Alexander Lukichev <alexander.lukichev@gmail.com> > +[Upstream status: https://github.com/steve-o/openpgm/pull/71] Pointing to a PR hints that the patch is still pending, but as your commit log said it was applied, that did not match. So I checked, and indeed the patch is an actual backport. So I slightly tweaked it to make it obvious it is a backport rather than a pending patch. Thanks! Regards, Yann E. MORIN. > +--- > + openpgm/pgm/cpu.c | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/openpgm/pgm/cpu.c b/openpgm/pgm/cpu.c > +index cbcc988..f5da471 100644 > +--- a/openpgm/pgm/cpu.c > ++++ b/openpgm/pgm/cpu.c > +@@ -33,6 +33,7 @@ > + //#define CPU_DEBUG > + > + > ++#if defined(__i386__) || defined(__x86_64__) > + #ifndef _MSC_VER > + static > + void > +@@ -59,7 +60,6 @@ _xgetbv(uint32_t xcr) { > + #endif > + > + > +-#if defined(__i386__) || defined(__x86_64__) > + PGM_GNUC_INTERNAL > + void > + pgm_cpuid (pgm_cpu_t* cpu) > +-- > +2.37.2 > + > -- > 2.37.2 > > _______________________________________________ > buildroot mailing list > buildroot@buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot
Hi Yann, > So I slightly tweaked it to make it obvious it is a backport rather than > a pending patch. Thanks, I'll take care to tag them properly next time! -- Best regards, Alexander Lukichev
>>>>> "Alexander" == Alexander Lukichev <alexander.lukichev@gmail.com> writes: > openpgm-5-3-128 has assembly code for x86 that is not guarded by > architecture defines. A patch to fix that has been merged upstream > some time ago, and the next release will have it. This includes > that patch for the time being. > Fixes: http://autobuild.buildroot.net/results/338291e5bf0671cb7ed7a32cc10e546c7a521acc > Fixes: http://autobuild.buildroot.net/results/3ab6d7f9ee841fa18c1c220d722b1c06ca1fff30 > Fixes: http://autobuild.buildroot.net/results/68e840b1fec8f14775cef0b6a14d9b847337324b > Signed-off-by: Alexander Lukichev <alexander.lukichev@gmail.com> Committed to 2022.08.x and 2022.02.x, thanks.
diff --git a/package/openpgm/0003-fix-build-on-macOS-ARM.patch b/package/openpgm/0003-fix-build-on-macOS-ARM.patch new file mode 100644 index 0000000000..be52fb27a6 --- /dev/null +++ b/package/openpgm/0003-fix-build-on-macOS-ARM.patch @@ -0,0 +1,34 @@ +From 43dfc3e3a66b8e4584eb46219b129197a2428181 Mon Sep 17 00:00:00 2001 +From: Michael Cho <cho-m@tuta.io> +Date: Thu, 10 Mar 2022 22:46:29 -0800 +Subject: [PATCH] fix build on macOS ARM + +Signed-off-by: Alexander Lukichev <alexander.lukichev@gmail.com> +[Upstream status: https://github.com/steve-o/openpgm/pull/71] +--- + openpgm/pgm/cpu.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/openpgm/pgm/cpu.c b/openpgm/pgm/cpu.c +index cbcc988..f5da471 100644 +--- a/openpgm/pgm/cpu.c ++++ b/openpgm/pgm/cpu.c +@@ -33,6 +33,7 @@ + //#define CPU_DEBUG + + ++#if defined(__i386__) || defined(__x86_64__) + #ifndef _MSC_VER + static + void +@@ -59,7 +60,6 @@ _xgetbv(uint32_t xcr) { + #endif + + +-#if defined(__i386__) || defined(__x86_64__) + PGM_GNUC_INTERNAL + void + pgm_cpuid (pgm_cpu_t* cpu) +-- +2.37.2 +
openpgm-5-3-128 has assembly code for x86 that is not guarded by architecture defines. A patch to fix that has been merged upstream some time ago, and the next release will have it. This includes that patch for the time being. Fixes: http://autobuild.buildroot.net/results/338291e5bf0671cb7ed7a32cc10e546c7a521acc Fixes: http://autobuild.buildroot.net/results/3ab6d7f9ee841fa18c1c220d722b1c06ca1fff30 Fixes: http://autobuild.buildroot.net/results/68e840b1fec8f14775cef0b6a14d9b847337324b Signed-off-by: Alexander Lukichev <alexander.lukichev@gmail.com> --- .../openpgm/0003-fix-build-on-macOS-ARM.patch | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 package/openpgm/0003-fix-build-on-macOS-ARM.patch