From: kub <derkub@gmail.com>
Date: Sun, 16 Feb 2020 07:32:29 +0000 (+0100)
Subject: fix compatibility with ancient gas
X-Git-Tag: v2.00~788
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c64370328ced70bab4e4e59d3f04eaad123d646c;p=picodrive.git

fix compatibility with ancient gas
---

diff --git a/README.md b/README.md
index 67f60c2c..a5d0ad3a 100644
--- a/README.md
+++ b/README.md
@@ -35,10 +35,7 @@ opendingux|opendingux|CROSS_COMPILE=mipsel-linux- CFLAGS="-I$TC/usr/include -I$T
 opendingux|opendingux with ubuntu mips gcc 5.4|CROSS_COMPILE=mipsel-linux-gnu- CFLAGS="-I$TC/usr/include -I$TC/usr/include/SDL" LDFLAGS="-B$TC/usr/lib -B$TC/lib -Wl,-rpath-link=$TC/usr/lib -Wl,-rpath-link=$TC/lib" ./configure --platform=opendingux
 gcw0|gcw0|CROSS_COMPILE=mipsel-gcw0-linux-uclibc- CFLAGS="-I$TC/usr/mipsel-gcw0-linux-uclibc/sysroot/usr/include -I$TC/usr/mipsel-gcw0-linux-uclibc/sysroot/usr/include/SDL" LDFLAGS="--sysroot $TC/usr/mipsel-gcw0-linux-uclibc/sysroot" ./configure --platform=gcw0
 
-For gp2x, wiz, and caanoo you may need to compile libpng first, and additionally
-cyclone_gp2x.patch may need to be applied to the cpu/cyclone submodule:
-
-> patch -d cpu/cyclone -p1 <cyclone_gp2x.patch
+For gp2x, wiz, and caanoo you may need to compile libpng first.
 
 After configure, compile with
 
diff --git a/cpu/cyclone b/cpu/cyclone
index 5fc93bdd..94a9d9a8 160000
--- a/cpu/cyclone
+++ b/cpu/cyclone
@@ -1 +1 @@
-Subproject commit 5fc93bddb71461abb7619cf506d6f15ba8a675f3
+Subproject commit 94a9d9a888e72cbfa4db12113cd113cf5e154f7f
diff --git a/cyclone_gp2x.patch b/cyclone_gp2x.patch
deleted file mode 100644
index 8c962719..00000000
--- a/cyclone_gp2x.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff --git a/OpArith.cpp b/OpArith.cpp
-index 96c7e0d..09517b8 100644
---- a/OpArith.cpp
-+++ b/OpArith.cpp
-@@ -425,7 +425,7 @@ int OpAbcd(int op)
-     ot("  add r1,r1,r0\n");
-     ot("  add r1,r1,r6\n");
-     ot("  mov r12,r1\n");
--    ot("  addhi r12,#6 ;@ Decimal adjust units\n");
-+    ot("  addhi r12,r12,#6 ;@ Decimal adjust units\n");
-     ot("  tst r1,#0x80\n");
-     ot("  orreq r10,r10,#0x10000000 ;@ Undefined V behavior\n");
-     ot("  cmp r12,#0x9f\n");
-@@ -452,7 +452,7 @@ int OpAbcd(int op)
-     ot("  cmp r1,r12\n");
-     ot("  orrlt r10,r10,#0x20000000 ;@ C\n");
-     ot("  cmp r1,#0xff\n");
--    ot("  addhi r1,#0xa0\n");
-+    ot("  addhi r1,r1,#0xa0\n");
-     ot("  sub r12,r1,r12\n");
-     ot("  movs r0,r12,lsl #24\n");
-     ot("  bicmi r10,r10,#0x10000000 ;@ Undefined V behavior part II\n");
-diff --git a/OpLogic.cpp b/OpLogic.cpp
-index 012e35a..d40d814 100644
---- a/OpLogic.cpp
-+++ b/OpLogic.cpp
-@@ -74,12 +74,12 @@ const char *TestCond(int m68k_cc, int invert)
-       break;
-     case 0x0e: // gt
-       ot("  eor r0,r10,r10,lsl #3 ;@ gt: !Z && N == V\n");
--      ot("  orrs r0,r10,lsl #1\n");
-+      ot("  orrs r0,r0,r10,lsl #1\n");
-       cond="pl", icond="mi";
-       break;
-     case 0x0f: // le
-       ot("  eor r0,r10,r10,lsl #3 ;@ le: Z || N != V\n");
--      ot("  orrs r0,r10,lsl #1\n");
-+      ot("  orrs r0,r0,r10,lsl #1\n");
-       cond="mi", icond="pl";
-       break;
-     default: