diff options
| author |   Daniel Black <dragonheart@gentoo.org> | 2004-09-27 10:51:49 +0000 |
|---|---|---|
| committer | Daniel Black <dragonheart@gentoo.org> | 2004-09-27 10:51:49 +0000 |
| commit | 45960d175059b23f064528046ca2ff9da12a0921 (patch) | |
| tree | 355b021cf685892f7d52d257926eb5c0c196394d /app-emulation/basiliskII/files | |
| parent | resolv.conf permissions (Manifest recommit) (diff) | |
| download | gentoo-2-45960d175059b23f064528046ca2ff9da12a0921.tar.gz gentoo-2-45960d175059b23f064528046ca2ff9da12a0921.tar.bz2 gentoo-2-45960d175059b23f064528046ca2ff9da12a0921.zip | |
Patches to fix with gcc-3.4 by fn_x@hotmail.com in bug #65444
Diffstat (limited to 'app-emulation/basiliskII/files')
| -rw-r--r-- | app-emulation/basiliskII/files/basiliskII-gcc34.patch | 81 | ||||
| -rw-r--r-- | app-emulation/basiliskII/files/digest-basiliskII-0.9.0 | 1 |
2 files changed, 81 insertions, 1 deletions
diff --git a/app-emulation/basiliskII/files/basiliskII-gcc34.patch b/app-emulation/basiliskII/files/basiliskII-gcc34.patch new file mode 100644 index 000000000000..be98091ee733 --- /dev/null +++ b/app-emulation/basiliskII/files/basiliskII-gcc34.patch @@ -0,0 +1,81 @@ +--- BasiliskII-1.0.orig/src/uae_cpu/fpu/fpu_x86.cpp ++++ BasiliskII-1.0/src/uae_cpu/fpu/fpu_x86.cpp +@@ -146,6 +146,9 @@ + #define _ASM __asm__ __volatile__ + #define min(a, b) (((a) < (b)) ? (a) : (b)) + ++#define STR(x) STR_(x) ++#define STR_(x) #x ++ + /* ---------------------------- Configuration ---------------------------- */ + + /* +@@ -1056,8 +1059,8 @@ + } */ + + _ASM( "fstcw %0\n" +- "andl $(~X86_ROUND_CONTROL_MASK), %0\n" ++ "andl $(~" STR(X86_ROUND_CONTROL_MASK) "), %0\n" +- "orl $CW_RC_ZERO, %0\n" ++ "orl $" STR(CW_RC_ZERO) ", %0\n" + "fldcw %0\n" + "fldt %3\n" + "frndint\n" +@@ -1645,7 +1648,7 @@ + "0:\n" // partial_loop + "fprem \n" + "fnstsw %2\n" // %2: status (read/write) +- "testl $SW_C2, %2\n" ++ "testl $" STR(SW_C2) ", %2\n" + "jne 0b\n" + "fxam \n" + "fnstsw %3\n" // %3: sw (write) +@@ -1663,7 +1666,7 @@ + "0:\n" // partial_loop + "fprem \n" + "fnstsw %0\n" // %0: status (read/write) +- "testl $SW_C2, %0\n" ++ "testl $" STR(SW_C2) ", %0\n" + "jne 0b\n" + "fxam \n" + "fnstsw %1\n" // %1: sw (write) +@@ -1765,7 +1768,7 @@ + "0:\n" // partial_loop + "fprem1 \n" + "fnstsw %2\n" // %2: status (read/write) +- "testl $SW_C2, %2\n" ++ "testl $" STR(SW_C2) ", %2\n" + "jne 0b\n" + "fxam \n" + "fnstsw %3\n" // %3: sw (write) +@@ -1783,7 +1786,7 @@ + "0:\n" // partial_loop + "fprem1 \n" + "fnstsw %0\n" // %0: status (read/write) +- "testl $SW_C2, %0\n" ++ "testl $" STR(SW_C2) ", %0\n" + "jne 0b\n" + "fxam \n" + "fnstsw %1\n" // %1: sw (write) +@@ -1999,8 +2002,8 @@ + FLDCW cw + } */ + _ASM( "fstcw %0\n" +- "andl $(~X86_PRECISION_CONTROL_MASK), %0\n" ++ "andl $(~" STR(X86_PRECISION_CONTROL_MASK) "), %0\n" +- "orl $PRECISION_CONTROL_SINGLE, %0\n" ++ "orl $" STR(PRECISION_CONTROL_SINGLE) ", %0\n" + "fldcw %0\n" + "fldt %3\n" + "fldt %2\n" +@@ -2079,8 +2082,8 @@ + FLDCW cw + } */ + _ASM( "fstcw %0\n" +- "andl $(~X86_PRECISION_CONTROL_MASK), %0\n" ++ "andl $(~" STR(X86_PRECISION_CONTROL_MASK) "), %0\n" +- "orl $PRECISION_CONTROL_SINGLE, %0\n" ++ "orl $" STR(PRECISION_CONTROL_SINGLE) ", %0\n" + "fldcw %0\n" + "fldt %3\n" + "fldt %2\n" diff --git a/app-emulation/basiliskII/files/digest-basiliskII-0.9.0 b/app-emulation/basiliskII/files/digest-basiliskII-0.9.0 deleted file mode 100644 index 4162d32bbfbe..000000000000 --- a/app-emulation/basiliskII/files/digest-basiliskII-0.9.0 +++ /dev/null @@ -1 +0,0 @@ -MD5 5017e21226c27a4a029da0486dcf04e1 BasiliskII_src_31052001.tar.gz 465882 |