git: 5701f4ab6e2f - main - emulators/aranym: Fix build on armv7
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 04 Oct 2022 16:04:48 UTC
The branch main has been updated by yuri:
URL: https://cgit.FreeBSD.org/ports/commit/?id=5701f4ab6e2f746abd7287ab3c9da233ea61e854
commit 5701f4ab6e2f746abd7287ab3c9da233ea61e854
Author: Robert Clausecker <fuz@fuz.su>
AuthorDate: 2022-10-04 14:31:18 +0000
Commit: Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2022-10-04 16:04:45 +0000
emulators/aranym: Fix build on armv7
PR: 266816
---
emulators/aranym/files/patch-src_uae__cpu_m68k.h | 74 ++++++++++++++++++++++++
1 file changed, 74 insertions(+)
diff --git a/emulators/aranym/files/patch-src_uae__cpu_m68k.h b/emulators/aranym/files/patch-src_uae__cpu_m68k.h
new file mode 100644
index 000000000000..657e16c40dc6
--- /dev/null
+++ b/emulators/aranym/files/patch-src_uae__cpu_m68k.h
@@ -0,0 +1,74 @@
+--- src/uae_cpu/m68k.h.orig 2022-10-04 08:41:56 UTC
++++ src/uae_cpu/m68k.h
+@@ -561,7 +561,7 @@ static inline int cctrue(int cc)
+ "mrs %[nzcv],cpsr\n\t" \
+ "bic %[nzcv],#0x30000000\n\t" \
+ : [nzcv] "=r" (regflags.nzcv) \
+- : [rv] "0" (v) \
++ : [rv] "0" ((uint32)v) \
+ : "cc"); \
+ }while(0)
+
+@@ -571,7 +571,7 @@ static inline int cctrue(int cc)
+ "mrs %[nzcv],cpsr\n\t" \
+ "bic %[nzcv],#0x30000000\n\t" \
+ : [nzcv] "=r" (regflags.nzcv) \
+- : [rv] "0" (v) \
++ : [rv] "0" ((uint32)v) \
+ : "cc"); \
+ }while(0)
+
+@@ -581,7 +581,7 @@ static inline int cctrue(int cc)
+ "adds %[rd],%[rd],%[rs]\n\t" \
+ "mrs %[nzcv],cpsr\n\t" \
+ : [nzcv] "=r" (regflags.nzcv), [rv] "=r" (v) \
+- : [rs] "ri" (s), [rd] "1" (d) \
++ : [rs] "ri" (s), [rd] "1" ((uint32)d) \
+ : "cc"); \
+ COPY_CARRY(); \
+ } while(0)
+@@ -592,7 +592,7 @@ static inline int cctrue(int cc)
+ "adds %[rd],%[rd],%[rs]\n\t" \
+ "mrs %[nzcv],cpsr\n\t" \
+ : [nzcv] "=r" (regflags.nzcv), [rv] "=r" (v) \
+- : [rs] "ri" (s), [rd] "1" (d) \
++ : [rs] "ri" (s), [rd] "1" ((uint32)d) \
+ : "cc"); \
+ COPY_CARRY(); \
+ } while(0)
+@@ -604,7 +604,7 @@ static inline int cctrue(int cc)
+ "mrs %[nzcv],cpsr\n\t" \
+ "eor %[nzcv],#0x20000000\n\t" \
+ : [nzcv] "=r" (regflags.nzcv), [rv] "=r" (v) \
+- : [rs] "ri" (s), [rd] "1" (d) \
++ : [rs] "ri" (s), [rd] "1" ((uint32)d) \
+ : "cc"); \
+ COPY_CARRY(); \
+ } while(0)
+@@ -616,7 +616,7 @@ static inline int cctrue(int cc)
+ "mrs %[nzcv],cpsr\n\t" \
+ "eor %[nzcv],#0x20000000\n\t" \
+ : [nzcv] "=r" (regflags.nzcv), [rv] "=r" (v) \
+- : [rs] "ri" (s), [rd] "1" (d) \
++ : [rs] "ri" (s), [rd] "1" ((uint32)d) \
+ : "cc"); \
+ COPY_CARRY(); \
+ } while(0)
+@@ -628,7 +628,7 @@ static inline int cctrue(int cc)
+ "mrs %[nzcv],cpsr\n\t" \
+ "eor %[nzcv],#0x20000000\n\t" \
+ : [nzcv] "=r" (regflags.nzcv) \
+- : [rs] "ri" (s), [rd] "0" (d) \
++ : [rs] "ri" (s), [rd] "0" ((uint32)d) \
+ : "cc"); \
+ } while(0)
+
+@@ -639,7 +639,7 @@ static inline int cctrue(int cc)
+ "mrs %[nzcv],cpsr\n\t" \
+ "eor %[nzcv],#0x20000000\n\t" \
+ : [nzcv] "=r" (regflags.nzcv) \
+- : [rs] "ri" (s), [rd] "0" (d) \
++ : [rs] "ri" (s), [rd] "0" ((uint32)d) \
+ : "cc"); \
+ } while(0)
+