From fe032933b2be495de8b14bbc8fcf3a459fb17e7d Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Fri, 9 Feb 2007 13:56:01 +0000 Subject: - forward the 600-fix-compile-flag-mismatch.patch from 6.4 to 6.5 --- .../gdb/6.5/600-fix-compile-flag-mismatch.patch | 69 ++++++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 toolchain/gdb/6.5/600-fix-compile-flag-mismatch.patch (limited to 'toolchain/gdb') diff --git a/toolchain/gdb/6.5/600-fix-compile-flag-mismatch.patch b/toolchain/gdb/6.5/600-fix-compile-flag-mismatch.patch new file mode 100644 index 000000000..ba98482d8 --- /dev/null +++ b/toolchain/gdb/6.5/600-fix-compile-flag-mismatch.patch @@ -0,0 +1,69 @@ +diff -ur gdb-6.4/gdb/configure gdb-6.4-patched/gdb/configure +--- gdb-6.4/gdb/configure 2005-07-25 10:08:40.000000000 -0500 ++++ gdb-6.4-patched/gdb/configure 2007-02-05 13:22:36.000000000 -0600 +@@ -309,7 +309,7 @@ + # include + #endif" + +-ac_subdirs_all="$ac_subdirs_all doc testsuite" ++ac_subdirs_all="$ac_subdirs_all doc" + ac_subdirs_all="$ac_subdirs_all gdbtk" + ac_subdirs_all="$ac_subdirs_all multi-ice" + ac_subdirs_all="$ac_subdirs_all gdbserver" +@@ -5940,7 +5940,7 @@ + + + +-subdirs="$subdirs doc testsuite" ++subdirs="$subdirs doc" + + + . $srcdir/configure.host +diff -ur gdb-6.4/gdb/gdbserver/configure gdb-6.4-patched/gdb/gdbserver/configure +--- gdb-6.4/gdb/gdbserver/configure 2005-09-17 18:14:37.000000000 -0500 ++++ gdb-6.4-patched/gdb/gdbserver/configure 2007-02-05 13:22:58.000000000 -0600 +@@ -1239,7 +1239,7 @@ + ac_cache_corrupted=: ;; + ,);; + *) +- if test "x$ac_old_val" != "x$ac_new_val"; then ++ if test "`echo $ac_old_val`" != "`echo $ac_new_val`"; then + { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 + echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 +diff -ur gdb-6.4/gdb/testsuite/configure gdb-6.4-patched/gdb/testsuite/configure +--- gdb-6.4/gdb/testsuite/configure 2005-04-11 09:13:12.000000000 -0500 ++++ gdb-6.4-patched/gdb/testsuite/configure 2007-02-05 13:22:36.000000000 -0600 +@@ -1248,7 +1248,7 @@ + ac_cache_corrupted=: ;; + ,);; + *) +- if test "x$ac_old_val" != "x$ac_new_val"; then ++ if test "`echo $ac_old_val" != "`echo $ac_new_val"; then + { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 + echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 +diff -ur gdb-6.4/Makefile.in gdb-6.4-patched/Makefile.in +--- gdb-6.4/Makefile.in 2005-12-01 23:29:54.000000000 -0600 ++++ gdb-6.4-patched/Makefile.in 2007-02-05 13:22:36.000000000 -0600 +@@ -383,7 +383,7 @@ + # CFLAGS will be just -g. We want to ensure that TARGET libraries + # (which we know are built with gcc) are built with optimizations so + # prepend -O2 when setting CFLAGS_FOR_TARGET. +-CFLAGS_FOR_TARGET = -O2 $(CFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) ++CFLAGS_FOR_TARGET = $(strip $(CFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET)) + SYSROOT_CFLAGS_FOR_TARGET = @SYSROOT_CFLAGS_FOR_TARGET@ + + # If GCC_FOR_TARGET is not overriden on the command line, then this +diff -ur gdb-6.4/Makefile.tpl gdb-6.4-patched/Makefile.tpl +--- gdb-6.4/Makefile.tpl 2005-10-22 05:37:55.000000000 -0500 ++++ gdb-6.4-patched/Makefile.tpl 2007-02-05 13:22:36.000000000 -0600 +@@ -386,7 +386,7 @@ + # CFLAGS will be just -g. We want to ensure that TARGET libraries + # (which we know are built with gcc) are built with optimizations so + # prepend -O2 when setting CFLAGS_FOR_TARGET. +-CFLAGS_FOR_TARGET = -O2 $(CFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) ++CFLAGS_FOR_TARGET = $(strip $(CFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET)) + SYSROOT_CFLAGS_FOR_TARGET = @SYSROOT_CFLAGS_FOR_TARGET@ + + # If GCC_FOR_TARGET is not overriden on the command line, then this -- cgit v1.2.3