* [Buildroot] [PATCH 1/1] package/openpgm: fix build for non-x86 targets
@ 2022-11-20 9:06 Alexander Lukichev
2022-11-20 9:17 ` Yann E. MORIN
2022-11-23 9:49 ` Peter Korsgaard
0 siblings, 2 replies; 4+ messages in thread
From: Alexander Lukichev @ 2022-11-20 9:06 UTC (permalink / raw)
To: buildroot; +Cc: Alexander Lukichev, Fabrice Fontaine
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
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
+
--
2.37.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/openpgm: fix build for non-x86 targets
2022-11-20 9:06 [Buildroot] [PATCH 1/1] package/openpgm: fix build for non-x86 targets Alexander Lukichev
@ 2022-11-20 9:17 ` Yann E. MORIN
2022-11-20 9:49 ` Alexander Lukichev
2022-11-23 9:49 ` Peter Korsgaard
1 sibling, 1 reply; 4+ messages in thread
From: Yann E. MORIN @ 2022-11-20 9:17 UTC (permalink / raw)
To: Alexander Lukichev; +Cc: Fabrice Fontaine, buildroot
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
--
.-----------------.--------------------.------------------.--------------------.
| 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
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/openpgm: fix build for non-x86 targets
2022-11-20 9:17 ` Yann E. MORIN
@ 2022-11-20 9:49 ` Alexander Lukichev
0 siblings, 0 replies; 4+ messages in thread
From: Alexander Lukichev @ 2022-11-20 9:49 UTC (permalink / raw)
To: Yann E. MORIN; +Cc: Fabrice Fontaine, buildroot
[-- Attachment #1.1: Type: text/plain, Size: 199 bytes --]
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
[-- Attachment #1.2: Type: text/html, Size: 417 bytes --]
[-- Attachment #2: Type: text/plain, Size: 150 bytes --]
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/openpgm: fix build for non-x86 targets
2022-11-20 9:06 [Buildroot] [PATCH 1/1] package/openpgm: fix build for non-x86 targets Alexander Lukichev
2022-11-20 9:17 ` Yann E. MORIN
@ 2022-11-23 9:49 ` Peter Korsgaard
1 sibling, 0 replies; 4+ messages in thread
From: Peter Korsgaard @ 2022-11-23 9:49 UTC (permalink / raw)
To: Alexander Lukichev; +Cc: Fabrice Fontaine, buildroot
>>>>> "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.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-11-23 9:49 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-20 9:06 [Buildroot] [PATCH 1/1] package/openpgm: fix build for non-x86 targets Alexander Lukichev
2022-11-20 9:17 ` Yann E. MORIN
2022-11-20 9:49 ` Alexander Lukichev
2022-11-23 9:49 ` Peter Korsgaard
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.