diff --git a/gcc/.md5sum b/gcc/.md5sum index 03fe97ba..f7cfb39e 100644 --- a/gcc/.md5sum +++ b/gcc/.md5sum @@ -2,3 +2,4 @@ c7e65c47fa94541f7f6cd0cf3d9c850b gcc-core-4.4.0.tar.bz2 687cceaed97c4145281b6418c9b16847 gcc-g++-4.4.0.tar.bz2 a617c4d3fa11e0c9410ac213eb061677 gcc-nocheck-fixincludes.patch 74b40bb4ab4532b34258293daf6b63f9 gcc-objc-4.4.0.tar.bz2 +547895a1bfb0224835995a3bd9690ae4 test-demangle.c.diff diff --git a/gcc/Pkgfile b/gcc/Pkgfile index 5c6cce54..32282bec 100644 --- a/gcc/Pkgfile +++ b/gcc/Pkgfile @@ -5,13 +5,14 @@ name=gcc version=4.4.0 -release=1 +release=2 source=(ftp://sources.redhat.com/pub/gcc/releases/$name-$version/$name-{core,g++,objc}-$version.tar.bz2 - $name-nocheck-fixincludes.patch) + $name-nocheck-fixincludes.patch test-demangle.c.diff) build() { patch -d $name-$version -p1 -i $SRC/$name-nocheck-fixincludes.patch + patch -d $name-$version -p0 -i $SRC/test-demangle.c.diff sed -i 's|REVISION|REVISION " (CRUX)"|' $name-$version/$name/version.c mkdir build diff --git a/gcc/test-demangle.c.diff b/gcc/test-demangle.c.diff new file mode 100644 index 00000000..bda8b7d7 --- /dev/null +++ b/gcc/test-demangle.c.diff @@ -0,0 +1,40 @@ +# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39752 + +Index: libiberty/testsuite/test-demangle.c +=================================================================== +--- libiberty/testsuite/test-demangle.c (revision 145957) ++++ libiberty/testsuite/test-demangle.c (working copy) +@@ -46,7 +46,7 @@ + #define LINELEN 80 + + static void +-getline(buf) ++get_line(buf) + struct line *buf; + { + char *data = buf->data; +@@ -196,12 +196,12 @@ + { + const char *inp; + +- getline (&format); ++ get_line (&format); + if (feof (stdin)) + break; + +- getline (&input); +- getline (&expect); ++ get_line (&input); ++ get_line (&expect); + + inp = protect_end (input.data); + +@@ -322,7 +322,7 @@ + + if (no_params) + { +- getline (&expect); ++ get_line (&expect); + result = cplus_demangle (inp, DMGL_ANSI|DMGL_TYPES); + + if (result