fixup gdb-6.7.1

diff -rNdup gdb-6.6.orig/bfd/configure gdb-6.6/bfd/configure

--- gdb-6.6.orig/bfd/configure	2006-10-25 08:49:20.000000000 +0200

+++ gdb-6.6/bfd/configure	2007-05-14 10:35:50.000000000 +0200

@@ -3579,6 +3579,11 @@ linux-gnu*)

   lt_cv_deplibs_check_method=pass_all

   ;;

+linux-uclibc*)

+  lt_cv_deplibs_check_method=pass_all

+  lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`

+  ;;

+

 netbsd* | knetbsd*-gnu)

   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then

     lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'

diff -rNdup gdb-6.6.orig/libtool.m4 gdb-6.6/libtool.m4

--- gdb-6.6.orig/libtool.m4	2005-12-27 17:37:57.000000000 +0100

+++ gdb-6.6/libtool.m4	2007-05-14 10:35:50.000000000 +0200

@@ -751,6 +751,11 @@ netbsd* | knetbsd*-gnu)

   fi

   ;;

+linux-uclibc*)

+  lt_cv_deplibs_check_method=pass_all

+  lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`

+  ;;

+

 newsos6)

   [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)']

   lt_cv_file_magic_cmd=/usr/bin/file

diff -rNdup gdb-6.6.orig/ltconfig gdb-6.6/ltconfig

--- gdb-6.6.orig/ltconfig	2006-07-04 22:31:03.000000000 +0200

+++ gdb-6.6/ltconfig	2007-05-14 10:35:50.000000000 +0200

@@ -602,7 +602,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-

 # Transform linux* to *-*-linux-gnu*, to support old configure scripts.

 case $host_os in

-linux-gnu*) ;;

+linux-gnu*|linux-uclibc*) ;;

 linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`

 esac

@@ -1270,6 +1270,24 @@ linux-gnu*)

   dynamic_linker='GNU/Linux ld.so'

   ;;

+linux-uclibc*)

+  version_type=linux

+  need_lib_prefix=no

+  need_version=no

+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'

+  soname_spec='${libname}${release}.so$major'

+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'

+  shlibpath_var=LD_LIBRARY_PATH

+  shlibpath_overrides_runpath=no

+  # This implies no fast_install, which is unacceptable.

+  # Some rework will be needed to allow for fast_install

+  # before this can be enabled.

+  # Note: copied from linux-gnu, and may not be appropriate.

+  hardcode_into_libs=yes

+  # Assume using the uClibc dynamic linker.

+  dynamic_linker="uClibc ld.so"

+  ;;

+

 netbsd*)

   need_lib_prefix=no

   need_version=no

diff -rNdup gdb-6.6.orig/opcodes/configure gdb-6.6/opcodes/configure

--- gdb-6.6.orig/opcodes/configure	2006-10-25 08:49:20.000000000 +0200

+++ gdb-6.6/opcodes/configure	2007-05-14 10:35:50.000000000 +0200

@@ -3590,6 +3590,11 @@ netbsd* | knetbsd*-gnu)

   fi

   ;;

+linux-uclibc*)

+  lt_cv_deplibs_check_method=pass_all

+  lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`

+  ;;

+

 newsos6)

   lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'

   lt_cv_file_magic_cmd=/usr/bin/file

diff -rduNp gdb-6.6-100/Makefile.in gdb-6.6/Makefile.in

--- gdb-6.6-100/Makefile.in	2006-12-18 08:21:19.000000000 +0100

+++ gdb-6.6/Makefile.in	2007-05-14 10:54:29.000000000 +0200

@@ -331,7 +331,7 @@ COMPILER_NM_FOR_TARGET=@COMPILER_NM_FOR_

 # 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@

 CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET)

 LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)

diff -rduNp gdb-6.6-100/Makefile.tpl gdb-6.6/Makefile.tpl

--- gdb-6.6-100/Makefile.tpl	2006-11-15 00:26:39.000000000 +0100

+++ gdb-6.6/Makefile.tpl	2007-05-14 10:54:29.000000000 +0200

@@ -334,7 +334,7 @@ COMPILER_NM_FOR_TARGET=@COMPILER_NM_FOR_

 # 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@

 CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET)

 LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)

diff -rduNp gdb-6.6-100/gdb/configure gdb-6.6/gdb/configure

--- gdb-6.6-100/gdb/configure	2006-12-17 16:38:59.000000000 +0100

+++ gdb-6.6/gdb/configure	2007-05-14 10:55:41.000000000 +0200

@@ -272,7 +272,7 @@ PACKAGE_STRING=

--- a/gdb/gdbserver/configure

+++ b/gdb/gdbserver/configure

@@ -1239,7 +1239,7 @@

       ac_cache_corrupted=: ;;

     ,);;

     *)

-      if test "x$ac_old_val" != "x$ac_new_val"; then

+      if test "`echo x$ac_old_val`" != "`echo x$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

--- a/gdb/configure

+++ b/gdb/configure

@@ -272,7 +272,7 @@

 PACKAGE_BUGREPORT=

 ac_unique_file="main.c"

 # Factoring default headers for most tests.

 ac_includes_default="\

 #include <stdio.h>

@@ -3055,7 +3055,7 @@ _ACEOF

@@ -3077,7 +3077,7 @@

 # Provide defaults for some variables set by the per-host and per-target

diff -rduNp gdb-6.6-100/gdb/gdbserver/configure gdb-6.6/gdb/gdbserver/configure

--- gdb-6.6-100/gdb/gdbserver/configure	2006-11-22 01:10:19.000000000 +0100

+++ gdb-6.6/gdb/gdbserver/configure	2007-05-14 10:54:29.000000000 +0200

@@ -1239,7 +1239,7 @@ echo "$as_me: error: \`$ac_var' was not 

       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 -rduNp gdb-6.6-100/gdb/testsuite/configure gdb-6.6/gdb/testsuite/configure

--- gdb-6.6-100/gdb/testsuite/configure	2006-06-21 15:57:21.000000000 +0200

+++ gdb-6.6/gdb/testsuite/configure	2007-05-14 10:54:29.000000000 +0200

@@ -1248,7 +1248,7 @@ echo "$as_me: error: \`$ac_var' was not 

       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