From 8fd3dc77320f4cc0fef7df804e7fe44635e17bd2 Mon Sep 17 00:00:00 2001
From: Remko van der Vossen
Date: Fri, 17 May 2019 22:54:03 +0200
Subject: gnu/gcc: version 4.9.4

---
 gnu/gcc/0003-fix-header-generation-for-libgo.patch | 36 ----------------------
 gnu/gcc/DETAILS                                    |  2 +-
 gnu/gcc/HISTORY                                    |  3 ++
 gnu/gcc/PRE_BUILD                                  | 11 +++----
 gnu/gcc/gcc-4.8-filename-output.patch              | 17 ----------
 5 files changed, 8 insertions(+), 61 deletions(-)
 delete mode 100644 gnu/gcc/0003-fix-header-generation-for-libgo.patch
 delete mode 100644 gnu/gcc/gcc-4.8-filename-output.patch

diff --git a/gnu/gcc/0003-fix-header-generation-for-libgo.patch b/gnu/gcc/0003-fix-header-generation-for-libgo.patch
deleted file mode 100644
index bef60d048f..0000000000
--- a/gnu/gcc/0003-fix-header-generation-for-libgo.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 6bcb304485fca4e6149a1bbd8085da2d42042d37 Mon Sep 17 00:00:00 2001
-From: Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
-Date: Sun, 24 Feb 2013 12:00:25 +0100
-Subject: [PATCH 3/3] fix header generation for libgo
-
----
- libgo/mksysinfo.sh | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/libgo/mksysinfo.sh b/libgo/mksysinfo.sh
-index 315d60c..10c888c 100755
---- a/libgo/mksysinfo.sh
-+++ b/libgo/mksysinfo.sh
-@@ -538,7 +538,7 @@ if test "$rusage" != ""; then
-   rusage=`echo $rusage | sed -e 's/^ *//'`
-   nrusage=
-   while test -n "$rusage"; do
--    field=`echo $rusage | sed -e 's/^\([^;]*\);.*$/\1/'`
-+    field=`echo $rusage | sed -e 's/^\([^;]*\);.*$/\1/' -e 's/struct \(.*\)/struct { \1; }/'`
-     rusage=`echo $rusage | sed -e 's/^[^;]*; *\(.*\)$/\1/'`
-     # Drop the leading ru_, capitalize the next character.
-     field=`echo $field | sed -e 's/^ru_//'`
-@@ -550,7 +550,9 @@ if test "$rusage" != ""; then
-     r=`echo $r | sed -e s'/ _timespec$/ Timespec/'`
-     r=`echo $r | sed -e s'/ _timestruc_t$/ Timestruc/'`
-     field="$f$r"
--    nrusage="$nrusage $field;"
-+    if [ -n "$field" ]; then
-+      nrusage="$nrusage $field;"
-+    fi
-   done
-   echo "type Rusage struct {$nrusage }" >> ${OUT}
- else
--- 
-1.8.1.3
-
diff --git a/gnu/gcc/DETAILS b/gnu/gcc/DETAILS
index 216e5c8f25..533a4325f3 100755
--- a/gnu/gcc/DETAILS
+++ b/gnu/gcc/DETAILS
@@ -1,5 +1,5 @@
            SPELL=gcc
-         VERSION=4.9.2
+         VERSION=4.9.4
       PATCHLEVEL=0
  BASE_SOURCE_URL="ftp://ftp.gnu.org/pub/gnu/gcc/gcc-$VERSION"
           SOURCE=gcc-$VERSION.tar.bz2
diff --git a/gnu/gcc/HISTORY b/gnu/gcc/HISTORY
index 95ebc1e660..45aa7526a0 100644
--- a/gnu/gcc/HISTORY
+++ b/gnu/gcc/HISTORY
@@ -1,3 +1,6 @@
+2019-05-17 Remko van der Vossen <wich@sourcemage.org>
+	* DETAILS: version 4.9.4
+
 2015-04-02 Vlad Glagolev <stealth@sourcemage.org>
 	* DEPENDS: added missing glib2 dependency
 
diff --git a/gnu/gcc/PRE_BUILD b/gnu/gcc/PRE_BUILD
index 7e19e125ee..a24f505cc2 100755
--- a/gnu/gcc/PRE_BUILD
+++ b/gnu/gcc/PRE_BUILD
@@ -20,7 +20,7 @@ if list_find "$GCC_COMPILER" "ada" ; then
   #
   # End Ada bootstrap cache code
   #
-fi  &&
+fi &&
 
 cd ${SOURCE_DIRECTORY}          &&
 
@@ -29,11 +29,11 @@ if [[ "$GCC_CLOOG" == "y" ]]; then
   mv cloog-${CLOOG_VERSION} cloog &&
   unpack_file 4                   &&
   mv isl-${ISL_VERSION} isl
-fi
+fi &&
 
 if list_find "$GCC_COMPILER" "java"; then
   cp -v ${SOURCE_CACHE}/${SOURCE5} ${SOURCE_DIRECTORY}/ecj.jar
-fi  &&
+fi &&
 
 mk_source_dir $SOURCE_DIRECTORY.bld  &&
 cd $SOURCE_DIRECTORY  &&
@@ -47,7 +47,4 @@ if list_find "$GCC_COMPILER" "go"; then
   patch -p1 < "$SPELL_DIRECTORY/0003-fix-header-generation-for-libgo.patch"
 fi &&
 
-patch -p1 < "$SPELL_DIRECTORY/0001-remove-libffi.patch"          &&
-patch -p0 < "$SPELL_DIRECTORY/gcc-4.8-filename-output.patch"     &&
-patch -p1 < "$SPELL_DIRECTORY/gcc-4.9-tree-ssa-threadedge.patch" &&
-patch -p1 < "$SPELL_DIRECTORY/gcc-4.9.0-upstream_fixes-1.patch"
+patch -p1 < "$SPELL_DIRECTORY/0001-remove-libffi.patch"
diff --git a/gnu/gcc/gcc-4.8-filename-output.patch b/gnu/gcc/gcc-4.8-filename-output.patch
deleted file mode 100644
index 6951eb239b..0000000000
--- a/gnu/gcc/gcc-4.8-filename-output.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- gcc/c-family/c-opts.c       (revision 200330)
-+++ gcc/c-family/c-opts.c       (working copy)
-@@ -1338,10 +1338,14 @@ c_finish_options (void)
-
- /* Give CPP the next file given by -include, if any.  */
- static void
- push_command_line_include (void)
- {
-+  // This can happen if disabled by -imacros for example.
-+  if (include_cursor > deferred_count)
-+    return;
-+
-   if (!done_preinclude)
-     {
-       done_preinclude = true;
-       if (flag_hosted && std_inc && !cpp_opts->preprocessed)
-        {
-- 
cgit v1.2.3