patches/gdb/6.4/600-fix-compile-flag-mismatch.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Sun Feb 17 22:08:06 2008 +0000 (2008-02-17)
changeset 431 8bde4c6ea47a
permissions -rw-r--r--
Robert P. J. DAY says:

apparently, the patchset for gcc 4.2.1 applies properly to the
source for gcc 4.2.2 and gcc 4.2.3. so, if you want, you can simply
add support for those last two just by augmenting menuconfig and
adding a couple symlinks for those two directories. seems like a
cheap way to add a couple new versions.
yann@96
     1
diff -ur gdb-6.4/gdb/configure gdb-6.4-patched/gdb/configure
yann@96
     2
--- gdb-6.4/gdb/configure	2005-07-25 10:08:40.000000000 -0500
yann@96
     3
+++ gdb-6.4-patched/gdb/configure	2007-02-05 13:22:36.000000000 -0600
yann@96
     4
@@ -309,7 +309,7 @@
yann@96
     5
 # include <unistd.h>
yann@96
     6
 #endif"
yann@96
     7
 
yann@96
     8
-ac_subdirs_all="$ac_subdirs_all doc testsuite"
yann@96
     9
+ac_subdirs_all="$ac_subdirs_all doc"
yann@96
    10
 ac_subdirs_all="$ac_subdirs_all gdbtk"
yann@96
    11
 ac_subdirs_all="$ac_subdirs_all multi-ice"
yann@96
    12
 ac_subdirs_all="$ac_subdirs_all gdbserver"
yann@96
    13
@@ -5940,7 +5940,7 @@
yann@96
    14
 
yann@96
    15
 
yann@96
    16
 
yann@96
    17
-subdirs="$subdirs doc testsuite"
yann@96
    18
+subdirs="$subdirs doc"
yann@96
    19
 
yann@96
    20
 
yann@96
    21
 . $srcdir/configure.host
yann@96
    22
diff -ur gdb-6.4/gdb/gdbserver/configure gdb-6.4-patched/gdb/gdbserver/configure
yann@96
    23
--- gdb-6.4/gdb/gdbserver/configure	2005-09-17 18:14:37.000000000 -0500
yann@96
    24
+++ gdb-6.4-patched/gdb/gdbserver/configure	2007-02-05 13:22:58.000000000 -0600
yann@96
    25
@@ -1239,7 +1239,7 @@
yann@96
    26
       ac_cache_corrupted=: ;;
yann@96
    27
     ,);;
yann@96
    28
     *)
yann@96
    29
-      if test "x$ac_old_val" != "x$ac_new_val"; then
yann@96
    30
+      if test "`echo $ac_old_val`" != "`echo $ac_new_val`"; then
yann@96
    31
 	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
yann@96
    32
 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
yann@96
    33
 	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
yann@96
    34
diff -ur gdb-6.4/gdb/testsuite/configure gdb-6.4-patched/gdb/testsuite/configure
yann@96
    35
--- gdb-6.4/gdb/testsuite/configure	2005-04-11 09:13:12.000000000 -0500
yann@96
    36
+++ gdb-6.4-patched/gdb/testsuite/configure	2007-02-05 13:22:36.000000000 -0600
yann@96
    37
@@ -1248,7 +1248,7 @@
yann@96
    38
       ac_cache_corrupted=: ;;
yann@96
    39
     ,);;
yann@96
    40
     *)
yann@96
    41
-      if test "x$ac_old_val" != "x$ac_new_val"; then
yann@96
    42
+      if test "`echo $ac_old_val" != "`echo $ac_new_val"; then
yann@96
    43
 	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
yann@96
    44
 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
yann@96
    45
 	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
yann@96
    46
diff -ur gdb-6.4/Makefile.in gdb-6.4-patched/Makefile.in
yann@96
    47
--- gdb-6.4/Makefile.in	2005-12-01 23:29:54.000000000 -0600
yann@96
    48
+++ gdb-6.4-patched/Makefile.in	2007-02-05 13:22:36.000000000 -0600
yann@96
    49
@@ -383,7 +383,7 @@
yann@96
    50
 # CFLAGS will be just -g.  We want to ensure that TARGET libraries
yann@96
    51
 # (which we know are built with gcc) are built with optimizations so
yann@96
    52
 # prepend -O2 when setting CFLAGS_FOR_TARGET.
yann@96
    53
-CFLAGS_FOR_TARGET = -O2 $(CFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET)
yann@96
    54
+CFLAGS_FOR_TARGET = $(strip $(CFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET))
yann@96
    55
 SYSROOT_CFLAGS_FOR_TARGET = @SYSROOT_CFLAGS_FOR_TARGET@
yann@96
    56
 
yann@96
    57
 # If GCC_FOR_TARGET is not overriden on the command line, then this
yann@96
    58
@@ -423,7 +423,7 @@
yann@96
    59
     fi; \
yann@96
    60
   fi`
yann@96
    61
 
yann@96
    62
-CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET)
yann@96
    63
+CXXFLAGS_FOR_TARGET = $(strip $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET))
yann@96
    64
 LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
yann@96
    65
 
yann@96
    66
 GCJ_FOR_TARGET=$(STAGE_CC_WRAPPER) @GCJ_FOR_TARGET@ $(FLAGS_FOR_TARGET)
yann@96
    67
diff -ur gdb-6.4/Makefile.tpl gdb-6.4-patched/Makefile.tpl
yann@96
    68
--- gdb-6.4/Makefile.tpl	2005-10-22 05:37:55.000000000 -0500
yann@96
    69
+++ gdb-6.4-patched/Makefile.tpl	2007-02-05 13:22:36.000000000 -0600
yann@96
    70
@@ -386,7 +386,7 @@
yann@96
    71
 # CFLAGS will be just -g.  We want to ensure that TARGET libraries
yann@96
    72
 # (which we know are built with gcc) are built with optimizations so
yann@96
    73
 # prepend -O2 when setting CFLAGS_FOR_TARGET.
yann@96
    74
-CFLAGS_FOR_TARGET = -O2 $(CFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET)
yann@96
    75
+CFLAGS_FOR_TARGET = $(strip $(CFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET))
yann@96
    76
 SYSROOT_CFLAGS_FOR_TARGET = @SYSROOT_CFLAGS_FOR_TARGET@
yann@96
    77
 
yann@96
    78
 # If GCC_FOR_TARGET is not overriden on the command line, then this
yann@96
    79
@@ -426,7 +426,7 @@
yann@96
    80
     fi; \
yann@96
    81
   fi`
yann@96
    82
 
yann@96
    83
-CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET)
yann@96
    84
+CXXFLAGS_FOR_TARGET = $(strip $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET))
yann@96
    85
 LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
yann@96
    86
 
yann@96
    87
 GCJ_FOR_TARGET=$(STAGE_CC_WRAPPER) @GCJ_FOR_TARGET@ $(FLAGS_FOR_TARGET)