From: Aaron Simmons <asimmons@rosettastone.com>
Date: Sun, 9 May 2010 21:02:58 +0000 (+0000)
Subject: make nestedvm work with gcc-4.2
X-Git-Url: http://git.megacz.com/?p=nestedvm.git;a=commitdiff_plain;h=6598036848013a0dcd0a0511ebfd37880c1f22c3

make nestedvm work with gcc-4.2

"Simmons, Aaron" <asimmons@rosettastone.com> writes:
> The patch works fine on Ubuntu 9.10 with gcc-4.2, though I misspoke
> when I said 4.x as it doesn't work with gcc-4.4.  I haven't tried it
> with gcc-4.3 yet.  While not the default on newer Ubuntu systems,
> gcc-4.2 is at least available.  :)

> I'm currently blocked from building nestedvm on Mac as darcs is broken
> in macports (!), but I'm sure the patch will work there also with
> gcc-4.2 (which is the default on 10.6).

> Incidentally, I figured out how to itegrate this patch into nestedvm's
> build.  Attached to this email is a new patch for nestedvm itself.  To
> make it work do this:

>     1) download the patch to your home dir (nestedvm.new-gcc-fix.patch)
>     2) git clone http://nestedvm.ibex.org/.git/
>     3) cd nestedvm.ibex.org
>     4) patch -p0 ~/nestedvm.new-gcc-fix.patch
>     5) make cxxtest CC=gcc-4.2
>     6) wait
>
>
> Let me know how it goes,
> aaron
---

diff --git a/upstream/Makefile b/upstream/Makefile
index ec0d9a4..a020732 100644
--- a/upstream/Makefile
+++ b/upstream/Makefile
@@ -132,7 +132,7 @@ url_gcc-core = http://mirrors.kernel.org/gnu/gcc/gcc-$(version_gcc)/gcc-core-$(v
 url_gcc-c++ = http://mirrors.kernel.org/gnu/gcc/gcc-$(version_gcc)/gcc-g++-$(version_gcc).tar.gz
 url_gcc-g77 = http://mirrors.kernel.org/gnu/gcc/gcc-$(version_gcc)/gcc-g77-$(version_gcc).tar.gz
 
-patches_gcc = gcc-fixes.patch gcc-fdata-sections-bss.patch gcc-64bitclean.patch
+patches_gcc = gcc-fixes.patch gcc-fdata-sections-bss.patch gcc-64bitclean.patch gcc-with-newer-version.patch
 
 configure_gcc = --target=mips-unknown-elf --disable-threads --with-gnu-ld --with-gnu-as --with-newlib=yes --enable-sjlj-exceptions --enable-languages="c"
 configure_gcc_step2 = $(configure_gcc) --enable-languages="c,c++,f77"
diff --git a/upstream/patches/gcc-with-newer-version.patch b/upstream/patches/gcc-with-newer-version.patch
new file mode 100644
index 0000000..01a6b5d
--- /dev/null
+++ b/upstream/patches/gcc-with-newer-version.patch
@@ -0,0 +1,11 @@
+--- gcc/f/com.orig.h	2010-05-06 16:31:53.000000000 +0000
++++ gcc/f/com.h	2010-05-06 16:32:03.000000000 +0000
+@@ -233,7 +233,7 @@
+ void ffecom_finish_progunit (void);
+ tree ffecom_get_invented_identifier (const char *pattern, ...)
+   ATTRIBUTE_PRINTF_1;
+-ffeinfoKindtype ffecom_gfrt_basictype (ffecomGfrt ix);
++ffeinfoBasictype ffecom_gfrt_basictype (ffecomGfrt gfrt);
+ ffeinfoKindtype ffecom_gfrt_kindtype (ffecomGfrt ix);
+ void ffecom_init_0 (void);
+ void ffecom_init_2 (void);