gcc-4.6.0 related fixes & patch upstream status updates

index 2c30d43..609b1df 100644
@@ -7,6 +7,9 @@ require gcc-common.inc
 
 require gcc-4_6-branch-backports.inc
 
+# Linaro patches for 4.6 branch
+require gcc-4_6-branch-linaro-backports.inc
+
 PR = "r1"
 
 DEPENDS =+ "mpfr gmp libmpc"

@@ -22,6 +25,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
 
 SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	   ${GCC-4_6-BRANCH-BACKPORTS} \
+	   ${GCC-4_6-BRANCH-LINARO-BACKPORTS} \
 	   file://gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch \
 	   file://100-uclibc-conf.patch \
            file://gcc-uclibc-locale-ctype_touplow_t.patch \

51 lines not on this page · raw message

63 lines not on this page · raw message

new file mode 100644
index 0000000..465d09c
@@ -0,0 +1,32 @@
+2011-03-22  Andrew Stubbs  <[email protected]>
+
+	Backport from FSF:
+
+	2011-03-21  Daniel Jacobowitz  <[email protected]>
+
+	gcc/
+	* config/arm/unwind-arm.c (__gnu_unwind_pr_common): Correct test
+	for barrier handlers.
+
+=== modified file 'gcc/config/arm/unwind-arm.c'
+--- old/gcc/config/arm/unwind-arm.c	2009-10-30 14:55:10 +0000
++++ new/gcc/config/arm/unwind-arm.c	2011-03-22 10:59:10 +0000
+@@ -1196,8 +1196,6 @@
+ 		  ucbp->barrier_cache.bitpattern[4] = (_uw) &data[1];
+ 
+ 		  if (data[0] & uint32_highbit)
+-		    phase2_call_unexpected_after_unwind = 1;
+-		  else
+ 		    {
+ 		      data += rtti_count + 1;
+ 		      /* Setup for entry to the handler.  */
+@@ -1207,6 +1205,8 @@
+ 		      _Unwind_SetGR (context, 0, (_uw) ucbp);
+ 		      return _URC_INSTALL_CONTEXT;
+ 		    }
++		  else
++		    phase2_call_unexpected_after_unwind = 1;
+ 		}
+ 	      if (data[0] & uint32_highbit)
+ 		data++;
+

new file mode 100644
index 0000000..9b684aa
@@ -0,0 +1,28 @@
+2011-03-23  Andrew Stubbs  <[email protected]>
+
+	Backport from FSF:
+
+	2011-03-23  Julian Brown  <[email protected]>
+
+	gcc/
+	* expr.c (expand_expr_real_1): Only use BLKmode for volatile
+	accesses which are not naturally aligned.
+
+=== modified file 'gcc/expr.c'
+--- old/gcc/expr.c	2011-03-18 09:04:31 +0000
++++ new/gcc/expr.c	2011-04-05 16:18:11 +0000
+@@ -9147,8 +9147,11 @@
+ 		&& modifier != EXPAND_CONST_ADDRESS
+ 		&& modifier != EXPAND_INITIALIZER)
+ 	    /* If the field is volatile, we always want an aligned
+-	       access.  */
+-	    || (volatilep && flag_strict_volatile_bitfields > 0)
++	       access.  Only do this if the access is not already naturally
++	       aligned, otherwise "normal" (non-bitfield) volatile fields
++	       become non-addressable.  */
++	    || (volatilep && flag_strict_volatile_bitfields > 0
++		&& (bitpos % GET_MODE_ALIGNMENT (mode) != 0))
+ 	    /* If the field isn't aligned enough to fetch as a memref,
+ 	       fetch it as a bit field.  */
+ 	    || (mode1 != BLKmode
+

653 lines not on this page · raw message

126 lines not on this page · raw message

177 lines not on this page · raw message

new file mode 100644
index 0000000..3160e35
@@ -0,0 +1,9 @@
+GCC-4_6-BRANCH-LINARO-BACKPORTS = " \
+file://linaro/gcc-4.6-linaro-r106720.patch \
+file://linaro/gcc-4.6-linaro-r106723.patch \
+file://linaro/gcc-4.6-linaro-r106729.patch \
+file://linaro/gcc-4.6-linaro-r106731.patch \
+file://linaro/gcc-4.6-linaro-r106733.patch \
+file://linaro/gcc-4.6-linaro-r106737.patch \
+file://linaro/gcc-4.6-linaro-r106738.patch \
+"

index 6548353..4b21ffa 100644
@@ -1,3 +1,4 @@
+Upstream-Status="Inappropriate [debian patch]"
 
 This patch address a namespace collision with libc.
 

index 0626fb3..1867395 100644
@@ -1,3 +1,5 @@
+Upstream-Status="Inappropriate [configuration]"
+
 To be upstreamable, this patch requires check for *_FOR_BUILD, otherwise
 it needs to pass special variables.
 

index cd3a600..c88bc80 100644
@@ -1,3 +1,5 @@
+Upstream-Status="Inappropriate [debian patch]"
+
 Index: patch-2.6.1/patch.man
 ===================================================================
 --- patch-2.6.1.orig/patch.man

index 4601858..e0106dc 100644
@@ -1,3 +1,5 @@
+Upstream-Status="Inappropriate [debian patch]"
+
 --- patch-2.5.9.orig/m4/hash.m4
 +++ patch-2.5.9/m4/hash.m4
 @@ -0,0 +1,15 @@

index 66065fc..d837896 100644
@@ -1,3 +1,5 @@
+Upstream-Status="Inappropriate [debian patch]"
+
 Index: patch-2.5.9/patch.man
 ===================================================================
 --- patch-2.5.9.orig/patch.man

index c959189..0359ccd 100644
@@ -1,3 +1,5 @@
+Upstream-Status="Inappropriate [embedded specific]"
+
 Index: patch-2.5.4/Makefile.in
 ===================================================================
 --- patch-2.5.4.orig/Makefile.in	2005-03-09 07:23:54.779311824 -0500

index 6bfa00d..1608b5e 100644
@@ -1,3 +1,5 @@
+Upstream-Status="Inappropriate [debian patch]"
+
 Generate unified diff style reject files. Also include the C function names
 in reject files whenever possible.
 

index 264dcc0..30bf692 100644
@@ -1,3 +1,5 @@
+Upstream-Status="Inappropriate [embedded specific]"
+
 Index: Imaging-1.1.7/setup.py
 ===================================================================
 --- Imaging-1.1.7.orig/setup.py

index ad716d0..ffe6330 100644
@@ -1,3 +1,5 @@
+Upstream-Status="Inappropriate [embedded specific]"
+
 Index: subversion-1.6.15/Makefile.in
 ===================================================================
 --- subversion-1.6.15.orig/Makefile.in	2010-11-17 06:47:23.000000000 -0800

index 08343b0..12872db 100644
@@ -1,3 +1,5 @@
+Upstream-Status="Inappropriate [embedded specific]"
+
 Index: subversion-1.5.5/configure.ac
 ===================================================================
 --- subversion-1.5.5.orig/configure.ac	2008-08-26 18:27:56.000000000 +0100

index eaf6de0..3d28fb2 100644
@@ -1,3 +1,5 @@
+Upstream-Status="Inappropriate [embedded specific]"
+
 Index: subversion-1.6.13/build/ac-macros/neon.m4
 ===================================================================
 --- subversion-1.6.13.orig/build/ac-macros/neon.m4

new file mode 100644
index 0000000..c3510ad
@@ -0,0 +1,266 @@
+Backported to linux-yocto kernel git version
+
+Signed-off-by: Khem Raj <[email protected]>
+
+
+From patchwork Tue Apr 19 20:09:19 2011
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [70/70] perf tool: Fix gcc 4.6.0 issues
+Date: Tue, 19 Apr 2011 20:09:19 -0000
+From: Greg Kroah-Hartman <[email protected]>
+X-Patchwork-Id: 719212
+Message-Id: <[email protected]>
+To: [email protected], [email protected]
+Cc: [email protected], [email protected],
+ [email protected], [email protected],
+ Ingo Molnar <[email protected]>, Kyle McMartin <[email protected]>,
+ Arnaldo Carvalho de Melo <[email protected]>, Thomas Meyer <[email protected]>
+
+2.6.38-stable review patch.  If anyone has any objections, please let us know.
+
+------------------
+
+From: Kyle McMartin <[email protected]>
+
+commit fb7d0b3cefb80a105f7fd26bbc62e0cbf9192822 upstream.
+
+GCC 4.6.0 in Fedora rawhide turned up some compile errors in tools/perf
+due to the -Werror=unused-but-set-variable flag.
+
+I've gone through and annotated some of the assignments that had side
+effects (ie: return value from a function) with the __used annotation,
+and in some cases, just removed unused code.
+
+In a few cases, we were assigning something useful, but not using it in
+later parts of the function.
+
+kyle@dreadnought:~/src% gcc --version
+gcc (GCC) 4.6.0 20110122 (Red Hat 4.6.0-0.3)
+
+Cc: Ingo Molnar <[email protected]>
+LKML-Reference: <[email protected]>
+Signed-off-by: Kyle McMartin <[email protected]>
+[ committer note: Fixed up the annotation fixes, as that code moved recently ]
+Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
+[Backported to 2.6.38.2 by deleting unused but set variables]
+Signed-off-by: Thomas Meyer <[email protected]>
+Signed-off-by: Greg Kroah-Hartman <[email protected]>
+
+---
+tools/perf/bench/sched-pipe.c                          |    2 +-
+ tools/perf/builtin-sched.c                             |   12 +++---------
+ tools/perf/builtin-top.c                               |    5 +----
+ tools/perf/util/header.c                               |    2 +-
+ tools/perf/util/hist.c                                 |    3 ---
+ tools/perf/util/scripting-engines/trace-event-python.c |    3 +--
+ tools/perf/util/symbol.c                               |    4 ++--
+ tools/perf/util/trace-event-parse.c                    |    2 +-
+ tools/perf/util/ui/browsers/map.c                      |    2 +-
+ 9 files changed, 11 insertions(+), 24 deletions(-)
+
+
+
+--
+To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
+the body of a message to [email protected]
+More majordomo info at  http://vger.kernel.org/majordomo-info.html
+Please read the FAQ at  http://www.tux.org/lkml/
+
+Index: linux/tools/perf/bench/sched-pipe.c
+===================================================================
+--- linux.orig/tools/perf/bench/sched-pipe.c
++++ linux/tools/perf/bench/sched-pipe.c
+@@ -55,7 +55,7 @@ int bench_sched_pipe(int argc, const cha
+ 	 * discarding returned value of read(), write()
+ 	 * causes error in building environment for perf
+ 	 */
+-	int ret, wait_stat;
++	int __used ret, wait_stat;
+ 	pid_t pid, retpid;
+ 
+ 	argc = parse_options(argc, argv, options,
+Index: linux/tools/perf/builtin-sched.c
+===================================================================
+--- linux.orig/tools/perf/builtin-sched.c
++++ linux/tools/perf/builtin-sched.c
+@@ -369,11 +369,6 @@ static void
+ process_sched_event(struct task_desc *this_task __used, struct sched_atom *atom)
+ {
+ 	int ret = 0;
+-	u64 now;
+-	long long delta;
+-
+-	now = get_nsecs();
+-	delta = start_time + atom->timestamp - now;
+ 
+ 	switch (atom->type) {
+ 		case SCHED_EVENT_RUN:
+@@ -561,7 +556,7 @@ static void wait_for_tasks(void)
+ 
+ static void run_one_test(void)
+ {
+-	u64 T0, T1, delta, avg_delta, fluct, std_dev;
++	u64 T0, T1, delta, avg_delta, fluct;
+ 
+ 	T0 = get_nsecs();
+ 	wait_for_tasks();
+@@ -577,7 +572,6 @@ static void run_one_test(void)
+ 	else
+ 		fluct = delta - avg_delta;
+ 	sum_fluct += fluct;
+-	std_dev = sum_fluct / nr_runs / sqrt(nr_runs);
+ 	if (!run_avg)
+ 		run_avg = delta;
+ 	run_avg = (run_avg*9 + delta)/10;
+@@ -798,7 +792,7 @@ replay_switch_event(struct trace_switch_
+ 		    u64 timestamp,
+ 		    struct thread *thread __used)
+ {
+-	struct task_desc *prev, *next;
++	struct task_desc *prev, __used *next;
+ 	u64 timestamp0;
+ 	s64 delta;
+ 
+@@ -1403,7 +1397,7 @@ map_switch_event(struct trace_switch_eve
+ 		 u64 timestamp,
+ 		 struct thread *thread __used)
+ {
+-	struct thread *sched_out, *sched_in;
++	struct thread *sched_out __used, *sched_in;
+ 	int new_shortname;
+ 	u64 timestamp0;
+ 	s64 delta;
+Index: linux/tools/perf/builtin-top.c
+===================================================================
+--- linux.orig/tools/perf/builtin-top.c
++++ linux/tools/perf/builtin-top.c
+@@ -180,7 +180,6 @@ static int parse_source(struct sym_entry
+ 	FILE *file;
+ 	char command[PATH_MAX*2];
+ 	const char *path;
+-	u64 len;
+ 
+ 	if (!syme)
+ 		return -1;
+@@ -209,8 +208,6 @@ static int parse_source(struct sym_entry
+ 	}
+ 	path = map->dso->long_name;
+ 
+-	len = sym->end - sym->start;
+-
+ 	sprintf(command,
+ 		"objdump --start-address=%#0*Lx --stop-address=%#0*Lx -dS %s",
+ 		BITS_PER_LONG / 4, map__rip_2objdump(map, sym->start),
+@@ -1263,7 +1260,7 @@ static int __cmd_top(void)
+ {
+ 	pthread_t thread;
+ 	int i, counter;
+-	int ret;
++	int ret __used;
+ 	/*
+ 	 * FIXME: perf_session__new should allow passing a O_MMAP, so that all this
+ 	 * mmap reading, etc is encapsulated in it. Use O_WRONLY for now.
+Index: linux/tools/perf/util/header.c
+===================================================================
+--- linux.orig/tools/perf/util/header.c
++++ linux/tools/perf/util/header.c
+@@ -1113,7 +1113,7 @@ int event__synthesize_tracing_data(int f
+ {
+ 	event_t ev;
+ 	ssize_t size = 0, aligned_size = 0, padding;
+-	int err = 0;
++	int err __used = 0;
+ 
+ 	memset(&ev, 0, sizeof(ev));
+ 
+Index: linux/tools/perf/util/hist.c
+===================================================================
+--- linux.orig/tools/perf/util/hist.c
++++ linux/tools/perf/util/hist.c
+@@ -1091,7 +1091,6 @@ int hist_entry__annotate(struct hist_ent
+ 	char command[PATH_MAX * 2];
+ 	FILE *file;
+ 	int err = 0;
+-	u64 len;
+ 
+ 	if (filename == NULL) {
+ 		if (dso->has_build_id) {
+@@ -1128,8 +1127,6 @@ fallback:
+ 		 filename, sym->name, map->unmap_ip(map, sym->start),
+ 		 map->unmap_ip(map, sym->end));
+ 
+-	len = sym->end - sym->start;
+-
+ 	pr_debug("annotating [%p] %30s : [%p] %30s\n",
+ 		 dso, dso->long_name, sym, sym->name);
+ 
+Index: linux/tools/perf/util/scripting-engines/trace-event-python.c
+===================================================================
+--- linux.orig/tools/perf/util/scripting-engines/trace-event-python.c
++++ linux/tools/perf/util/scripting-engines/trace-event-python.c
+@@ -248,8 +248,7 @@ static void python_process_event(int cpu
+ 	context = PyCObject_FromVoidPtr(scripting_context, NULL);
+ 
+ 	PyTuple_SetItem(t, n++, PyString_FromString(handler_name));
+-	PyTuple_SetItem(t, n++,
+-			PyCObject_FromVoidPtr(scripting_context, NULL));
++	PyTuple_SetItem(t, n++, context);
+ 
+ 	if (handler) {
+ 		PyTuple_SetItem(t, n++, PyInt_FromLong(cpu));
+Index: linux/tools/perf/util/symbol.c
+===================================================================
+--- linux.orig/tools/perf/util/symbol.c
++++ linux/tools/perf/util/symbol.c
+@@ -1481,8 +1481,8 @@ int dso__load(struct dso *self, struct m
+ 			snprintf(name, size, "%s", self->long_name);
+ 			break;
+ 		case DSO__ORIG_GUEST_KMODULE:
+-			if (map->groups && map->groups->machine)
+-				root_dir = map->groups->machine->root_dir;
++			if (map->groups && machine)
++				root_dir = machine->root_dir;
+ 			else
+ 				root_dir = "";
+ 			snprintf(name, size, "%s%s", root_dir, self->long_name);
+Index: linux/tools/perf/util/trace-event-parse.c
+===================================================================
+--- linux.orig/tools/perf/util/trace-event-parse.c
++++ linux/tools/perf/util/trace-event-parse.c
+@@ -153,7 +153,7 @@ void parse_proc_kallsyms(char *file, uns
+ 	char *next = NULL;
+ 	char *addr_str;
+ 	char ch;
+-	int ret;
++	int ret __used;
+ 	int i;
+ 
+ 	line = strtok_r(file, "\n", &next);
+Index: linux/tools/perf/util/ui/browsers/map.c
+===================================================================
+--- linux.orig/tools/perf/util/ui/browsers/map.c
++++ linux/tools/perf/util/ui/browsers/map.c
+@@ -40,7 +40,7 @@ static int ui_entry__read(const char *ti
+ out_free_form:
+ 	newtPopWindow();
+ 	newtFormDestroy(form);
+-	return 0;
++	return err;
+ }
+ 
+ struct map_browser {
+Index: linux/tools/perf/builtin-stat.c
+===================================================================
+--- linux.orig/tools/perf/builtin-stat.c
++++ linux/tools/perf/builtin-stat.c
+@@ -211,7 +211,7 @@ static void read_counter(int counter)
+ 	u64 count[3], single_count[3];
+ 	int cpu;
+ 	size_t res, nv;
+-	int scaled;
++	int scaled __used;
+ 	int i, thread;
+ 
+ 	count[0] = count[1] = count[2] = 0;

index 3b4e77e..e08d2df 100644
@@ -35,7 +35,9 @@ PR = "r17"
 PV = "${LINUX_VERSION}+git${SRCPV}"
 SRCREV_FORMAT = "meta_machine"
 
-SRC_URI = "git://git.yoctoproject.org/linux-yocto-2.6.37;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta"
+SRC_URI = "git://git.yoctoproject.org/linux-yocto-2.6.37;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta \
+           file://perf-tool-Fix-gcc-4.6.0-issues.patch \
+          "
 
 COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemuppc|qemumips|qemux86-64|mpc8315e-rdb|routerstationpro|beagleboard)"
 

new file mode 100644
index 0000000..11c727d
@@ -0,0 +1,115 @@
+Upstream-Status="Pending"
+
+Fix the following compilation issues with gcc 4.6.0
+
+| /build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git/ext/repo_updateinfoxml.c: In function 'startElement':
+| /build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git/ext/repo_updateinfoxml.c:278:25: error: variable 'status' set but not used [-Werror=unused-but-set-variable]
+| /build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git/ext/repo_updateinfoxml.c:386:36: error: variable 'src' set but not used [-Werror=unused-but-set-variable]
+| cc1: all warnings being treated as errors
+| 
+| make[2]: *** [ext/CMakeFiles/satsolverext.dir/repo_updateinfoxml.o] Error 1
+| make[2]: *** Waiting for unfinished jobs....
+| /build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git/src/transaction.c: In function 'transaction_add_obsoleted':
+| /build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git/src/transaction.c:1933:21: error: variable 'oldcount' set but not used [-Werror=unused-but-set-variable]
+| cc1: all warnings being treated as errors
+| 
+| make[2]: *** [src/CMakeFiles/satsolver.dir/transaction.o] Error 1
+| make[2]: Leaving directory `/build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git'
+| make[1]: *** [src/CMakeFiles/satsolver.dir/all] Error 2
+| make[1]: *** Waiting for unfinished jobs....
+| /build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git/ext/repo_rpmdb.c: In function 'rpm_byfp':
+| /build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git/ext/repo_rpmdb.c:2406:20: error: variable 'headerend' set but not used [-Werror=unused-but-set-variable]
+| /build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git/ext/repo_rpmdb.c: In function 'parsekeydata':
+| /build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git/ext/repo_rpmdb.c:2833:29: error: variable 'scr' set but not used [-Werror=unused-but-set-variable]
+| /build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git/ext/repo_rpmdb.c:2669:7: error: variable 'useridl' set but not used [-Werror=unused-but-set-variable]
+| /build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git/ext/repo_rpmdb.c:2667:7: error: variable 'pubkeyl' set but not used [-Werror=unused-but-set-variable]
+| cc1: all warnings being treated as errors
+| 
+| make[2]: *** [ext/CMakeFiles/satsolverext.dir/repo_rpmdb.o] Error 1
+| make[2]: Leaving directory `/build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git'
+| make[1]: *** [ext/CMakeFiles/satsolverext.dir/all] Error 2
+| make[1]: Leaving directory `/build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git'
+| make: *** [all] Error 2
+| FATAL: oe_runmake failed
+| ERROR: Function 'do_compile' failed (see /build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/temp/log.do_compile.21830 for further information)
+NOTE: package sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9: task do_compile: Failed
+
+Nitin A Kamble <[email protected]> 2011/05/05
+
+Index: git/src/transaction.c
+===================================================================
+--- git.orig/src/transaction.c
++++ git/src/transaction.c
+@@ -1930,7 +1930,7 @@ transaction_add_obsoleted(Transaction *t
+   Repo *installed = pool->installed;
+   Id p;
+   Solvable *s;
+-  int i, j, k, max, oldcount;
++  int i, j, k, max;
+   Map done;
+   Queue obsq, *steps;
+ 
+@@ -1945,7 +1945,6 @@ transaction_add_obsoleted(Transaction *t
+     return;
+   /* make room */
+   steps = &trans->steps;
+-  oldcount = steps->count;
+   queue_insertn(steps, 0, max);
+ 
+   /* now add em */
+Index: git/ext/repo_updateinfoxml.c
+===================================================================
+--- git.orig/ext/repo_updateinfoxml.c
++++ git/ext/repo_updateinfoxml.c
+@@ -275,7 +275,7 @@ startElement(void *userData, const char 
+        */
+     case STATE_UPDATE:
+       {
+-	const char *from = 0, *status = 0, *type = 0, *version = 0;
++	const char *from = 0, __attribute__((__unused__)) *status = 0, *type = 0, *version = 0;
+ 	for (; *atts; atts += 2)
+ 	  {
+ 	    if (!strcmp(*atts, "from"))
+@@ -383,7 +383,7 @@ startElement(void *userData, const char 
+        */
+     case STATE_PACKAGE:
+       {
+-	const char *arch = 0, *name = 0, *src = 0;
++	const char *arch = 0, *name = 0, __attribute__((__unused__)) *src = 0;
+ 	Id evr = makeevr_atts(pool, pd, atts); /* parse "epoch", "version", "release" */
+ 	Id n, a = 0;
+ 	Id rel_id;
+Index: git/ext/repo_rpmdb.c
+===================================================================
+--- git.orig/ext/repo_rpmdb.c
++++ git/ext/repo_rpmdb.c
+@@ -2403,7 +2403,7 @@ void *
+ rpm_byfp(FILE *fp, const char *name, void **statep)
+ {
+   struct rpm_by_state *state = *statep;
+-  int headerstart, headerend;
++  int headerstart, __attribute__((__unused__))headerend;
+   RpmHead *rpmhead;
+   int sigdsize, sigcnt, l;
+   unsigned char lead[4096];
+@@ -2664,9 +2664,9 @@ parsekeydata(Solvable *s, Repodata *data
+   unsigned char keyid[8];
+   unsigned int kcr = 0, maxex = 0;
+   unsigned char *pubkey = 0;
+-  int pubkeyl = 0;
++  int __attribute__((__unused__)) pubkeyl = 0;
+   unsigned char *userid = 0;
+-  int useridl = 0;
++  int __attribute__((__unused__)) useridl = 0;
+ 
+   for (; pl; p += l, pl -= l)
+     {
+@@ -2830,7 +2830,7 @@ parsekeydata(Solvable *s, Repodata *data
+ 	    {
+ 	      int j, ql, haveissuer;
+ 	      unsigned char *q;
+-	      unsigned int ex = 0, scr = 0;
++	      unsigned int ex = 0, __attribute__((__unused__))scr = 0;
+ 	      unsigned char issuer[8];
+ 
+ 	      // printf("V4 signature packet\n");

index a174e76..c608bb7 100644
@@ -8,7 +8,9 @@ DEPENDS = "libcheck rpm zlib expat db"
 
 SRCREV = "0a7378d5f482f477a01cf1690d76871ab8bdcc32"
 PV = "0.0-git${SRCPV}"
-PR = "r9"
+PR = "r10"
+
+PARALLEL_MAKE=""
 
 SRC_URI = "git://gitorious.org/opensuse/sat-solver.git;protocol=git \
            file://sat-solver_rpm5.patch \

@@ -16,6 +18,7 @@ SRC_URI = "git://gitorious.org/opensuse/sat-solver.git;protocol=git \
            file://cmake.patch \
            file://db5.patch \
            file://sat-solver_core.patch \
+           file://fix_gcc-4.6.0_compile_issue.patch \
           "
 
 S = "${WORKDIR}/git"

index 0b79960..87716ff 100644
@@ -1,3 +1,5 @@
+Upstream-Status="Pending"
+
 Index: gcc-4.3.1/contrib/regression/objs-gcc.sh
 ===================================================================
 --- gcc-4.3.1.orig/contrib/regression/objs-gcc.sh	2007-12-24 15:18:57.000000000 -0800

index f9d8ad9..530d815 100644
@@ -1,3 +1,5 @@
+Upstream-Status="Pending"
+
 Corrects sub machine arch corectly
 
 Index: gcc-4.5.0/gcc/config.gcc

index 32de11f..042cda5 100644
@@ -1,3 +1,5 @@
+Upstream-Status="Pending"
+
 Index: gcc-4.5.0/libstdc++-v3/acinclude.m4
 ===================================================================
 --- gcc-4.5.0.orig/libstdc++-v3/acinclude.m4	2010-04-05 18:27:44.000000000 -0700

index f39e652..eaa4a2b 100644
@@ -1,3 +1,5 @@
+Upstream-Status="Pending"
+
 Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/c++locale_internal.h
 ===================================================================
 --- gcc-4.3.1.orig/libstdc++-v3/config/locale/uclibc/c++locale_internal.h	2008-08-16 01:29:20.000000000 -0700

index 160ab35..e44414d 100644
@@ -1,3 +1,5 @@
+Upstream-Status="Pending"
+
 --- gcc/libstdc++-v3/config/locale/uclibc/monetary_members.cc.uclibc200_wchar~	2006-03-10 15:32:37 +0100
 +++ gcc/libstdc++-v3/config/locale/uclibc/monetary_members.cc	2006-03-10 15:37:27 +0100
 @@ -401,7 +401,7 @@

index 48eaa1d..3c8fecf 100644
@@ -1,3 +1,5 @@
+Upstream-Status="Pending"
+
 Index: gcc-4.3.2/libstdc++-v3/config/locale/uclibc/c_locale.cc
 ===================================================================
 --- gcc-4.3.2.orig/libstdc++-v3/config/locale/uclibc/c_locale.cc	2008-09-17 22:35:28.000000000 -0700

index aaa5cee..133f9a6 100644
@@ -1,3 +1,5 @@
+Upstream-Status="Pending"
+
 Index: gcc-4.5.0/boehm-gc/include/gc.h
 ===================================================================
 --- gcc-4.5.0.orig/boehm-gc/include/gc.h	2007-04-23 14:10:09.000000000 -0700

index 12be2da..a5b68e2 100644
@@ -1,3 +1,5 @@
+Upstream-Status="Pending"
+
 Index: gcc-4.5.0/libstdc++-v3/include/c_std/cstdio
 ===================================================================
 --- gcc-4.5.0.orig/libstdc++-v3/include/c_std/cstdio	2010-02-04 10:20:34.000000000 -0800

index 56aa78c..19d6203 100644
@@ -1,3 +1,5 @@
+Upstream-Status="Inappropriate [embedded specific]"
+
 Index: gcc-4.5.0/libstdc++-v3/configure
 ===================================================================
 --- gcc-4.5.0.orig/libstdc++-v3/configure	2010-06-25 10:48:37.488384191 -0700

index bbb6563..1e0bc29 100644
@@ -1,3 +1,5 @@
+Upstream-Status="Pending"
+
 Index: gcc-4.5.0/libstdc++-v3/include/ext/rope
 ===================================================================
 --- gcc-4.5.0.orig/libstdc++-v3/include/ext/rope	2009-04-09 08:00:19.000000000 -0700

index f890acb..3b06731 100644
@@ -1,3 +1,5 @@
+Upstream-Status="Inappropriate [embedded specific]"
+
 Index: gcc-4.5.0/libmudflap/mf-hooks2.c
 ===================================================================
 --- gcc-4.5.0.orig/libmudflap/mf-hooks2.c	2009-04-09 08:00:19.000000000 -0700

index 75c7401..5fa2323 100644
@@ -1,3 +1,5 @@
+Upstream-Status="Pending"
+
 Index: gcc-4.5.0/libstdc++-v3/config/locale/uclibc/messages_members.h
 ===================================================================
 --- gcc-4.5.0.orig/libstdc++-v3/config/locale/uclibc/messages_members.h	2010-06-25 10:49:07.024632961 -0700

index 774fcfa..21b14ef 100644
@@ -1,3 +1,5 @@
+Upstream-Status="Pending"
+
 This patch fixes a bug into ostream::operator<<(double) due to the wrong size
 passed into the __convert_from_v method. The wrong size is then passed to
 std::snprintf function, that, on uClibc, doens't handle sized 0 buffer.

index 23fce75..31d3b18 100644
@@ -1,3 +1,5 @@
+Upstream-Status="Inappropriate [embedded specific]"
+
 --- gcc-4.1.0/libstdc++-v3/fragment.am	2005-03-21 11:40:14.000000000 -0600
 +++ gcc-4.1.0-patched/libstdc++-v3/fragment.am	2005-04-25 20:14:39.856251785 -0500
 @@ -21,5 +21,5 @@

index 067676a..0ee6b78 100644
@@ -1,3 +1,5 @@
+Upstream-Status="Inappropriate [embedded specific]"
+
 By default gcc places 64 bit libs in a lib64 directory. This makes it use 
 "lib" instead.
 

index d848892..6506cb7 100644
@@ -1,3 +1,5 @@
+Upstream-Status="Pending"
+
 http://sourceforge.net/mailarchive/forum.php?thread_id=8959304&forum_id=5348
 http://gcc.gnu.org/bugzilla/show_bug.cgi?id=24836
 

index 77d02c3..e4b1f55 100644
@@ -1,3 +1,5 @@
+Upstream-Status="Pending"
+
 By Lennert Buytenhek <[email protected]>
 Adds support for arm*b-linux* big-endian ARM targets
 

index c4641dc..a766aee 100644
@@ -1,3 +1,5 @@
+Upstream-Status="Pending"
+
 Hi,
 
 The attached patch makes sure that we create smaller object code for

index 7ac61a6..a72aaaf 100644
@@ -1,3 +1,5 @@
+Upstream-Status="Pending"
+
 Index: gcc-4.5/gcc/config/arm/arm.md
 ===================================================================
 --- gcc-4.5.orig/gcc/config/arm/arm.md	2010-06-17 09:13:07.000000000 -0700

index 99f2b20..88e4e3b 100644
@@ -1,3 +1,5 @@
+Upstream-Status="Pending"
+
 # Dimitry Andric <[email protected]>, 2004-05-01
 #
 # * Removed the extra -lfloat option from LIBGCC_SPEC, since it isn't needed

index 181d4fb..dc8b7a5 100644
@@ -1,3 +1,5 @@
+Upstream-Status="Pending"
+
 Index: gcc-4.5.0/gcc/config/arm/t-linux
 ===================================================================
 --- gcc-4.5.0.orig/gcc/config/arm/t-linux	2009-04-21 12:03:23.000000000 -0700

index eace3e9..e17be35 100644
@@ -1,3 +1,5 @@
+Upstream-Status="Pending"
+
 --- /tmp/configure.ac	2008-06-22 14:14:59.000000000 +0200
 +++ binutils-2.18.50.0.7/configure.ac	2008-06-22 14:15:30.000000000 +0200
 @@ -561,7 +561,7 @@

index adcabb4..e6bea3c 100644
@@ -1,3 +1,5 @@
+Upstream-Status="Pending"
+
 http://sourceware.org/bugzilla/show_bug.cgi?id=10340
 
 Signed-off-by: Sven Rebhan <[email protected]>

index 1fe713a..6d8fd42 100644
@@ -1,3 +1,5 @@
+Upstream-Status="Inappropriate [distribution: codesourcery]"
+
 Patch originally created by Mark Hatle, forward-ported to
 binutils 2.21 by Scott Garman.
 

index 8de04e0..64ed132 100644
@@ -1,3 +1,5 @@
+Upstream-Status="Pending"
+
 --- binutils-2.18.orig/configure
 +++ binutils-2.18/configure
 @@ -2206,7 +2206,7 @@