package/openpgm: fix build for non-x86 targets
PATCH 1/1 package/openpgm: fix build for non-x86 targets
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.
--- .../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
package/openpgm/0003-fix-build-on-macOS-ARM.patch new file +34 -0
@@ -0,0 +1,34 @@ +From 43dfc3e3a66b8e4584eb46219b129197a2428181 Mon Sep 17 00:00:00 2001 +From: Michael Cho <[email protected]> +Date: Thu, 10 Mar 2022 22:46:29 -0800 +Subject: [PATCH] fix build on macOS ARM + +Signed-off-by: Alexander Lukichev <[email protected]> +[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 +
Signature · 6 lines
2.37.2 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Yann E. MORIN
AppliedAlexander, All,
On 2022-11-20 11:06 +0200, Alexander Lukichev spake thusly:
Quoted 10 lines
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.
Signed-off-by Alexander Lukichev <[email protected]>
Applied to master, thanks.
But see below for a little nit...
Quoted 11 lines
--- .../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.patchpackage/openpgm/0003-fix-build-on-macOS-ARM.patch new file +0
-0
package/openpgm/0003-fix-build-on-macOS-ARM.patch line 7
Quoted 7 lines
package/openpgm/0003-fix-build-on-macOS-ARM.patch new file +7
-0@@ -0,0 +1,34 @@ +From 43dfc3e3a66b8e4584eb46219b129197a2428181 Mon Sep 17 00:00:00 2001 +From: Michael Cho <[email protected]> +Date: Thu, 10 Mar 2022 22:46:29 -0800 +Subject: [PATCH] fix build on macOS ARM + +Signed-off-by: Alexander Lukichev <[email protected]> +[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.
Quoted 34 lines
package/openpgm/0003-fix-build-on-macOS-ARM.patch new file +27
-0+--- + 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 +Signature · 6 lines
2.37.2 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Signature · 10 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Hi Yann,
Quoted 2 lines
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
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Quoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Alexander" == Alexander Lukichev <[email protected]> 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.
Quoted 5 lines
Signed-off-by Alexander Lukichev <[email protected]>
Committed to 2022.08.x and 2022.02.x, thanks.
Signature · 5 lines
Bye, Peter Korsgaard _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot