Date: Thu, 4 Oct 2007 10:29:27 +0200 (CEST) From: Martin Wilke <miwi@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: arundel@h3c.de Subject: ports/116893: [PATCH] emulators/vba: Fix build with gcc 4.2 Message-ID: <20071004082927.6AF782E114@miwi.homeunix.com> Resent-Message-ID: <200710040830.l948U1aU028510@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 116893 >Category: ports >Synopsis: [PATCH] emulators/vba: Fix build with gcc 4.2 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Oct 04 08:30:01 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Martin Wilke >Release: FreeBSD 7.0-CURRENT i386 >Organization: >Environment: System: FreeBSD miwi.homeunix.com 7.0-CURRENT FreeBSD 7.0-CURRENT #305: Fri Sep 28 12:07:59 CEST 2007 >Description: - Unbreak - Fix build gcc 4.2 i386 http://head.miwibox.org/tb/index.php?action=describe_port&id=2172 amd64 http://amd64.miwibox.org/tb/index.php?action=describe_port&id=1613 Added file(s): - files/patch-src-prof_gmon.h - files/patch-src-prof_prof.cpp - files/patch-src-sdl_debugger.cpp Port maintainer (arundel@h3c.de) is cc'd. Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- vba-1.7.2_5.patch begins here --- Index: Makefile =================================================================== RCS file: /home/pcvs/ports/emulators/vba/Makefile,v retrieving revision 1.22 diff -u -u -r1.22 Makefile --- Makefile 2 Oct 2007 05:24:15 -0000 1.22 +++ Makefile 3 Oct 2007 23:03:10 -0000 @@ -38,10 +38,6 @@ 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+ Index: files/patch-src-prof_gmon.h =================================================================== RCS file: files/patch-src-prof_gmon.h diff -N files/patch-src-prof_gmon.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-src-prof_gmon.h 3 Oct 2007 23:11:05 -0000 @@ -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; + }; Index: files/patch-src-prof_prof.cpp =================================================================== RCS file: files/patch-src-prof_prof.cpp diff -N files/patch-src-prof_prof.cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-src-prof_prof.cpp 3 Oct 2007 23:11:12 -0000 @@ -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; Index: files/patch-src-sdl_debugger.cpp =================================================================== RCS file: files/patch-src-sdl_debugger.cpp diff -N files/patch-src-sdl_debugger.cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-src-sdl_debugger.cpp 3 Oct 2007 23:13:05 -0000 @@ -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", --- vba-1.7.2_5.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20071004082927.6AF782E114>