8f706ebb2c
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> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
35 lines
797 B
Diff
35 lines
797 B
Diff
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
|
|
|
|
[alexander.lukichev@gmail.com: backport from upstream]
|
|
Signed-off-by: Alexander Lukichev <alexander.lukichev@gmail.com>
|
|
---
|
|
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
|
|
|