1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-23 00:43:28 +00:00

- Unbreak

- Fix build with gcc 4.2

PR:		116893
Submitted by:	miwi
Approved by:	maintainer timeout
This commit is contained in:
Martin Wilke 2007-10-17 09:45:35 +00:00
parent d5502ae2a3
commit 7922096790
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=201610
4 changed files with 45 additions and 4 deletions

View File

@ -38,10 +38,6 @@ DOC_FILES= COPYING AUTHORS NEWS README ChangeLog INSTALL
BROKEN= Runaway cc1plus process
.endif
.if ${OSVERSION} >= 700042
BROKEN= Does not compile with GCC 4.2
.endif
.ifdef(WITH_GTK2)
PLIST_SUB= INSTALL_GTK2=""
USE_GCC= 3.4+

View File

@ -0,0 +1,11 @@
--- src/prof/gmon.h.orig 2007-10-04 01:06:18.000000000 +0200
+++ src/prof/gmon.h 2007-10-04 01:06:48.000000000 +0200
@@ -119,7 +119,7 @@
struct tostruct
{
- char *selfpc;
+ uint32_t selfpc;
int count;
unsigned short link;
};

View File

@ -0,0 +1,20 @@
--- src/prof/prof.cpp.orig 2007-10-04 01:07:54.000000000 +0200
+++ src/prof/prof.cpp 2007-10-04 01:08:31.000000000 +0200
@@ -279,7 +279,7 @@
void profCount()
{
- register char *selfpc;
+ register u32 selfpc;
register unsigned short *frompcindex;
register struct tostruct *top;
register struct tostruct *prevtop;
@@ -292,7 +292,7 @@
/* selfpc = pc pushed by mcount call.
This identifies the function that was just entered. */
- selfpc = (char *) reg[14].I;
+ selfpc = (u32) reg[14].I;
/* frompcindex = pc in preceding frame.
This identifies the caller of the function just entered. */
frompcindex = (unsigned short *) reg[12].I;

View File

@ -0,0 +1,14 @@
--- src/sdl/debugger.cpp.orig 2007-10-04 01:11:33.000000000 +0200
+++ src/sdl/debugger.cpp 2007-10-04 01:12:22.000000000 +0200
@@ -950,9 +950,9 @@
{
u32 address = 0;
if(mem >= (u32*)&workRAM[0] && mem <= (u32*)&workRAM[0x3ffff])
- address = 0x2000000 + ((u32)mem - (u32)&workRAM[0]);
+ address = 0x2000000 + (u32)((u8 *)mem - &workRAM[0]);
else
- address = 0x3000000 + ((u32)mem - (u32)&internalRAM[0]);
+ address = 0x3000000 + (u32)((u8 *)mem - &internalRAM[0]);
if(size == 2)
printf("Breakpoint (on write) address %08x old:%08x new:%08x\n",