Source Mage code commit list

[Florian Franzmann <scm AT sourcemage.org>]

GIT changes to master grimoire by Florian Franzmann 
<siflfran AT hawo.stw.uni-erlangen.de>:

 gnu/gcc/0001-remove-libffi.patch                   |  160 
+++++++++++++++++++++
 gnu/gcc/0002-4.7.2-ffast-math.patch                |   63 ++++++++
 gnu/gcc/0003-fix-header-generation-for-libgo.patch |   36 ++++
 gnu/gcc/HISTORY                                    |    8 +
 gnu/gcc/PRE_BUILD                                  |    9 +
 5 files changed, 275 insertions(+), 1 deletion(-)

New commits:
commit 86028dc0b419986e8579291b3edc4225a8be4b46
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    gnu/gcc: fix header generation for libgo

commit fcce5aac8507b602d464c23265979e54221dd5d8
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    gnu/gcc: fix -ffast-math

commit b7802d33ac015efcde7ba3329d5f3a5a802bddc0
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    gnu/gcc: remove redundant libffi

diff --git a/gnu/gcc/0001-remove-libffi.patch 
b/gnu/gcc/0001-remove-libffi.patch
new file mode 100644
index 0000000..421069c
--- /dev/null
+++ b/gnu/gcc/0001-remove-libffi.patch
@@ -0,0 +1,160 @@
+From 4b7dd34db3a9024afcd9f413b3de6e7542af9940 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+Date: Sun, 24 Feb 2013 11:53:54 +0100
+Subject: [PATCH 1/3] remove libffi
+
+---
+ Makefile.in | 18 ------------------
+ 1 file changed, 18 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 4b99139..088958e 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -953,7 +953,6 @@ configure-target:  \
+     maybe-configure-target-libtermcap \
+     maybe-configure-target-winsup \
+     maybe-configure-target-libgloss \
+-    maybe-configure-target-libffi \
+     maybe-configure-target-libjava \
+     maybe-configure-target-zlib \
+     maybe-configure-target-boehm-gc \
+@@ -1098,7 +1097,6 @@ all-target: maybe-all-target-libgo
+ all-target: maybe-all-target-libtermcap
+ all-target: maybe-all-target-winsup
+ all-target: maybe-all-target-libgloss
+-all-target: maybe-all-target-libffi
+ all-target: maybe-all-target-libjava
+ all-target: maybe-all-target-zlib
+ all-target: maybe-all-target-boehm-gc
+@@ -1183,7 +1181,6 @@ info-target: maybe-info-target-libgo
+ info-target: maybe-info-target-libtermcap
+ info-target: maybe-info-target-winsup
+ info-target: maybe-info-target-libgloss
+-info-target: maybe-info-target-libffi
+ info-target: maybe-info-target-libjava
+ info-target: maybe-info-target-zlib
+ info-target: maybe-info-target-boehm-gc
+@@ -1261,7 +1258,6 @@ dvi-target: maybe-dvi-target-libgo
+ dvi-target: maybe-dvi-target-libtermcap
+ dvi-target: maybe-dvi-target-winsup
+ dvi-target: maybe-dvi-target-libgloss
+-dvi-target: maybe-dvi-target-libffi
+ dvi-target: maybe-dvi-target-libjava
+ dvi-target: maybe-dvi-target-zlib
+ dvi-target: maybe-dvi-target-boehm-gc
+@@ -1339,7 +1335,6 @@ pdf-target: maybe-pdf-target-libgo
+ pdf-target: maybe-pdf-target-libtermcap
+ pdf-target: maybe-pdf-target-winsup
+ pdf-target: maybe-pdf-target-libgloss
+-pdf-target: maybe-pdf-target-libffi
+ pdf-target: maybe-pdf-target-libjava
+ pdf-target: maybe-pdf-target-zlib
+ pdf-target: maybe-pdf-target-boehm-gc
+@@ -1417,7 +1412,6 @@ html-target: maybe-html-target-libgo
+ html-target: maybe-html-target-libtermcap
+ html-target: maybe-html-target-winsup
+ html-target: maybe-html-target-libgloss
+-html-target: maybe-html-target-libffi
+ html-target: maybe-html-target-libjava
+ html-target: maybe-html-target-zlib
+ html-target: maybe-html-target-boehm-gc
+@@ -1495,7 +1489,6 @@ TAGS-target: maybe-TAGS-target-libgo
+ TAGS-target: maybe-TAGS-target-libtermcap
+ TAGS-target: maybe-TAGS-target-winsup
+ TAGS-target: maybe-TAGS-target-libgloss
+-TAGS-target: maybe-TAGS-target-libffi
+ TAGS-target: maybe-TAGS-target-libjava
+ TAGS-target: maybe-TAGS-target-zlib
+ TAGS-target: maybe-TAGS-target-boehm-gc
+@@ -1573,7 +1566,6 @@ install-info-target: maybe-install-info-target-libgo
+ install-info-target: maybe-install-info-target-libtermcap
+ install-info-target: maybe-install-info-target-winsup
+ install-info-target: maybe-install-info-target-libgloss
+-install-info-target: maybe-install-info-target-libffi
+ install-info-target: maybe-install-info-target-libjava
+ install-info-target: maybe-install-info-target-zlib
+ install-info-target: maybe-install-info-target-boehm-gc
+@@ -1651,7 +1643,6 @@ install-pdf-target: maybe-install-pdf-target-libgo
+ install-pdf-target: maybe-install-pdf-target-libtermcap
+ install-pdf-target: maybe-install-pdf-target-winsup
+ install-pdf-target: maybe-install-pdf-target-libgloss
+-install-pdf-target: maybe-install-pdf-target-libffi
+ install-pdf-target: maybe-install-pdf-target-libjava
+ install-pdf-target: maybe-install-pdf-target-zlib
+ install-pdf-target: maybe-install-pdf-target-boehm-gc
+@@ -1729,7 +1720,6 @@ install-html-target: maybe-install-html-target-libgo
+ install-html-target: maybe-install-html-target-libtermcap
+ install-html-target: maybe-install-html-target-winsup
+ install-html-target: maybe-install-html-target-libgloss
+-install-html-target: maybe-install-html-target-libffi
+ install-html-target: maybe-install-html-target-libjava
+ install-html-target: maybe-install-html-target-zlib
+ install-html-target: maybe-install-html-target-boehm-gc
+@@ -1807,7 +1797,6 @@ installcheck-target: maybe-installcheck-target-libgo
+ installcheck-target: maybe-installcheck-target-libtermcap
+ installcheck-target: maybe-installcheck-target-winsup
+ installcheck-target: maybe-installcheck-target-libgloss
+-installcheck-target: maybe-installcheck-target-libffi
+ installcheck-target: maybe-installcheck-target-libjava
+ installcheck-target: maybe-installcheck-target-zlib
+ installcheck-target: maybe-installcheck-target-boehm-gc
+@@ -1885,7 +1874,6 @@ mostlyclean-target: maybe-mostlyclean-target-libgo
+ mostlyclean-target: maybe-mostlyclean-target-libtermcap
+ mostlyclean-target: maybe-mostlyclean-target-winsup
+ mostlyclean-target: maybe-mostlyclean-target-libgloss
+-mostlyclean-target: maybe-mostlyclean-target-libffi
+ mostlyclean-target: maybe-mostlyclean-target-libjava
+ mostlyclean-target: maybe-mostlyclean-target-zlib
+ mostlyclean-target: maybe-mostlyclean-target-boehm-gc
+@@ -1963,7 +1951,6 @@ clean-target: maybe-clean-target-libgo
+ clean-target: maybe-clean-target-libtermcap
+ clean-target: maybe-clean-target-winsup
+ clean-target: maybe-clean-target-libgloss
+-clean-target: maybe-clean-target-libffi
+ clean-target: maybe-clean-target-libjava
+ clean-target: maybe-clean-target-zlib
+ clean-target: maybe-clean-target-boehm-gc
+@@ -2041,7 +2028,6 @@ distclean-target: maybe-distclean-target-libgo
+ distclean-target: maybe-distclean-target-libtermcap
+ distclean-target: maybe-distclean-target-winsup
+ distclean-target: maybe-distclean-target-libgloss
+-distclean-target: maybe-distclean-target-libffi
+ distclean-target: maybe-distclean-target-libjava
+ distclean-target: maybe-distclean-target-zlib
+ distclean-target: maybe-distclean-target-boehm-gc
+@@ -2119,7 +2105,6 @@ maintainer-clean-target: 
maybe-maintainer-clean-target-libgo
+ maintainer-clean-target: maybe-maintainer-clean-target-libtermcap
+ maintainer-clean-target: maybe-maintainer-clean-target-winsup
+ maintainer-clean-target: maybe-maintainer-clean-target-libgloss
+-maintainer-clean-target: maybe-maintainer-clean-target-libffi
+ maintainer-clean-target: maybe-maintainer-clean-target-libjava
+ maintainer-clean-target: maybe-maintainer-clean-target-zlib
+ maintainer-clean-target: maybe-maintainer-clean-target-boehm-gc
+@@ -2252,7 +2237,6 @@ check-target:  \
+     maybe-check-target-libtermcap \
+     maybe-check-target-winsup \
+     maybe-check-target-libgloss \
+-    maybe-check-target-libffi \
+     maybe-check-target-libjava \
+     maybe-check-target-zlib \
+     maybe-check-target-boehm-gc \
+@@ -2402,7 +2386,6 @@ install-target:  \
+     maybe-install-target-libtermcap \
+     maybe-install-target-winsup \
+     maybe-install-target-libgloss \
+-    maybe-install-target-libffi \
+     maybe-install-target-libjava \
+     maybe-install-target-zlib \
+     maybe-install-target-boehm-gc \
+@@ -2500,7 +2483,6 @@ install-strip-target:  \
+     maybe-install-strip-target-libtermcap \
+     maybe-install-strip-target-winsup \
+     maybe-install-strip-target-libgloss \
+-    maybe-install-strip-target-libffi \
+     maybe-install-strip-target-libjava \
+     maybe-install-strip-target-zlib \
+     maybe-install-strip-target-boehm-gc \
+-- 
+1.8.1.3
+
diff --git a/gnu/gcc/0002-4.7.2-ffast-math.patch 
b/gnu/gcc/0002-4.7.2-ffast-math.patch
new file mode 100644
index 0000000..47c5d40
--- /dev/null
+++ b/gnu/gcc/0002-4.7.2-ffast-math.patch
@@ -0,0 +1,63 @@
+From e655b07e077e8f458c35e3515f50ca8e3ba72753 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+Date: Sun, 24 Feb 2013 11:56:29 +0100
+Subject: [PATCH 2/3] 4.7.2 ffast-math
+
+---
+ libgcc/config/i386/crtfastmath.c | 33 +++++++++++++++++----------------
+ 1 file changed, 17 insertions(+), 16 deletions(-)
+
+diff --git a/libgcc/config/i386/crtfastmath.c 
b/libgcc/config/i386/crtfastmath.c
+index 7abe500..392086e 100644
+--- a/libgcc/config/i386/crtfastmath.c
++++ b/libgcc/config/i386/crtfastmath.c
+@@ -50,6 +50,23 @@ sigill_hdlr (int sig __attribute((unused)),
+ }
+ #endif
+ 
++struct
++{
++      unsigned short int cwd;
++      unsigned short int swd;
++      unsigned short int twd;
++      unsigned short int fop;
++      long int fip;
++      long int fcs;
++      long int foo;
++      long int fos;
++      long int mxcsr;
++      long int mxcsr_mask;
++      long int st_space[32];
++      long int xmm_space[32];
++      long int padding[56];
++} __attribute__ ((aligned (16))) fxsave;
++
+ static void __attribute__((constructor))
+ #ifndef __x86_64__
+ /* The i386 ABI only requires 4-byte stack alignment, so this is necessary
+@@ -96,22 +113,6 @@ set_fast_math (void)
+       if (edx & bit_FXSAVE)
+       {
+         /* Check if DAZ is available.  */
+-        struct
+-          {
+-            unsigned short int cwd;
+-            unsigned short int swd;
+-            unsigned short int twd;
+-            unsigned short int fop;
+-            long int fip;
+-            long int fcs;
+-            long int foo;
+-            long int fos;
+-            long int mxcsr;
+-            long int mxcsr_mask;
+-            long int st_space[32];
+-            long int xmm_space[32];
+-            long int padding[56];
+-          } __attribute__ ((aligned (16))) fxsave;
+ 
+         __builtin_memset (&fxsave, 0, sizeof (fxsave));
+ 
+-- 
+1.8.1.3
+
diff --git a/gnu/gcc/0003-fix-header-generation-for-libgo.patch 
b/gnu/gcc/0003-fix-header-generation-for-libgo.patch
new file mode 100644
index 0000000..bef60d0
--- /dev/null
+++ b/gnu/gcc/0003-fix-header-generation-for-libgo.patch
@@ -0,0 +1,36 @@
+From 6bcb304485fca4e6149a1bbd8085da2d42042d37 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <siflfran AT 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/HISTORY b/gnu/gcc/HISTORY
index 90bdf48..30a6176 100644
--- a/gnu/gcc/HISTORY
+++ b/gnu/gcc/HISTORY
@@ -1,3 +1,11 @@
+2013-02-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * PRE_BUILD, 0001-remove-libffi.patch: add patch to remove
+         redundant libffi
+       * PRE_BUILD, 0002-4.7.2-ffast-math.patch: add patch to fix
+         -ffast-math
+       * PRE_BUILD, 0003-fix-header-generation-for-libgo.patch:
+         fix header generation for libgo
+
 2013-02-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * CONFIGURE, PRE_BUILD, PRE_SUB_DEPENDS, SUB_DEPENDS,
          ada-symbolic-tracebacks.diff, glibc216.patch, mksysinfo.patch:
diff --git a/gnu/gcc/PRE_BUILD b/gnu/gcc/PRE_BUILD
index ce19aea..6453fce 100755
--- a/gnu/gcc/PRE_BUILD
+++ b/gnu/gcc/PRE_BUILD
@@ -28,4 +28,11 @@ cd $SOURCE_DIRECTORY  &&
 sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in &&
 sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in &&
 
-patch -p0 < "$SPELL_DIRECTORY/python-gdb.patch"
+patch -p0 < "$SPELL_DIRECTORY/python-gdb.patch" &&
+
+if list_find "$GCC_COMPILER" "go"; then
+  patch -p1 < "$SPELL_DIRECTORY/0003-fix-header-generation-for-libgo.patch"
+fi &&
+
+patch -p1 < "$SPELL_DIRECTORY/0002-4.7.2-ffast-math.patch" &&
+patch -p1 < "$SPELL_DIRECTORY/0001-remove-libffi.patch"