| 1 |
tupone 09/09/08 07:59:53 |
| 2 |
|
| 3 |
Added: mupen64-0.5-gcc43.patch |
| 4 |
Log: |
| 5 |
Fix build with gcc-4.3 Bug #268917 |
| 6 |
(Portage version: 2.1.6.13/cvs/Linux i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 games-emulation/mupen64/files/mupen64-0.5-gcc43.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-emulation/mupen64/files/mupen64-0.5-gcc43.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-emulation/mupen64/files/mupen64-0.5-gcc43.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: mupen64-0.5-gcc43.patch |
| 15 |
=================================================================== |
| 16 |
--- r4300/interupt.c.old 2009-09-08 09:16:14.000000000 +0200 |
| 17 |
+++ r4300/interupt.c 2009-09-08 09:16:33.000000000 +0200 |
| 18 |
@@ -428,7 +428,7 @@ |
| 19 |
PIF_RAMb[0x3F] = 0x0; |
| 20 |
remove_interupt_event(); |
| 21 |
MI_register.mi_intr_reg |= 0x02; |
| 22 |
- si_register.si_status |= 0x1000; |
| 23 |
+ si_register._si_status |= 0x1000; |
| 24 |
if (MI_register.mi_intr_reg & MI_register.mi_intr_mask_reg) |
| 25 |
Cause = (Cause | 0x400) & 0xFFFFFF83; |
| 26 |
else |
| 27 |
--- memory/memory.c.old 2009-09-08 09:45:28.000000000 +0200 |
| 28 |
+++ memory/memory.c 2009-09-08 09:45:47.000000000 +0200 |
| 29 |
@@ -833,13 +833,13 @@ |
| 30 |
si_register.si_dram_addr = 0; |
| 31 |
si_register.si_pif_addr_rd64b = 0; |
| 32 |
si_register.si_pif_addr_wr64b = 0; |
| 33 |
- si_register.si_status = 0; |
| 34 |
+ si_register._si_status = 0; |
| 35 |
readsi[0x0] = &si_register.si_dram_addr; |
| 36 |
readsi[0x4] = &si_register.si_pif_addr_rd64b; |
| 37 |
readsi[0x8] = &trash; |
| 38 |
readsi[0x10] = &si_register.si_pif_addr_wr64b; |
| 39 |
readsi[0x14] = &trash; |
| 40 |
- readsi[0x18] = &si_register.si_status; |
| 41 |
+ readsi[0x18] = &si_register._si_status; |
| 42 |
|
| 43 |
for (i=0x1c; i<0x10000; i++) readsi[i] = &trash; |
| 44 |
for (i=0x481; i<0x800; i++) |
| 45 |
@@ -3306,7 +3306,7 @@ |
| 46 |
break; |
| 47 |
case 0x18: |
| 48 |
MI_register.mi_intr_reg &= 0xFFFFFFFD; |
| 49 |
- si_register.si_status &= ~0x1000; |
| 50 |
+ si_register._si_status &= ~0x1000; |
| 51 |
check_interupt(); |
| 52 |
return; |
| 53 |
break; |
| 54 |
@@ -3348,7 +3348,7 @@ |
| 55 |
case 0x1a: |
| 56 |
case 0x1b: |
| 57 |
MI_register.mi_intr_reg &= 0xFFFFFFFD; |
| 58 |
- si_register.si_status &= ~0x1000; |
| 59 |
+ si_register._si_status &= ~0x1000; |
| 60 |
check_interupt(); |
| 61 |
return; |
| 62 |
break; |
| 63 |
@@ -3382,7 +3382,7 @@ |
| 64 |
case 0x18: |
| 65 |
case 0x1a: |
| 66 |
MI_register.mi_intr_reg &= 0xFFFFFFFD; |
| 67 |
- si_register.si_status &= ~0x1000; |
| 68 |
+ si_register._si_status &= ~0x1000; |
| 69 |
check_interupt(); |
| 70 |
return; |
| 71 |
break; |
| 72 |
@@ -3406,7 +3406,7 @@ |
| 73 |
break; |
| 74 |
case 0x18: |
| 75 |
MI_register.mi_intr_reg &= 0xFFFFFFFD; |
| 76 |
- si_register.si_status &= ~0x1000; |
| 77 |
+ si_register._si_status &= ~0x1000; |
| 78 |
check_interupt(); |
| 79 |
return; |
| 80 |
break; |
| 81 |
--- memory/memory.h.old 2009-09-08 09:45:33.000000000 +0200 |
| 82 |
+++ memory/memory.h 2009-09-08 09:46:14.000000000 +0200 |
| 83 |
@@ -233,7 +233,7 @@ |
| 84 |
unsigned long si_dram_addr; |
| 85 |
unsigned long si_pif_addr_rd64b; |
| 86 |
unsigned long si_pif_addr_wr64b; |
| 87 |
- unsigned long si_status; |
| 88 |
+ unsigned long _si_status; |
| 89 |
} SI_register; |
| 90 |
|
| 91 |
extern RDRAM_register rdram_register; |
Archives