From e388cb142a9f79faf528aee6e7d56714f5596450 Mon Sep 17 00:00:00 2001
From: Scott Garman <scott.a.garman@intel.com>
Date: Tue, 13 Jul 2010 22:19:46 -0700
Subject: gcc: Add patch to fix sparseset.o rule

Fix a missing config.h dependency when building sparseset.o to prevent
"conflicting types for 'strsignal'" error, which can intermittently crop
up for high values of make -j.

Thanks to Richard Purdie and Jeff Dike for their help in tracking this
down.

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
---
 meta/packages/gcc/gcc-4.3.3.inc                  |  1 +
 meta/packages/gcc/gcc-4.3.3/sparseset_rule.patch | 20 ++++++++++++++++++++
 meta/packages/gcc/gcc_4.3.3.bb                   |  2 +-
 3 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 meta/packages/gcc/gcc-4.3.3/sparseset_rule.patch

diff --git a/meta/packages/gcc/gcc-4.3.3.inc b/meta/packages/gcc/gcc-4.3.3.inc
index 5cfa0f6..73783e6 100644
--- a/meta/packages/gcc/gcc-4.3.3.inc
+++ b/meta/packages/gcc/gcc-4.3.3.inc
@@ -54,6 +54,7 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	file://gcc-flags-for-build.patch;patch=1 \
 	file://pr35942.patch;patch=1 \
 	file://optional_libstdc.patch;patch=1 \
+	file://sparseset_rule.patch;patch=1 \
 "
 
 SRC_URI_append_sh3  = " file://sh3-installfix-fixheaders.patch;patch=1 "
diff --git a/meta/packages/gcc/gcc-4.3.3/sparseset_rule.patch b/meta/packages/gcc/gcc-4.3.3/sparseset_rule.patch
new file mode 100644
index 0000000..7c8113a
--- /dev/null
+++ b/meta/packages/gcc/gcc-4.3.3/sparseset_rule.patch
@@ -0,0 +1,20 @@
+Fix a missing config.h dependency when building sparseset.o to prevent
+"conflicting types for 'strsignal'" error, which can intermittently crop
+up for high values of make -j.
+
+Thanks to Richard Purdie and Jeff Dike for their help in tracking this
+down.
+
+Scott Garman <scott.a.garman@intel.com> 2010-07-13
+diff -urN gcc-4.3.3.orig//gcc/Makefile.in gcc-4.3.3/gcc/Makefile.in
+--- gcc-4.3.3.orig//gcc/Makefile.in	2008-12-04 15:00:19.000000000 -0800
++++ gcc-4.3.3/gcc/Makefile.in	2010-07-13 21:30:01.864681358 -0700
+@@ -1789,7 +1789,7 @@
+     $(FLAGS_H) hard-reg-set.h $(BASIC_BLOCK_H) $(OBSTACK_H)
+ ebitmap.o: ebitmap.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
+ 	$(EBITMAP_H)
+-sparseset.o: sparseset.c $(SYSTEM_H) sparseset.h
++sparseset.o: sparseset.c $(CONFIG_H) $(SYSTEM_H) sparseset.h
+ 
+ COLLECT2_OBJS = collect2.o tlink.o intl.o version.o
+ COLLECT2_LIBS = @COLLECT2_LIBS@
diff --git a/meta/packages/gcc/gcc_4.3.3.bb b/meta/packages/gcc/gcc_4.3.3.bb
index 7238aed..556fc74 100644
--- a/meta/packages/gcc/gcc_4.3.3.bb
+++ b/meta/packages/gcc/gcc_4.3.3.bb
@@ -1,4 +1,4 @@
-PR = "r6"
+PR = "r7"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc
-- 
cgit v1.1