From e010ee574268173b0e50280c37626f73827c5f7f Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@free.fr>
Date: Fri, 3 May 2013 15:36:11 +0000
Subject: cc/gcc: add 4.7.3 and 4.6.4 bug-fixes releases

Bring the appropriate patches along, too.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

diff --git a/config/cc/gcc.in b/config/cc/gcc.in
index ba535d1..4db1fb7 100644
--- a/config/cc/gcc.in
+++ b/config/cc/gcc.in
@@ -42,6 +42,11 @@ config CC_V_linaro_4_7
     depends on CC_GCC_SHOW_LINARO
     select CC_GCC_4_7
 
+config CC_V_4_7_3
+    bool
+    prompt "4.7.3"
+    select CC_GCC_4_7
+
 config CC_V_4_7_2
     bool
     prompt "4.7.2"
@@ -63,6 +68,11 @@ config CC_V_linaro_4_6
     depends on CC_GCC_SHOW_LINARO
     select CC_GCC_4_6
 
+config CC_V_4_6_4
+    bool
+    prompt "4.6.4"
+    select CC_GCC_4_6
+
 config CC_V_4_6_3
     bool
     prompt "4.6.3"
@@ -381,6 +391,8 @@ config CC_VERSION
     string
 # Don't remove next line
 # CT_INSERT_VERSION_STRING_BELOW
+    default "4.7.3" if CC_V_4_7_3
+    default "4.6.4" if CC_V_4_6_4
     default "linaro-4.7-2013.04" if CC_V_linaro_4_7
     default "4.7.2" if CC_V_4_7_2
     default "4.7.1" if CC_V_4_7_1
diff --git a/patches/gcc/4.6.4/100-libgcc_eh.a.patch b/patches/gcc/4.6.4/100-libgcc_eh.a.patch
new file mode 100644
index 0000000..74ae897
--- /dev/null
+++ b/patches/gcc/4.6.4/100-libgcc_eh.a.patch
@@ -0,0 +1,39 @@
+Highly inspired by:
+  http://landley.net/hg/aboriginal/file/7e0747a665ab/sources/patches/gcc-core-libgcceh.patch
+
+diff -durN gcc-4.6.0.orig/libgcc/Makefile.in gcc-4.6.0/libgcc/Makefile.in
+--- gcc-4.6.0.orig/libgcc/Makefile.in	2011-01-26 05:19:58.000000000 +0100
++++ gcc-4.6.0/libgcc/Makefile.in	2011-09-12 18:17:12.743718974 +0200
+@@ -772,8 +772,9 @@
+ libgcc_s$(SHLIB_EXT): libunwind$(SHLIB_EXT)
+ endif
+ 
++all: libgcc_eh.a
+ ifeq ($(enable_shared),yes)
+-all: libgcc_eh.a libgcc_s$(SHLIB_EXT)
++all: libgcc_s$(SHLIB_EXT)
+ ifneq ($(LIBUNWIND),)
+ all: libunwind$(SHLIB_EXT)
+ endif
+@@ -950,10 +951,6 @@
+ install-shared:
+ 	$(mkinstalldirs) $(DESTDIR)$(inst_libdir)
+ 
+-	$(INSTALL_DATA) libgcc_eh.a $(DESTDIR)$(inst_libdir)/
+-	chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_eh.a
+-	$(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc_eh.a
+-
+ 	$(subst @multilib_dir@,$(MULTIDIR),$(subst \
+ 		@shlib_base_name@,libgcc_s,$(subst \
+ 		@shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(SHLIB_INSTALL))))
+@@ -968,6 +965,10 @@
+ 	chmod 644 $(DESTDIR)$(inst_libdir)/libgcov.a
+ 	$(RANLIB) $(DESTDIR)$(inst_libdir)/libgcov.a
+ 
++	$(INSTALL_DATA) libgcc_eh.a $(DESTDIR)$(inst_libdir)/
++	chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_eh.a
++	$(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc_eh.a
++
+ 	parts="$(INSTALL_PARTS)";				\
+ 	for file in $$parts; do					\
+ 	  rm -f $(DESTDIR)$(inst_libdir)/$$file;		\
diff --git a/patches/gcc/4.7.3/000-libitm-fix-definition-of-__m64.patch b/patches/gcc/4.7.3/000-libitm-fix-definition-of-__m64.patch
new file mode 100644
index 0000000..ade14a7
--- /dev/null
+++ b/patches/gcc/4.7.3/000-libitm-fix-definition-of-__m64.patch
@@ -0,0 +1,27 @@
+From 3d27d47fbebdb1be3d35e398a7c042a930f64aa6 Mon Sep 17 00:00:00 2001
+From: Richard Braun <rbraun@sceen.net>
+Date: Mon, 26 Nov 2012 11:36:17 +0100
+Subject: [PATCH] libitm: fix definition of __m64
+
+See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=52695 for details.
+---
+ libitm/config/x86/target.h |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/libitm/config/x86/target.h b/libitm/config/x86/target.h
+index 5c7e6fb..6254d8a 100644
+--- a/libitm/config/x86/target.h
++++ b/libitm/config/x86/target.h
+@@ -73,6 +73,9 @@ cpu_relax (void)
+ /* ??? It's broken for C++. */
+ #include <x86intrin.h>
+ #else
++# ifdef __MMX__
++#  include <mmintrin.h>
++# endif
+ # ifdef __SSE2__
+ #  include <emmintrin.h>
+ # elif defined(__SSE__)
+-- 
+1.7.2.5
+
-- 
cgit v0.10.2-6-g49f6