Ich hab mal ueber die Feiertage nen kleinen Rewrite von dem Installersystem gemacht.

Ich hoffe somit mal das locale-Problem in den Griff zu bekommen.


git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@369 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

config/rootfiles/common/GeoIP

@@ -6,7 +6,7 @@ usr/lib/perl5/site_perl/5.8.8/Geo/IP/PurePerl.pm
 #usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Geo/IP
 #usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Geo/IP/PurePerl
 #usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Geo/IP/PurePerl/.packlist
-#usr/local/share/GeoIP
-#usr/local/share/GeoIP/GeoIP.dat
+usr/local/share/GeoIP
+usr/local/share/GeoIP/GeoIP.dat
 #usr/share/man/man1/geoip-lookup.1
 #usr/share/man/man3/Geo::IP::PurePerl.3

config/rootfiles/common/IO-Stringy

@@ -0,0 +1,20 @@
+#usr/lib/perl5/site_perl/5.8.8/IO
+usr/lib/perl5/site_perl/5.8.8/IO/AtomicFile.pm
+usr/lib/perl5/site_perl/5.8.8/IO/InnerFile.pm
+usr/lib/perl5/site_perl/5.8.8/IO/Lines.pm
+usr/lib/perl5/site_perl/5.8.8/IO/Scalar.pm
+usr/lib/perl5/site_perl/5.8.8/IO/ScalarArray.pm
+usr/lib/perl5/site_perl/5.8.8/IO/Stringy.pm
+usr/lib/perl5/site_perl/5.8.8/IO/Wrap.pm
+usr/lib/perl5/site_perl/5.8.8/IO/WrapTie.pm
+#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/IO
+#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/IO/Stringy
+#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/IO/Stringy/.packlist
+#usr/share/man/man3/IO::AtomicFile.3
+#usr/share/man/man3/IO::InnerFile.3
+#usr/share/man/man3/IO::Lines.3
+#usr/share/man/man3/IO::Scalar.3
+#usr/share/man/man3/IO::ScalarArray.3
+#usr/share/man/man3/IO::Stringy.3
+#usr/share/man/man3/IO::Wrap.3
+#usr/share/man/man3/IO::WrapTie.3

config/rootfiles/common/bridge-utils

@@ -0,0 +1,4 @@
+#usr/include/libbridge.h
+usr/lib/libbridge.a
+#usr/man/man8/brctl.8
+usr/sbin/brctl

config/rootfiles/common/hddtemp

@@ -0,0 +1,5 @@
+etc/hddtemp.db
+#usr/man/man8/hddtemp.8
+usr/sbin/hddtemp
+#usr/share/locale/fr/LC_MESSAGES/hddtemp.mo
+#usr/share/locale/ru/LC_MESSAGES/hddtemp.mo

config/rootfiles/common/htop

@@ -0,0 +1,6 @@
+usr/bin/htop
+#usr/man/man1/htop.1
+#usr/share/applications
+#usr/share/applications/htop.desktop
+#usr/share/pixmaps
+#usr/share/pixmaps/htop.png

config/rootfiles/common/iftop

@@ -0,0 +1,2 @@
+#usr/man/man8/iftop.8
+usr/sbin/iftop

config/rootfiles/common/ipp2p

@@ -0,0 +1,3 @@
+lib/modules/2.6.16/kernel/net/ipv4/netfilter/ipt_ipp2p.ko
+lib/iptables/libipt_ipp2p.o
+lib/modules/2.6.16-smp/kernel/net/ipv4/netfilter/ipt_ipp2p.ko

config/rootfiles/common/iptraf

@@ -0,0 +1,6 @@
+usr/bin/iptraf
+#usr/bin/rvnamed
+#var/local/iptraf
+#var/local/iptraf/version
+var/log/iptraf
+var/run/iptraf

config/rootfiles/common/l7-protocols

@@ -0,0 +1,267 @@
+#etc/l7-protocols
+#etc/l7-protocols/CHANGELOG
+#etc/l7-protocols/HOWTO
+#etc/l7-protocols/LICENSE
+#etc/l7-protocols/Makefile
+#etc/l7-protocols/README
+#etc/l7-protocols/WANTED
+#etc/l7-protocols/extra
+#etc/l7-protocols/extra/README
+#etc/l7-protocols/extra/audiogalaxy.pat
+#etc/l7-protocols/extra/http-dap.pat
+#etc/l7-protocols/extra/http-freshdownload.pat
+#etc/l7-protocols/extra/http-itunes.pat
+#etc/l7-protocols/extra/httpaudio.pat
+#etc/l7-protocols/extra/httpcachehit.pat
+#etc/l7-protocols/extra/httpcachemiss.pat
+#etc/l7-protocols/extra/httpvideo.pat
+#etc/l7-protocols/extra/pressplay.pat
+#etc/l7-protocols/extra/quicktime.pat
+#etc/l7-protocols/extra/snmp-mon.pat
+#etc/l7-protocols/extra/snmp-trap.pat
+#etc/l7-protocols/file_types
+#etc/l7-protocols/file_types/README
+#etc/l7-protocols/file_types/exe.pat
+#etc/l7-protocols/file_types/flash.pat
+#etc/l7-protocols/file_types/gif.pat
+#etc/l7-protocols/file_types/html.pat
+#etc/l7-protocols/file_types/jpeg.pat
+#etc/l7-protocols/file_types/ogg.pat
+#etc/l7-protocols/file_types/pdf.pat
+#etc/l7-protocols/file_types/perl.pat
+#etc/l7-protocols/file_types/postscript.pat
+#etc/l7-protocols/file_types/rar.pat
+#etc/l7-protocols/file_types/rpm.pat
+#etc/l7-protocols/file_types/rtf.pat
+#etc/l7-protocols/file_types/tar.pat
+#etc/l7-protocols/file_types/zip.pat
+#etc/l7-protocols/groups.sh
+#etc/l7-protocols/l7-protocols.spec
+#etc/l7-protocols/malware
+#etc/l7-protocols/malware/README
+#etc/l7-protocols/malware/code_red.pat
+#etc/l7-protocols/malware/nimda.pat
+etc/l7-protocols/protocols
+#etc/l7-protocols/protocols/100bao.pat
+#etc/l7-protocols/protocols/aim.pat
+#etc/l7-protocols/protocols/aimwebcontent.pat
+#etc/l7-protocols/protocols/applejuice.pat
+#etc/l7-protocols/protocols/ares.pat
+#etc/l7-protocols/protocols/battlefield1942.pat
+#etc/l7-protocols/protocols/battlefield2.pat
+#etc/l7-protocols/protocols/bgp.pat
+#etc/l7-protocols/protocols/biff.pat
+#etc/l7-protocols/protocols/bittorrent.pat
+#etc/l7-protocols/protocols/ciscovpn.pat
+#etc/l7-protocols/protocols/citrix.pat
+#etc/l7-protocols/protocols/counterstrike-source.pat
+#etc/l7-protocols/protocols/cvs.pat
+#etc/l7-protocols/protocols/dayofdefeat-source.pat
+#etc/l7-protocols/protocols/dhcp.pat
+#etc/l7-protocols/protocols/directconnect.pat
+#etc/l7-protocols/protocols/dns.pat
+#etc/l7-protocols/protocols/doom3.pat
+#etc/l7-protocols/protocols/edonkey.pat
+#etc/l7-protocols/protocols/fasttrack.pat
+#etc/l7-protocols/protocols/finger.pat
+#etc/l7-protocols/protocols/freenet.pat
+#etc/l7-protocols/protocols/ftp.pat
+#etc/l7-protocols/protocols/gkrellm.pat
+#etc/l7-protocols/protocols/gnucleuslan.pat
+#etc/l7-protocols/protocols/gnutella.pat
+#etc/l7-protocols/protocols/goboogy.pat
+#etc/l7-protocols/protocols/gopher.pat
+#etc/l7-protocols/protocols/h323.pat
+#etc/l7-protocols/protocols/halflife2-deathmatch.pat
+#etc/l7-protocols/protocols/hddtemp.pat
+#etc/l7-protocols/protocols/hotline.pat
+#etc/l7-protocols/protocols/http-rtsp.pat
+#etc/l7-protocols/protocols/http.pat
+#etc/l7-protocols/protocols/ident.pat
+#etc/l7-protocols/protocols/imap.pat
+#etc/l7-protocols/protocols/imesh.pat
+#etc/l7-protocols/protocols/ipp.pat
+#etc/l7-protocols/protocols/irc.pat
+#etc/l7-protocols/protocols/jabber.pat
+#etc/l7-protocols/protocols/kugoo.pat
+#etc/l7-protocols/protocols/live365.pat
+#etc/l7-protocols/protocols/lpd.pat
+#etc/l7-protocols/protocols/mohaa.pat
+#etc/l7-protocols/protocols/msn-filetransfer.pat
+#etc/l7-protocols/protocols/msnmessenger.pat
+#etc/l7-protocols/protocols/mute.pat
+#etc/l7-protocols/protocols/napster.pat
+#etc/l7-protocols/protocols/nbns.pat
+#etc/l7-protocols/protocols/ncp.pat
+#etc/l7-protocols/protocols/netbios.pat
+#etc/l7-protocols/protocols/nntp.pat
+#etc/l7-protocols/protocols/ntp.pat
+#etc/l7-protocols/protocols/openft.pat
+#etc/l7-protocols/protocols/pcanywhere.pat
+#etc/l7-protocols/protocols/poco.pat
+#etc/l7-protocols/protocols/pop3.pat
+#etc/l7-protocols/protocols/qq.pat
+#etc/l7-protocols/protocols/quake-halflife.pat
+#etc/l7-protocols/protocols/quake1.pat
+#etc/l7-protocols/protocols/rdp.pat
+#etc/l7-protocols/protocols/rlogin.pat
+#etc/l7-protocols/protocols/rtsp.pat
+#etc/l7-protocols/protocols/shoutcast.pat
+#etc/l7-protocols/protocols/sip.pat
+#etc/l7-protocols/protocols/skypeout.pat
+#etc/l7-protocols/protocols/skypetoskype.pat
+#etc/l7-protocols/protocols/smb.pat
+#etc/l7-protocols/protocols/smtp.pat
+#etc/l7-protocols/protocols/snmp.pat
+#etc/l7-protocols/protocols/socks.pat
+#etc/l7-protocols/protocols/soribada.pat
+#etc/l7-protocols/protocols/soulseek.pat
+#etc/l7-protocols/protocols/ssdp.pat
+#etc/l7-protocols/protocols/ssh.pat
+#etc/l7-protocols/protocols/ssl.pat
+#etc/l7-protocols/protocols/subspace.pat
+#etc/l7-protocols/protocols/subversion.pat
+#etc/l7-protocols/protocols/teamspeak.pat
+#etc/l7-protocols/protocols/telnet.pat
+#etc/l7-protocols/protocols/tesla.pat
+#etc/l7-protocols/protocols/testing.pat
+#etc/l7-protocols/protocols/tftp.pat
+#etc/l7-protocols/protocols/thecircle.pat
+#etc/l7-protocols/protocols/tls.pat
+#etc/l7-protocols/protocols/tsp.pat
+#etc/l7-protocols/protocols/unknown.pat
+#etc/l7-protocols/protocols/uucp.pat
+#etc/l7-protocols/protocols/validcertssl.pat
+#etc/l7-protocols/protocols/ventrilo.pat
+#etc/l7-protocols/protocols/vnc.pat
+#etc/l7-protocols/protocols/whois.pat
+#etc/l7-protocols/protocols/worldofwarcraft.pat
+#etc/l7-protocols/protocols/x11.pat
+#etc/l7-protocols/protocols/xboxlive.pat
+#etc/l7-protocols/protocols/xunlei.pat
+#etc/l7-protocols/protocols/yahoo.pat
+#etc/l7-protocols/protocols/zmaap.pat
+#etc/l7-protocols/testing
+#etc/l7-protocols/testing/Makefile
+#etc/l7-protocols/testing/README
+#etc/l7-protocols/testing/add.sh
+#etc/l7-protocols/testing/data
+#etc/l7-protocols/testing/data/aim-1
+#etc/l7-protocols/testing/data/aim-2
+#etc/l7-protocols/testing/data/aim-3
+#etc/l7-protocols/testing/data/aim-4
+#etc/l7-protocols/testing/data/aim-5
+#etc/l7-protocols/testing/data/aim-6
+#etc/l7-protocols/testing/data/bittorrent-a-1
+#etc/l7-protocols/testing/data/bittorrent-a-2
+#etc/l7-protocols/testing/data/bittorrent-a-3
+#etc/l7-protocols/testing/data/bittorrent-a-4
+#etc/l7-protocols/testing/data/bittorrent-b-1
+#etc/l7-protocols/testing/data/bittorrent-b-2
+#etc/l7-protocols/testing/data/bittorrent-b-3
+#etc/l7-protocols/testing/data/bittorrent-b-4
+#etc/l7-protocols/testing/data/dce-rpc-spam-a-1
+#etc/l7-protocols/testing/data/dce-rpc-spam-b-1
+#etc/l7-protocols/testing/data/dns-1
+#etc/l7-protocols/testing/data/dns-2
+#etc/l7-protocols/testing/data/edonkey-tcp-a-1
+#etc/l7-protocols/testing/data/edonkey-tcp-a-2
+#etc/l7-protocols/testing/data/edonkey-tcp-b-1
+#etc/l7-protocols/testing/data/edonkey-tcp-b-2
+#etc/l7-protocols/testing/data/edonkey-tcp-b-3
+#etc/l7-protocols/testing/data/edonkey-tcp-b-4
+#etc/l7-protocols/testing/data/edonkey-tcp-b-5
+#etc/l7-protocols/testing/data/edonkey-tcp-b-6
+#etc/l7-protocols/testing/data/edonkey-udp-a-1
+#etc/l7-protocols/testing/data/edonkey-udp-b-1
+#etc/l7-protocols/testing/data/ftp-1
+#etc/l7-protocols/testing/data/ftp-2
+#etc/l7-protocols/testing/data/ftp-3
+#etc/l7-protocols/testing/data/ftp-4
+#etc/l7-protocols/testing/data/ftp-5
+#etc/l7-protocols/testing/data/gnutella-1
+#etc/l7-protocols/testing/data/gnutella-2
+#etc/l7-protocols/testing/data/gnutella-3
+#etc/l7-protocols/testing/data/gnutella-connect-1
+#etc/l7-protocols/testing/data/gnutella-connect-2
+#etc/l7-protocols/testing/data/gnutella-udp-a-1
+#etc/l7-protocols/testing/data/gnutella-udp-b-1
+#etc/l7-protocols/testing/data/gnutella-udp-c-1
+#etc/l7-protocols/testing/data/http-digg-304-1
+#etc/l7-protocols/testing/data/http-digg-304-2
+#etc/l7-protocols/testing/data/http-wunderground-1
+#etc/l7-protocols/testing/data/http-wunderground-2
+#etc/l7-protocols/testing/data/imap-1
+#etc/l7-protocols/testing/data/imap-2
+#etc/l7-protocols/testing/data/imap-3
+#etc/l7-protocols/testing/data/imap-4
+#etc/l7-protocols/testing/data/imap-5
+#etc/l7-protocols/testing/data/imap-6
+#etc/l7-protocols/testing/data/ipp-1
+#etc/l7-protocols/testing/data/jabber-1
+#etc/l7-protocols/testing/data/jabber-2
+#etc/l7-protocols/testing/data/jabber-3
+#etc/l7-protocols/testing/data/jabber-4
+#etc/l7-protocols/testing/data/jabber-5
+#etc/l7-protocols/testing/data/jabber-6
+#etc/l7-protocols/testing/data/skypeout-a-1
+#etc/l7-protocols/testing/data/skypeout-a-2
+#etc/l7-protocols/testing/data/skypeout-a-3
+#etc/l7-protocols/testing/data/skypeout-a-4
+#etc/l7-protocols/testing/data/skypeout-a-5
+#etc/l7-protocols/testing/data/skypeout-a-6
+#etc/l7-protocols/testing/data/skypeout-b-1
+#etc/l7-protocols/testing/data/skypeout-b-2
+#etc/l7-protocols/testing/data/skypeout-b-3
+#etc/l7-protocols/testing/data/skypeout-b-4
+#etc/l7-protocols/testing/data/skypeout-b-5
+#etc/l7-protocols/testing/data/skypeout-b-6
+#etc/l7-protocols/testing/data/skypeout-b-7
+#etc/l7-protocols/testing/data/skypeout-b-8
+#etc/l7-protocols/testing/data/skypeout-b-9
+#etc/l7-protocols/testing/data/skypeout-c-1
+#etc/l7-protocols/testing/data/skypeout-c-2
+#etc/l7-protocols/testing/data/skypeout-c-3
+#etc/l7-protocols/testing/data/skypeout-c-4
+#etc/l7-protocols/testing/data/skypeout-c-5
+#etc/l7-protocols/testing/data/skypeout-c-6
+#etc/l7-protocols/testing/data/skypeout-c-7
+#etc/l7-protocols/testing/data/skypeout-c-8
+#etc/l7-protocols/testing/data/skypeout-c-9
+#etc/l7-protocols/testing/data/ssdp-1
+#etc/l7-protocols/testing/data/ssh-1
+#etc/l7-protocols/testing/data/ssh-2
+#etc/l7-protocols/testing/data/ssh-3
+#etc/l7-protocols/testing/data/ssh-4
+#etc/l7-protocols/testing/data/ssh-5
+#etc/l7-protocols/testing/data/ssh-6
+#etc/l7-protocols/testing/data/validcertssl-1
+#etc/l7-protocols/testing/data/validcertssl-2
+#etc/l7-protocols/testing/data/validcertssl-3
+#etc/l7-protocols/testing/data/validcertssl-4
+#etc/l7-protocols/testing/data/validcertssl-5
+#etc/l7-protocols/testing/data/validcertssl-6
+#etc/l7-protocols/testing/data/winmx-1
+#etc/l7-protocols/testing/data/winmx-2
+#etc/l7-protocols/testing/data/winmx-3
+#etc/l7-protocols/testing/data/x11-1
+#etc/l7-protocols/testing/data/x11-2
+#etc/l7-protocols/testing/data/x11-3
+#etc/l7-protocols/testing/data/x11-4
+#etc/l7-protocols/testing/data/x11-5
+#etc/l7-protocols/testing/data/yahoo-1
+#etc/l7-protocols/testing/data/yahoo-2
+#etc/l7-protocols/testing/data/yahoo-3
+#etc/l7-protocols/testing/data/yahoo-4
+#etc/l7-protocols/testing/match.c
+#etc/l7-protocols/testing/randchars.c
+#etc/l7-protocols/testing/randprintable.c
+#etc/l7-protocols/testing/regexp
+#etc/l7-protocols/testing/regexp/regerror.c
+#etc/l7-protocols/testing/regexp/regexp.c
+#etc/l7-protocols/testing/regexp/regexp.h
+#etc/l7-protocols/testing/regexp/regmagic.h
+#etc/l7-protocols/testing/regexp/regsub.c
+#etc/l7-protocols/testing/test_match.sh
+#etc/l7-protocols/testing/test_speed.c
+#etc/l7-protocols/testing/timeit.sh

config/rootfiles/common/mbmon

@@ -0,0 +1,2 @@
+usr/bin/mbmon
+#usr/man/man1/mbmon.1

config/rootfiles/common/yasuc

@@ -0,0 +1 @@
+usr/bin/yasuc

config/uClibc/buildroot.config-i586

@@ -60,7 +60,7 @@ BR2_DEFAULT_KERNEL_HEADERS="2.6.12"
 # uClibc Options
 #
 # BR2_UCLIBC_VERSION_SNAPSHOT is not set
-# BR2_ENABLE_LOCALE is not set
+BR2_ENABLE_LOCALE=y
 # BR2_PTHREADS_NONE is not set
 # BR2_PTHREADS is not set
 BR2_PTHREADS_OLD=y
@@ -107,8 +107,7 @@ BR2_GCC_VERSION_4_0_3=y
 BR2_GCC_VERSION="4.0.3"
 # BR2_GCC_USE_SJLJ_EXCEPTIONS is not set
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""
-BR2_INSTALL_LIBSTDCPP=y
-# BR2_INSTALL_LIBGCJ is not set
+# BR2_INSTALL_LIBSTDCPP is not set
 # BR2_INSTALL_OBJC is not set
 BR2_GCC_SHARED_LIBGCC=y
 

config/uClibc/locales.txt

@@ -4,4 +4,5 @@
 UTF-8 yes
 8-BIT yes
 #---------------------------------------------------------------------------
+en_US ISO-8859-1
 en_US.UTF-8 UTF-8

config/uClibc/uClibc.config-i586

@@ -52,7 +52,7 @@ ARCH_HAS_MMU=y
 UCLIBC_HAS_FLOATS=y
 HAS_FPU=y
 DO_C99_MATH=y
-KERNEL_SOURCE="/usr/src/buildroot/toolchain_build_i586/linux"
+KERNEL_SOURCE="/usr"
 C_SYMBOL_PREFIX=""
 HAVE_DOT_CONFIG=y
 
@@ -112,7 +112,7 @@ UCLIBC_HAS_WCHAR=y
 UCLIBC_HAS_LOCALE=y
 UCLIBC_PREGENERATED_LOCALE_DATA=y
 # UCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA is not set
-# UCLIBC_HAS_XLOCALE is not set
+UCLIBC_HAS_XLOCALE=y
 # UCLIBC_HAS_HEXADECIMAL_FLOATS is not set
 # UCLIBC_HAS_GLIBC_DIGIT_GROUPING is not set
 UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
@@ -165,7 +165,7 @@ DEVEL_PREFIX="/usr/"
 #
 # uClibc development/debugging options
 #
-CROSS_COMPILER_PREFIX="/opt/i586-uClibc/bin/i586-linux-uclibc-"
+CROSS_COMPILER_PREFIX=""
 # DODEBUG is not set
 # DODEBUG_PT is not set
 # DOASSERTS is not set

doc/packages-list.txt

@@ -75,6 +75,8 @@
 * fwhits
 * gawk-3.1.5
 * gcc-4.0.3
+* gcc-4.0.3-install1
+* gcc-4.0.3-install2
 * gd-2.0.33
 * gdbm-1.8.3
 * gettext-0.14.5
@@ -217,7 +219,9 @@
 * tftp-hpa-0.42
 * tiff-3.8.2
 * traceroute-1.4a12
-* uClibc-0.9.28
+* uClibc-0.9.28-pass1
+* uClibc-0.9.28-pass2
+* uClibc-0.9.28-pass3
 * udev-096
 * unzip552
 * util-linux-2.12r

lfs/binutils

@@ -36,10 +36,18 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 # Normal build or /tools build.
 #
 ifeq "$(ROOT)" ""
+ifeq "$(LFS_PASS)" "install"
+  TARGET = $(DIR_INFO)/$(THISAPP)-install
+  EXTRA_CONFIG = --target=$(MACHINE)-linux-uclibc --prefix=/opt/$(MACHINE)-uClibc --disable-nls \
+			--with-sysroot=/opt/$(MACHINE)-uClibc/$(MACHINE)-linux-uclibc
+  EXTRA_MAKE =
+  EXTRA_INSTALL =
+else
   TARGET = $(DIR_INFO)/$(THISAPP)
   EXTRA_CONFIG = --prefix=/usr --enable-shared --disable-nls
   EXTRA_MAKE = tooldir=/usr
   EXTRA_INSTALL = tooldir=/usr
+endif
 else
 ifeq "$(PASS)" "1"
   TARGET = $(DIR_INFO)/$(THISAPP)-tools1
@@ -93,6 +101,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) $(DIR_SRC)/binutils-build && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
 	@mkdir $(DIR_SRC)/binutils-build
+ifeq "$(LFS_PASS)" "install"
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/binutils-uclibc-conf.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/binutils-uclibc-libtool-conf.patch
+endif
 	cd $(DIR_SRC)/binutils-build && $(DIR_APP)/configure $(EXTRA_CONFIG)
 ifeq "$(PASS)" "1"
 	cd $(DIR_SRC)/binutils-build && make configure-host
@@ -100,7 +112,9 @@ endif
 	cd $(DIR_SRC)/binutils-build && make $(EXTRA_MAKE) $(MAKETUNING)
 	cd $(DIR_SRC)/binutils-build && make $(EXTRA_INSTALL) install
 ifeq "$(ROOT)" ""
+ifneq "$(LFS_PASS)" "install"
 	cp -v $(DIR_APP)/include/libiberty.h /usr/include
+endif
 else
 ifeq "$(PASS)" "1"
 	cd $(DIR_SRC)/binutils-build && make -C ld clean

lfs/gcc

@@ -38,6 +38,28 @@ CXXFLAGS   =
 # Normal build or /tools build.
 #
 ifeq "$(ROOT)" ""
+ifeq "$(INST)" "1"
+  TARGET = $(DIR_INFO)/$(THISAPP)-install1
+  EXTRA_CONFIG = --target=$(MACHINE)-linux-uclibc --prefix=/opt/$(MACHINE)-uClibc \
+	--with-local-prefix=/opt/$(MACHINE)-uClibc/$(MACHINE)-linux-uclibc --with-newlib \
+	--with-sysroot=/opt/$(MACHINE)-uClibc --disable-nls \
+	--enable-threads=no --enable-symvers=gnu \
+	--disable-__cxa_atexit --enable-languages=c \
+	--disable-shared --with-gnu-as --with-gnu-ld \
+	--without-headers
+else
+ifeq "$(INST)" "2"
+  TARGET = $(DIR_INFO)/$(THISAPP)-install2
+  EXTRA_CONFIG = --target=$(MACHINE)-linux-uclibc --prefix=/opt/$(MACHINE)-uClibc \
+	--with-local-prefix=/opt/$(MACHINE)-uClibc/$(MACHINE)-linux-uclibc \
+	--with-sysroot=/opt/$(MACHINE)-uClibc \
+	--disable-nls \
+	--enable-threads=posix --enable-symvers=gnu \
+	--disable-__cxa_atexit --enable-languages=c,c++ \
+	--enable-c99 --enable-long-long --with-gnu-as \
+	--with-gnu-ld --enable-shared --enable-clocale \
+	--enable-target-optspace
+else
   TARGET = $(DIR_INFO)/$(THISAPP)
   EXTRA_CONFIG = --prefix=/usr \
     --libexecdir=/usr/lib --enable-shared \
@@ -46,6 +68,8 @@ ifeq "$(ROOT)" ""
     --disable-nls
   EXTRA_MAKE =
   EXTRA_INSTALL =
+endif
+endif
 else
 ifeq "$(PASS)" "1"
   TARGET = $(DIR_INFO)/$(THISAPP)-tools1
@@ -105,6 +129,22 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@rm -rf $(DIR_APP) $(DIR_SRC)/gcc-build && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
 	@mkdir $(DIR_SRC)/gcc-build
 ifeq "$(ROOT)" ""
+ifeq "$(INST)" "1"
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/gcc-uclibc-conf.patch
+	cd $(DIR_SRC)/gcc-build && $(DIR_APP)/configure $(EXTRA_CONFIG)
+override PATH = /opt/$(MACHINE)-uClibc/bin:/usr/local/bin:/bin:/usr/bin:/sbin:/usr/sbin
+	cd $(DIR_SRC)/gcc-build && make all-gcc install-gcc
+else
+ifeq "$(INST)" "2"
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/gcc-uclibc-conf.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/gcc-uclibc-locale.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/gcc-libstdc++-pic.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/gcc-sdk-libstdc++-includes.patch
+	cd $(DIR_SRC)/gcc-build && $(DIR_APP)/configure $(EXTRA_CONFIG)
+	cd $(DIR_SRC)/gcc-build && make all install
+	cp -f /opt/$(MACHINE)-uClibc/lib/libgcc_s.so /lib
+	cd /lib && ln -sf libgcc_s.so libgcc_s.so.1
+else
 	cd $(DIR_APP) && sed -i 's/install_to_$$(INSTALL_DEST) //' libiberty/Makefile.in
 	cd $(DIR_APP) && sed -i 's/^XCFLAGS =$$/& -fomit-frame-pointer/' gcc/Makefile.in
 	cd $(DIR_APP) && sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
@@ -115,6 +155,8 @@ ifeq "$(ROOT)" ""
 	cd $(DIR_SRC)/gcc-build && make $(EXTRA_INSTALL) install
 	ln -sfv ../usr/bin/cpp /lib
 	ln -sfv gcc /usr/bin/cc
+endif
+endif
 else
 ifeq "$(PASS)" "1"
 	cd $(DIR_SRC)/gcc-build && $(DIR_APP)/configure $(EXTRA_CONFIG)

lfs/kudzu

@@ -78,7 +78,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
 ifeq "$(LFS_PASS)" "install"
 	cd $(DIR_APP) && patch -N < $(DIR_SRC)/src/patches/kudzu-link-lintl.diff
-	cd $(DIR_APP) && make RPM_OPT_FLAGS="-Os -fomit-frame-pointer -I/install/include" \
+	cd $(DIR_APP) && make RPM_OPT_FLAGS="-Os -fomit-frame-pointer -I/opt/$(MACHINE)-uClibc/include" \
 		ARCH=$(MACHINE)
 	cd $(DIR_APP) && install -m 0755 kudzu /install/initrd/bin/kudzu
 	cd $(DIR_APP) && install -m 0644 libkudzu.a /install/initrd/lib

lfs/linux-libc-header

@@ -34,7 +34,11 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
 ifeq "$(ROOT)" ""
+ifeq "$(LFS_PASS)" "install"
+  TARGET = $(DIR_INFO)/$(THISAPP)-install
+else
   TARGET = $(DIR_INFO)/$(THISAPP)
+endif
 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools1
 endif
@@ -77,6 +81,16 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
 ifeq "$(ROOT)" ""
+ifeq "$(LFS_PASS)" "install"
+	-mkdir -p /opt/$(MACHINE)-uClibc
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-inotify-3.patch
+	cd $(DIR_APP) && install -dv /opt/$(MACHINE)-uClibc/usr/include/asm
+	cd $(DIR_APP) && cp -Rv include/asm-i386/* /opt/$(MACHINE)-uClibc/usr/include/asm
+	cd $(DIR_APP) && cp -Rv include/linux /opt/$(MACHINE)-uClibc/usr/include
+	cd $(DIR_APP) && chown -Rv root:root /opt/$(MACHINE)-uClibc/usr/include/{asm,linux}
+	cd $(DIR_APP) && find /opt/$(MACHINE)-uClibc/usr/include/{asm,linux} -type d -exec chmod -v 755 {} \;
+	cd $(DIR_APP) && find /opt/$(MACHINE)-uClibc/usr/include/{asm,linux} -type f -exec chmod -v 644 {} \;
+else
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-inotify-3.patch
 	cd $(DIR_APP) && install -dv /usr/include/asm
 	cd $(DIR_APP) && cp -Rv include/asm-i386/* /usr/include/asm
@@ -84,6 +98,7 @@ ifeq "$(ROOT)" ""
 	cd $(DIR_APP) && chown -Rv root:root /usr/include/{asm,linux}
 	cd $(DIR_APP) && find /usr/include/{asm,linux} -type d -exec chmod -v 755 {} \;
 	cd $(DIR_APP) && find /usr/include/{asm,linux} -type f -exec chmod -v 644 {} \;
+endif
 else
 	cd $(DIR_APP) && cp -Rv include/asm-i386 /tools/include/asm
 	cd $(DIR_APP) && cp -Rv include/linux /tools/include

lfs/newt

@@ -83,7 +83,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/newt-0.50.17-vaend.patch
 ifeq "$(LFS_PASS)" "install"
 	cd $(DIR_APP) && ./configure --without-gpm-support --host $(MACHINE)-uclibc
-	cd $(DIR_APP) && sed -i 's%^CFLAGS.*$$%CFLAGS = -Os -fomit-frame-pointer -Wall -D_GNU_SOURCE -DUTF8 -I/install/include/slang%' Makefile
+	cd $(DIR_APP) && sed -i 's%^CFLAGS.*$$%CFLAGS = -Os -fomit-frame-pointer -Wall -D_GNU_SOURCE -DUTF8 -I/opt/i586-uClibc/include%' Makefile
 	cd $(DIR_APP) && make libnewt.a
 	-mkdir -p /opt/$(MACHINE)-uClibc/{include,lib}
 	cd $(DIR_APP) && install -m 0644 libnewt.a /opt/$(MACHINE)-uClibc/lib/libnewt.a

lfs/pxe

@@ -57,7 +57,7 @@ $(TARGET) :
 	cp $(DIR_SRC)/config/syslinux/options.msg   /tmp/$(VERSION)/options.msg
 	cp $(DIR_SRC)/config/syslinux/splash.lss    /tmp/$(VERSION)/splash.lss
 	cp /usr/lib/memtest86+/memtest.bin          /tmp/$(VERSION)/memtest
-	sed	-e "a|splash.lss|$(VERSION)/splash.lss|" \
+	sed	-e "s|splash.lss|$(VERSION)/splash.lss|"   \
 			$(DIR_SRC)/config/syslinux/boot.msg \
 			> /tmp/$(VERSION)/boot.msg
 	sed	-e "s|vmlinuz|$(VERSION)/vmlinuz|"   \

lfs/uClibc

@@ -32,7 +32,17 @@ THISAPP    = uClibc-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
+ifeq "$(PASS)" "1"
+	TARGET     = $(DIR_INFO)/$(THISAPP)-pass1
+else
+ifeq "$(PASS)" "2"
+	TARGET     = $(DIR_INFO)/$(THISAPP)-pass2
+else
+	TARGET     = $(DIR_INFO)/$(THISAPP)-pass3
+endif
+endif
+
+STAGING_DIR=/opt/$(MACHINE)-uClibc
 
 ###############################################################################
 # Top-level Rules
@@ -75,33 +85,36 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) /opt/$(MACHINE)-uClibc $(DIR_SRC)/buildroot
-	@cd $(DIR_SRC) && tar xfj $(DIR_DL)/buildroot-snapshot-20061026.tar.bz2
-	mkdir -p $(DIR_SRC)/buildroot/toolchain_build_$(MACHINE)/$(THISAPP)/extra/locale/
-	cp -f $(DIR_DL)/uClibc-locale-030818.tgz \
-		$(DIR_SRC)/buildroot/toolchain_build_$(MACHINE)/$(THISAPP)/extra/locale/
-	cp -f $(DIR_SRC)/config/uClibc/uClibc.config-$(MACHINE) $(DIR_SRC)/buildroot/toolchain/uClibc/uClibc.config
-	cp -f $(DIR_SRC)/config/uClibc/buildroot.config-$(MACHINE) $(DIR_SRC)/buildroot/.config
-	cp -f $(DIR_SRC)/config/uClibc/buildroot.config.cmd $(DIR_SRC)/buildroot/.config.cmd
-	cd $(DIR_SRC)/buildroot && make
-
-	# Generate locales
-	cp -f $(DIR_SRC)/config/uClibc/{locales,codesets}.txt $(DIR_SRC)/buildroot/toolchain_build_$(MACHINE)/$(THISAPP)/extra/locale
-	cd $(DIR_SRC)/buildroot/toolchain_build_$(MACHINE)/$(THISAPP)/extra/locale && patch -Np3 < $(DIR_SRC)/src/patches/uClibc-gcc4-genwctype.patch
-	cd $(DIR_SRC)/buildroot/toolchain_build_$(MACHINE)/$(THISAPP)/extra/locale && make
-
-#	cd $(DIR_SRC)/buildroot && make # This a second pass to install the locales
-	-mkdir -p /install/initrd/bin
-	cd $(DIR_SRC)/buildroot/toolchain_build_$(MACHINE)/$(THISAPP) && make RUNTIME_PREFIX=/install/initrd/ install_runtime
-
-	chmod 755 /install/initrd/lib/libuClibc-$(VER).so
-	rm -f /install/initrd/lib/{libm*,libcrypt*,libutil*,librt*}
-	cp -f /opt/$(MACHINE)-uClibc/lib/libgcc_s.so /lib
+ifeq "$(PASS)" "1"
+	@rm -rf $(DIR_APP)
+	@mkdir -p /opt/$(MACHINE)-uClibc
+	@cd $(DIR_SRC) && tar xfj $(DIR_DL)/$(DL_FILE)
+	cp -f $(DIR_DL)/uClibc-locale-030818.tgz $(DIR_APP)/extra/locale/
+	cp -f $(DIR_SRC)/config/uClibc/{locales,codesets}.txt $(DIR_APP)/extra/locale
+	cd $(DIR_APP)/extra/locale && patch -Np3 < $(DIR_SRC)/src/patches/uClibc-gcc4-genwctype.patch
+	cp -f $(DIR_SRC)/config/uClibc/uClibc.config-$(MACHINE) $(DIR_APP)/.config
+	cd $(DIR_APP) && make CROSS= PREFIX=$(STAGING_DIR) oldconfig
+	cd $(DIR_APP) && make CROSS= PREFIX=$(STAGING_DIR) pregen headers install_dev
+#	cd $(DIR_APP)/extra/locale && make
+else
+ifeq "$(PASS)" "2"
+	cd $(DIR_APP) && CROSS=$(MACHINE)-linux-uclibc- PREFIX=/opt/$(MACHINE)-uClibc make all install
 	cp -f /opt/$(MACHINE)-uClibc/lib/ld-uClibc-$(VER).so /lib
 	cp -f /opt/$(MACHINE)-uClibc/lib/libuClibc-$(VER).so /lib
-	cd /lib && ln -sf libgcc_s.so libgcc_s.so.1
 	cd /lib && ln -sf ld-uClibc-$(VER).so ld-uClibc.so.0
 	cd /lib && ln -sf libuClibc-$(VER).so libc.so.0
 	cd /lib && ln -sf libc.so.0 libc.so
-	@rm -rf $(DIR_APP) $(DIR_SRC)/buildroot
+	ln -sf /opt/$(MACHINE)-uClibc/lib/libm-$(VER).so /lib/libm.so.0
+else
+	cd /opt/$(MACHINE)-uClibc/bin && for i in `ls -w1 $(MACHINE)-linux-uclibc-*`; do \
+		ln -sf $$i $(MACHINE)-linux-`echo $$i | cut -c 19-`; \
+	done
+	ln -sf $(MACHINE)-linux-uclibc /opt/$(MACHINE)-uClibc/$(MACHINE)-linux
+	ln -sf gcc /opt/$(MACHINE)-uClibc/$(MACHINE)-linux-uclibc/bin/cc
+	cd $(DIR_APP) && make RUNTIME_PREFIX=/install/initrd/ install_runtime
+	chmod 755 /install/initrd/lib/libuClibc-$(VER).so
+	rm -f /install/initrd/lib/{libm*,libcrypt*,libutil*,librt*}
+	@rm -rf $(DIR_APP)
+endif
+endif
 	@$(POSTBUILD)

lfs/util-linux

@@ -87,7 +87,7 @@ ifeq "$(ROOT)" ""
 ifeq "$(LFS_PASS)" "install"
 	cd $(DIR_APP) && CFLAGS="-Os -fomit-frame-pointer" ./configure
 	cd $(DIR_APP) && echo "HAVE_SLANG=yes" >> make_include
-	cd $(DIR_APP) && echo "SLANGFLAGS=-I/opt/$(MACHINE)-uClibc/include/slang" >> make_include
+	cd $(DIR_APP) && echo "SLANGFLAGS=-I/opt/$(MACHINE)-uClibc/include" >> make_include
 	cd $(DIR_APP)/fdisk && make cfdisk
 	cd $(DIR_APP)/fdisk && make sfdisk
 	cd $(DIR_APP)/fdisk && install -m 0755 cfdisk /install/initrd/bin

make.sh

@@ -549,7 +549,13 @@ buildinstaller() {
   export LOGFILE
   ipfiremake syslinux
   ipfiremake memtest
-  ipfiremake uClibc
+  installmake linux-libc-header
+  installmake binutils
+  ipfiremake uClibc			PASS=1
+  ipfiremake gcc			INST=1
+  installmake uClibc			PASS=2
+  installmake gcc			INST=2
+  installmake uClibc			PASS=3
   installmake busybox
   installmake udev
   installmake slang

src/install+setup/install/Makefile

@@ -4,7 +4,7 @@
 
 CC      = gcc 
 CFLAGS  = -Os -Wall
-INCLUDE = -I/install/include
+INCLUDE = -I/opt/i586-uClibc/include
 
 LD      = gcc
 LDFLAGS = -L/install/lib

src/install+setup/libsmooth/Makefile

@@ -4,7 +4,7 @@
 
 CC      = gcc
 CFLAGS  = -O2 -Wall
-INCLUDE = -I/install/include
+INCLUDE = -I/opt/i586-uClibc/include
 
 LD      = ld
 LDFLAGS = -i

src/patches/binutils-uclibc-conf.patch

@@ -0,0 +1,586 @@
+diff -ur binutils-2.15.97.orig/bfd/config.bfd binutils-2.15.97/bfd/config.bfd
+--- binutils-2.15.97.orig/bfd/config.bfd	2005-04-29 20:48:14.000000000 -0400
++++ binutils-2.15.97/bfd/config.bfd	2005-04-29 20:53:50.000000000 -0400
+@@ -140,7 +140,7 @@
+     targ_defvec=ecoffalpha_little_vec
+     targ_selvecs=bfd_elf64_alpha_vec
+     ;;
+-  alpha*-*-linux-gnu* | alpha*-*-elf*)
++  alpha*-*-linux-* | alpha*-*-elf*)
+     targ_defvec=bfd_elf64_alpha_vec
+     targ_selvecs=ecoffalpha_little_vec
+     ;;
+@@ -150,7 +150,7 @@
+   alpha*-*-*)
+     targ_defvec=ecoffalpha_little_vec
+     ;;
+-  ia64*-*-freebsd* | ia64*-*-netbsd* | ia64*-*-linux-gnu* | ia64*-*-elf* | ia64*-*-kfreebsd*-gnu)
++  ia64*-*-freebsd* | ia64*-*-netbsd* | ia64*-*-linux-* | ia64*-*-elf* | ia64*-*-kfreebsd*-gnu)
+     targ_defvec=bfd_elf64_ia64_little_vec
+     targ_selvecs="bfd_elf64_ia64_big_vec bfd_efi_app_ia64_vec"
+     ;;
+@@ -227,7 +227,7 @@
+     targ_defvec=bfd_elf32_littlearm_vec
+     targ_selvecs=bfd_elf32_bigarm_vec
+     ;;
+-  armeb-*-elf | arm*b-*-linux-gnu*)
++  armeb-*-elf | arm*b-*-linux-*)
+     targ_defvec=bfd_elf32_bigarm_vec
+     targ_selvecs=bfd_elf32_littlearm_vec
+     ;;
+@@ -235,7 +235,7 @@
+     targ_defvec=bfd_elf32_littlearm_vec
+     targ_selvecs=bfd_elf32_bigarm_vec
+     ;;
+-  arm-*-elf | arm-*-freebsd* | arm*-*-linux-gnu* | arm*-*-conix* | \
++  arm-*-elf | arm-*-freebsd* | arm*-*-linux-* | arm*-*-conix* | \
+   arm*-*-uclinux* | arm-*-kfreebsd*-gnu | \
+   arm*-*-eabi* )
+     targ_defvec=bfd_elf32_littlearm_vec
+@@ -385,7 +385,7 @@
+     ;;
+ 
+ #ifdef BFD64
+-  hppa*64*-*-linux-gnu*)
++  hppa*64*-*-linux-*)
+     targ_defvec=bfd_elf64_hppa_linux_vec
+     targ_selvecs=bfd_elf64_hppa_vec
+     ;;
+@@ -396,7 +396,7 @@
+     ;;
+ #endif
+ 
+-  hppa*-*-linux-gnu*)
++  hppa*-*-linux-*)
+     targ_defvec=bfd_elf32_hppa_linux_vec
+     targ_selvecs=bfd_elf32_hppa_vec
+     ;;
+@@ -529,7 +529,7 @@
+     targ_selvecs=bfd_elf32_i386_vec
+     targ_underscore=yes
+     ;;
+-  i[3-7]86-*-linux-gnu*)
++  i[3-7]86-*-linux-*)
+     targ_defvec=bfd_elf32_i386_vec
+     targ_selvecs="i386linux_vec bfd_efi_app_ia32_vec"
+     targ64_selvecs=bfd_elf64_x86_64_vec
+@@ -543,7 +543,7 @@
+     targ_defvec=bfd_elf64_x86_64_vec
+     targ_selvecs="bfd_elf32_i386_vec i386netbsd_vec i386coff_vec bfd_efi_app_ia32_vec"
+     ;;
+-  x86_64-*-linux-gnu*)
++  x86_64-*-linux-*)
+     targ_defvec=bfd_elf64_x86_64_vec
+     targ_selvecs="bfd_elf32_i386_vec i386linux_vec bfd_efi_app_ia32_vec"
+     ;;
+@@ -719,7 +719,7 @@
+     targ_selvecs=bfd_elf32_m68k_vec
+     targ_underscore=yes
+     ;;
+-  m68*-*-linux-gnu*)
++  m68*-*-linux-*)
+     targ_defvec=bfd_elf32_m68k_vec
+     targ_selvecs=m68klinux_vec
+     ;;
+@@ -1005,7 +1005,7 @@
+     ;;
+ #endif
+   powerpc-*-*bsd* | powerpc-*-elf* | powerpc-*-sysv4* | powerpc-*-eabi* | \
+-  powerpc-*-solaris2* | powerpc-*-linux-gnu* | powerpc-*-rtems* | \
++  powerpc-*-solaris2* | powerpc-*-linux-* | powerpc-*-rtems* | \
+   powerpc-*-chorus* | powerpc-*-vxworks* | powerpc-*-windiss*)
+     targ_defvec=bfd_elf32_powerpc_vec
+     targ_selvecs="rs6000coff_vec bfd_elf32_powerpcle_vec ppcboot_vec"
+@@ -1042,7 +1042,7 @@
+     targ_selvecs="rs6000coff_vec bfd_elf32_powerpc_vec ppcboot_vec"
+     ;;
+   powerpcle-*-elf* | powerpcle-*-sysv4* | powerpcle-*-eabi* | \
+-  powerpcle-*-solaris2* | powerpcle-*-linux-gnu* | powerpcle-*-vxworks* |\
++  powerpcle-*-solaris2* | powerpcle-*-linux-* | powerpcle-*-vxworks* |\
+   powerpcle-*-rtems*)
+     targ_defvec=bfd_elf32_powerpcle_vec
+     targ_selvecs="rs6000coff_vec bfd_elf32_powerpc_vec ppcboot_vec"
+@@ -1213,7 +1213,7 @@
+     targ_selvecs="bfd_elf32_sparc_vec sunos_big_vec"
+     targ_underscore=yes
+     ;;
+-  sparc-*-linux-gnu*)
++  sparc-*-linux-*)
+     targ_defvec=bfd_elf32_sparc_vec
+     targ_selvecs="sparclinux_vec bfd_elf64_sparc_vec sunos_big_vec"
+     ;;
+@@ -1260,7 +1260,7 @@
+     targ_defvec=sunos_big_vec
+     targ_underscore=yes
+     ;;
+-  sparc64-*-linux-gnu*)
++  sparc64-*-linux-*)
+     targ_defvec=bfd_elf64_sparc_vec
+     targ_selvecs="bfd_elf32_sparc_vec sparclinux_vec sunos_big_vec"
+     ;;
+@@ -1329,7 +1329,7 @@
+     targ_underscore=yes
+     ;;
+ 
+-  vax-*-linux-gnu*)
++  vax-*-linux-*)
+     targ_defvec=bfd_elf32_vax_vec
+     ;;
+ 
+diff -ur binutils-2.15.97.orig/bfd/configure binutils-2.15.97/bfd/configure
+--- binutils-2.15.97.orig/bfd/configure	2005-04-29 20:48:14.000000000 -0400
++++ binutils-2.15.97/bfd/configure	2005-04-29 20:53:50.000000000 -0400
+@@ -9918,7 +9918,7 @@
+   alpha*-*-freebsd* | alpha*-*-kfreebsd*-gnu)
+ 	COREFILE=''
+ 	;;
+-  alpha*-*-linux-gnu*)
++  alpha*-*-linux-*)
+ 	COREFILE=trad-core.lo
+ 	TRAD_HEADER='"hosts/alphalinux.h"'
+ 	;;
+@@ -9982,7 +9982,7 @@
+ 	COREFILE=trad-core.lo
+ 	TRAD_HEADER='"hosts/i386mach3.h"'
+ 	;;
+-  i[3-7]86-*-linux-gnu*)
++  i[3-7]86-*-linux-*)
+ 	COREFILE=trad-core.lo
+ 	TRAD_HEADER='"hosts/i386linux.h"'
+ 	;;
+@@ -10020,7 +10020,7 @@
+ 	COREFILE=trad-core.lo
+ 	TRAD_HEADER='"hosts/hp300bsd.h"'
+ 	;;
+-  m68*-*-linux-gnu*)
++  m68*-*-linux-*)
+ 	COREFILE=trad-core.lo
+ 	TRAD_HEADER='"hosts/m68klinux.h"'
+ 	;;
+@@ -10154,7 +10154,7 @@
+ 	COREFILE=trad-core.lo
+ 	TRAD_HEADER='"hosts/vaxult2.h"'
+ 	;;
+-  vax-*-linux-gnu*)
++  vax-*-linux-*)
+ 	COREFILE=trad-core.lo
+ 	TRAD_HEADER='"hosts/vaxlinux.h"'
+ 	;;
+diff -ur binutils-2.15.97.orig/bfd/configure.in binutils-2.15.97/bfd/configure.in
+--- binutils-2.15.97.orig/bfd/configure.in	2005-04-29 20:48:14.000000000 -0400
++++ binutils-2.15.97/bfd/configure.in	2005-04-29 20:53:50.000000000 -0400
+@@ -163,7 +163,7 @@
+   alpha*-*-freebsd* | alpha*-*-kfreebsd*-gnu)
+ 	COREFILE=''
+ 	;;
+-  alpha*-*-linux-gnu*)
++  alpha*-*-linux-*)
+ 	COREFILE=trad-core.lo
+ 	TRAD_HEADER='"hosts/alphalinux.h"'
+ 	;;
+@@ -248,7 +248,7 @@
+ 	TRAD_HEADER='"hosts/i386mach3.h"'
+ 	;;
+ changequote(,)dnl
+-  i[3-7]86-*-linux-gnu*)
++  i[3-7]86-*-linux-*)
+ changequote([,])dnl
+ 	COREFILE=trad-core.lo
+ 	TRAD_HEADER='"hosts/i386linux.h"'
+@@ -289,7 +289,7 @@
+ 	COREFILE=trad-core.lo
+ 	TRAD_HEADER='"hosts/hp300bsd.h"'
+ 	;;
+-  m68*-*-linux-gnu*)
++  m68*-*-linux-*)
+ 	COREFILE=trad-core.lo
+ 	TRAD_HEADER='"hosts/m68klinux.h"'
+ 	;;
+@@ -375,7 +375,7 @@
+ 	COREFILE=trad-core.lo
+ 	TRAD_HEADER='"hosts/vaxult2.h"'
+ 	;;
+-  vax-*-linux-gnu*)
++  vax-*-linux-*)
+ 	COREFILE=trad-core.lo
+ 	TRAD_HEADER='"hosts/vaxlinux.h"'
+ 	;;
+diff -ur binutils-2.15.97.orig/gas/configure binutils-2.15.97/gas/configure
+--- binutils-2.15.97.orig/gas/configure	2005-04-29 20:48:14.000000000 -0400
++++ binutils-2.15.97/gas/configure	2005-04-29 20:53:50.000000000 -0400
+@@ -4462,7 +4462,7 @@
+ _ACEOF
+ 
+ 	;;
+-      ppc-*-linux-gnu*)
++      ppc-*-linux-*)
+ 	case "$endian" in
+ 	  big)  ;;
+ 	  *)    { { echo "$as_me:$LINENO: error: GNU/Linux must be configured big endian" >&5
+diff -ur binutils-2.15.97.orig/gas/configure.in binutils-2.15.97/gas/configure.in
+--- binutils-2.15.97.orig/gas/configure.in	2005-04-29 20:48:14.000000000 -0400
++++ binutils-2.15.97/gas/configure.in	2005-04-29 20:53:50.000000000 -0400
+@@ -161,7 +161,7 @@
+ 	AC_DEFINE(AIX_WEAK_SUPPORT, 1,
+ 		  [Define if using AIX 5.2 value for C_WEAKEXT.])
+ 	;;
+-      ppc-*-linux-gnu*)
++      ppc-*-linux-*)
+ 	case "$endian" in
+ 	  big)  ;;
+ 	  *)    AC_MSG_ERROR(GNU/Linux must be configured big endian) ;;
+diff -ur binutils-2.15.97.orig/gas/configure.tgt binutils-2.15.97/gas/configure.tgt
+--- binutils-2.15.97.orig/gas/configure.tgt	2005-04-29 20:48:14.000000000 -0400
++++ binutils-2.15.97/gas/configure.tgt	2005-04-29 20:53:50.000000000 -0400
+@@ -100,7 +100,7 @@
+   alpha-*-*vms*)			fmt=evax ;;
+   alpha-*-osf*)				fmt=ecoff ;;
+   alpha-*-linuxecoff*)			fmt=ecoff ;;
+-  alpha-*-linux-gnu*)			fmt=elf em=linux ;;
++  alpha-*-linux-*)			fmt=elf em=linux ;;
+   alpha-*-netbsd*)			fmt=elf em=nbsd ;;
+   alpha-*-openbsd*)			fmt=elf em=obsd ;;
+ 
+@@ -116,7 +116,7 @@
+   arm-*-conix*)				fmt=elf ;;
+   arm-*-linux*aout*)			fmt=aout em=linux ;;
+   arm-*-linux-gnueabi*)			fmt=elf  em=armlinuxeabi ;;	 
+-  arm-*-linux-gnu*)			fmt=elf  em=linux ;;
++  arm-*-linux-*)			fmt=elf  em=linux ;;
+   arm-*-uclinux*)			fmt=elf  em=linux ;;
+   arm-*-netbsdelf*)                 	fmt=elf  em=nbsd ;;
+   arm-*-*n*bsd*)			fmt=aout em=nbsd ;;
+@@ -128,7 +128,7 @@
+ 
+   avr-*-*)				fmt=elf ;;
+ 
+-  cris-*-linux-gnu* | crisv32-*-linux-gnu*)
++  cris-*-linux-* | crisv32-*-linux-*)
+ 					fmt=multi bfd_gas=yes em=linux ;;
+   cris-*-* | crisv32-*-*)		fmt=multi bfd_gas=yes ;;
+ 
+@@ -192,7 +192,7 @@
+   i386-*-linux*aout*)			fmt=aout em=linux ;;
+   i386-*-linux*oldld)			fmt=aout em=linux ;;
+   i386-*-linux*coff*)			fmt=coff em=linux ;;
+-  i386-*-linux-gnu*)			fmt=elf em=linux ;;
++  i386-*-linux-*)			fmt=elf em=linux ;;
+   i386-*-lynxos*)			fmt=elf em=lynx bfd_gas=yes ;;
+   i386-*-sysv[45]*)			fmt=elf ;;
+   i386-*-solaris*)			fmt=elf ;;
+@@ -238,7 +238,7 @@
+ 
+   ia64-*-elf*)				fmt=elf ;;
+   ia64-*-aix*)				fmt=elf em=ia64aix ;;
+-  ia64-*-linux-gnu*)			fmt=elf em=linux ;;
++  ia64-*-linux-*)			fmt=elf em=linux ;;
+   ia64-*-hpux*)				fmt=elf em=hpux ;;
+   ia64-*-netbsd*)			fmt=elf em=nbsd ;;
+ 
+@@ -265,7 +265,7 @@
+   m68k-*-rtems*)			fmt=elf ;;
+   m68k-*-hpux*)				fmt=hp300 em=hp300 ;;
+   m68k-*-linux*aout*)			fmt=aout em=linux ;;
+-  m68k-*-linux-gnu*)			fmt=elf em=linux ;;
++  m68k-*-linux-*)			fmt=elf em=linux ;;
+   m68k-*-uclinux*)			fmt=elf ;;
+   m68k-*-gnu*)				fmt=elf ;;
+   m68k-*-netbsdelf*)			fmt=elf em=nbsd ;;
+@@ -332,7 +332,7 @@
+   ppc-*-beos*)				fmt=coff ;;
+   ppc-*-*n*bsd* | ppc-*-elf*)		fmt=elf ;;
+   ppc-*-eabi* | ppc-*-sysv4*)		fmt=elf ;;
+-  ppc-*-linux-gnu*)			fmt=elf em=linux ;;
++  ppc-*-linux-*)			fmt=elf em=linux ;;
+   ppc-*-solaris*)			fmt=elf ;;
+   ppc-*-rtems*)				fmt=elf ;;
+   ppc-*-macos*)				fmt=coff em=macos ;;
+@@ -340,7 +340,7 @@
+   ppc-*-kaos*)				fmt=elf ;;
+   ppc-*-lynxos*)			fmt=elf em=lynx bfd_gas=yes ;;
+ 
+-  s390-*-linux-gnu*)			fmt=elf em=linux ;;
++  s390-*-linux-*)			fmt=elf em=linux ;;
+   s390-*-tpf*)				fmt=elf ;;
+ 
+   sh*-*-linux*)				fmt=elf em=linux
+@@ -369,7 +369,7 @@
+   sparc-*-aout | sparc*-*-vxworks*)	fmt=aout em=sparcaout ;;
+   sparc-*-coff)				fmt=coff ;;
+   sparc-*-linux*aout*)			fmt=aout em=linux ;;
+-  sparc-*-linux-gnu*)			fmt=elf em=linux ;;
++  sparc-*-linux-*)			fmt=elf em=linux ;;
+   sparc-fujitsu-none)			fmt=aout ;;
+   sparc-*-elf)				fmt=elf ;;
+   sparc-*-sysv4*)			fmt=elf ;;
+@@ -398,7 +398,7 @@
+   vax-*-netbsdelf*)			fmt=elf em=nbsd ;;
+   vax-*-netbsd*)			fmt=aout em=nbsd ;;
+   vax-*-bsd* | vax-*-ultrix*)		fmt=aout ;;
+-  vax-*-linux-gnu*)			fmt=elf em=linux bfd_gas=yes ;;
++  vax-*-linux-*)			fmt=elf em=linux bfd_gas=yes ;;
+ 
+   w65-*-*)				fmt=coff ;;
+ 
+diff -ur binutils-2.15.97.orig/ld/configure.host binutils-2.15.97/ld/configure.host
+--- binutils-2.15.97.orig/ld/configure.host	2005-04-29 20:48:15.000000000 -0400
++++ binutils-2.15.97/ld/configure.host	2005-04-29 20:53:50.000000000 -0400
+@@ -83,7 +83,7 @@
+   HOSTING_CRT0=`echo "$HOSTING_CRT0" | sed -e "s,ld\[^ \]\*,ld-linux,g"`
+   ;;
+ 
+-arm*-*-linux-gnu*)
++arm*-*-linux-*)
+   HOSTING_CRT0='-p '`echo "$HOSTING_CRT0" | sed -e "s,ld\[^ \]\*,ld-linux,g"`
+   ;;
+ 
+@@ -141,7 +141,7 @@
+   HOSTING_LIBS="$HOSTING_LIBS"' -lcygwin -L/usr/lib/w32api -luser32 -lkernel32 -ladvapi32 -lshell32 `if [ -f ../gcc/libgcc.a ] ; then echo ../gcc/libgcc.a ; else ${CC} -print-libgcc-file-name; fi`'
+   ;;
+ 
+-ia64-*-linux-gnu*)
++ia64-*-linux-*)
+   HOSTING_CRT0=`echo "$HOSTING_CRT0" | sed -e "s,ld\[^ \]*\*,ld-linux-ia64,g"`
+   ;;
+ 
+@@ -155,11 +155,11 @@
+   HOSTING_LIBS='-L/usr/lib32 '"$HOSTING_LIBS"' `if [ -f ../gcc/crtend.o ]; then echo ../gcc/crtend.o ; else ${CC} -print-file-name=crtend.o; fi` /usr/lib32/crtn.o -init __do_global_ctors -fini __do_global_dtors'
+   ;;
+ 
+-mips*-*-linux-gnu*)
++mips*-*-linux-*)
+   HOSTING_CRT0=`echo "$HOSTING_CRT0" | sed -e "s,\\\`specs.*\"\\\`,/lib/ld.so.1,"`
+   ;;
+ 
+-m68*-*-linux-gnu*)
++m68*-*-linux-*)
+   HOSTING_CRT0=`echo "$HOSTING_CRT0" | sed -e "s,\\\`specs.*\"\\\`,/lib/ld.so.1,"`
+   ;;
+ 
+@@ -183,19 +183,19 @@
+   HOSTING_LIBS="$HOSTING_LIBS"' `if [ -f ../gcc/crtend.o ]; then echo ../gcc/crtend.o; else ${CC} -print-file-name=crtend.o; fi`'
+   ;;
+ 
+-powerpc64*-*-linux-gnu*)
++powerpc64*-*-linux-*)
+   HOSTING_CRT0=`echo "$HOSTING_CRT0" | sed -e "s,\\\`specs.*\"\\\`,/lib64/ld64.so.1,"`
+   ;;
+ 
+-powerpc*-*-linux-gnu*)
++powerpc*-*-linux-*)
+   HOSTING_CRT0=`echo "$HOSTING_CRT0" | sed -e "s,\\\`specs.*\"\\\`,/lib/ld.so.1,"`
+   ;;
+ 
+-s390x-*-linux-gnu*)
++s390x-*-linux-*)
+   HOSTING_CRT0=`echo "$HOSTING_CRT0" | sed -e "s,\\\`specs.*\"\\\`,/lib/ld64.so.1,"`
+   ;;
+ 
+-s390-*-linux-gnu*)
++s390-*-linux-*)
+   HOSTING_CRT0=`echo "$HOSTING_CRT0" | sed -e "s,\\\`specs.*\"\\\`,/lib/ld.so.1,"`
+   ;;
+ 
+@@ -209,15 +209,15 @@
+   HOSTING_LIBS="$HOSTING_LIBS"' `if [ -f ../gcc/crtend.o ]; then echo ../gcc/crtend.o; else ${CC} -print-file-name=crtend.o; fi` `if [ -f ../gcc/crtn.o ]; then echo ../gcc/crtn.o; else ${CC} -print-file-name=crtn.o; fi`'
+   ;;
+ 
+-sparc-*-linux-gnu*)
++sparc-*-linux-*)
+   HOSTING_CRT0=`echo "$HOSTING_CRT0" | sed -e "s,\\\`specs.*\"\\\`,/lib/ld-linux.so.2,"`
+   ;;
+ 
+-sparc64-*-linux-gnu*)
++sparc64-*-linux-*)
+   HOSTING_CRT0=`echo "$HOSTING_CRT0" | sed -e "s,\\\`specs.*\"\\\`,/lib64/ld-linux.so.2,"`
+   ;;
+ 
+-x86_64-*-linux-gnu*)
++x86_64-*-linux-*)
+   HOSTING_CRT0=`echo "$HOSTING_CRT0" | sed -e "s,\\\`specs.*\"\\\`,/lib64/ld-linux-x86-64.so.2,"`
+   ;;
+ 
+diff -ur binutils-2.15.97.orig/ld/configure.tgt binutils-2.15.97/ld/configure.tgt
+--- binutils-2.15.97.orig/ld/configure.tgt	2005-04-29 20:48:15.000000000 -0400
++++ binutils-2.15.97/ld/configure.tgt	2005-04-29 20:53:50.000000000 -0400
+@@ -30,7 +30,7 @@
+ cris-*-*aout*)		targ_emul=crisaout
+ 			targ_extra_emuls="criself crislinux"
+ 			targ_extra_libpath=$targ_extra_emuls ;;
+-cris-*-linux-gnu* | cris-*-linux-gnu*)
++cris-*-linux-* | crisv32-*-linux-*)
+ 			targ_emul=crislinux ;;
+ cris-*-* | crisv32-*-*)	targ_emul=criself
+ 			targ_extra_emuls="crisaout crislinux"
+@@ -62,14 +62,14 @@
+ 			tdir_elf32_sparc=`echo ${targ_alias} | sed -e 's/aout//'`
+ 			tdir_sun4=sparc-sun-sunos4
+ 			;;
+-sparc64-*-linux-gnu*)	targ_emul=elf64_sparc
++sparc64-*-linux-*)	targ_emul=elf64_sparc
+ 			targ_extra_emuls="elf32_sparc sparclinux sun4"
+ 			targ_extra_libpath=elf32_sparc
+ 			tdir_elf32_sparc=`echo ${targ_alias} | sed -e 's/64//'`
+ 			tdir_sparclinux=${tdir_elf32_sparc}aout
+ 			tdir_sun4=sparc-sun-sunos4
+ 			;;
+-sparc*-*-linux-gnu*)	targ_emul=elf32_sparc
++sparc*-*-linux-*)	targ_emul=elf32_sparc
+ 			targ_extra_emuls="sparclinux elf64_sparc sun4"
+ 			targ_extra_libpath=elf64_sparc
+ 			tdir_sparclinux=${targ_alias}aout
+@@ -119,8 +119,8 @@
+ ia64-*-aix*)		targ_emul=elf64_aix ;;
+ m32r*le-*-elf*)         targ_emul=m32rlelf ;;
+ m32r*-*-elf*)           targ_emul=m32relf ;;
+-m32r*le-*-linux-gnu*)   targ_emul=m32rlelf_linux ;;
+-m32r*-*-linux-gnu*)     targ_emul=m32relf_linux ;;
++m32r*le-*-linux-*)      targ_emul=m32rlelf_linux ;;
++m32r*-*-linux-*)        targ_emul=m32relf_linux ;;
+ m68hc11-*-*|m6811-*-*)	targ_emul=m68hc11elf 
+ 			targ_extra_emuls="m68hc11elfb m68hc12elf m68hc12elfb" ;;
+ m68hc12-*-*|m6812-*-*)	targ_emul=m68hc12elf 
+@@ -131,7 +131,7 @@
+ m68*-apple-aux*)	targ_emul=m68kaux ;;
+ maxq-*-coff)            targ_emul=maxqcoff;;
+ *-tandem-none)		targ_emul=st2000 ;;
+-i370-*-elf* | i370-*-linux-gnu*) targ_emul=elf32i370 ;;
++i370-*-elf* | i370-*-linux-*) targ_emul=elf32i370 ;;
+ i[3-7]86-*-nto-qnx*)	targ_emul=i386nto ;;
+ i[3-7]86-*-vsta)	targ_emul=vsta ;;
+ i[3-7]86-go32-rtems*)	targ_emul=i386go32 ;;
+@@ -155,14 +155,14 @@
+ 			tdir_elf_i386=`echo ${targ_alias} | sed -e 's/aout//'`
+ 			;;
+ i[3-7]86-*-linux*oldld)	targ_emul=i386linux; targ_extra_emuls=elf_i386 ;;
+-i[3-7]86-*-linux-gnu*)	targ_emul=elf_i386
++i[3-7]86-*-linux-*)	targ_emul=elf_i386
+ 			targ_extra_emuls=i386linux
+ 			if test x${want64} = xtrue; then
+ 			  targ_extra_emuls="$targ_extra_emuls elf_x86_64"
+ 			fi
+ 			tdir_i386linux=${targ_alias}aout
+ 			;;
+-x86_64-*-linux-gnu*)	targ_emul=elf_x86_64
++x86_64-*-linux-*)	targ_emul=elf_x86_64
+ 			targ_extra_emuls="elf_i386 i386linux"
+ 			targ_extra_libpath=elf_i386
+ 			tdir_i386linux=`echo ${targ_alias}aout | sed -e 's/x86_64/i386/'`
+@@ -262,13 +262,13 @@
+ arm-*-kaos*)		targ_emul=armelf ;;
+ arm9e-*-elf)		targ_emul=armelf ;;
+ arm*b-*-linux-gnueabi)	targ_emul=armelfb_linux_eabi ;;
+-arm*b-*-linux-gnu*)	targ_emul=armelfb_linux; targ_extra_emuls=armelfb ;;
++arm*b-*-linux-*)	targ_emul=armelfb_linux; targ_extra_emuls=armelfb ;;
+ arm*-*-linux-gnueabi)	targ_emul=armelf_linux_eabi ;;
+-arm*-*-linux-gnu*)	targ_emul=armelf_linux; targ_extra_emuls=armelf ;;
++arm*-*-linux-*)	        targ_emul=armelf_linux; targ_extra_emuls=armelf ;;
+ arm*-*-uclinux*)	targ_emul=armelf_linux; targ_extra_emuls=armelf ;;
+ arm-*-vxworks)		targ_emul=armelf_vxworks ;;
+ arm*-*-conix*)		targ_emul=armelf ;;
+-thumb-*-linux-gnu* | thumb-*-uclinux*)	targ_emul=armelf_linux; targ_extra_emuls=armelf ;;
++thumb-*-linux-* | thumb-*-uclinux*)	targ_emul=armelf_linux; targ_extra_emuls=armelf ;;
+ strongarm-*-coff)	targ_emul=armcoff ;;
+ strongarm-*-elf)	targ_emul=armelf ;;
+ strongarm-*-kaos*)	targ_emul=armelf ;;
+@@ -372,7 +372,7 @@
+ 			targ_extra_emuls=m68kelf
+ 			tdir_m68kelf=`echo ${targ_alias} | sed -e 's/aout//'`
+ 			;;
+-m68k-*-linux-gnu*)	targ_emul=m68kelf
++m68k-*-linux-*) 	targ_emul=m68kelf
+ 			targ_extra_emuls=m68klinux
+ 			tdir_m68klinux=`echo ${targ_alias} | sed -e 's/linux/linuxaout/'`
+ 			;;
+@@ -388,9 +388,9 @@
+ m68*-*-psos*)		targ_emul=m68kpsos ;;
+ m68*-*-rtemscoff*)	targ_emul=m68kcoff ;;
+ m68*-*-rtems*)		targ_emul=m68kelf ;;
+-hppa*64*-*-linux-gnu*)	targ_emul=hppa64linux ;;
++hppa*64*-*-linux-*)	targ_emul=hppa64linux ;;
+ hppa*64*-*)		targ_emul=elf64hppa ;;
+-hppa*-*-linux-gnu*)	targ_emul=hppalinux ;;
++hppa*-*-linux-*)	targ_emul=hppalinux ;;
+ hppa*-*-*elf*)		targ_emul=hppaelf ;;
+ hppa*-*-lites*)		targ_emul=hppaelf ;;
+ hppa*-*-netbsd*)	targ_emul=hppanbsd ;;
+@@ -402,7 +402,7 @@
+ vax-*-netbsdaout* | vax-*-netbsd*)
+ 			targ_emul=vaxnbsd
+ 			targ_extra_emuls=elf32vax ;;
+-vax-*-linux-gnu*)	targ_emul=elf32vax ;;
++vax-*-linux-*)  	targ_emul=elf32vax ;;
+ mips*-*-pe)		targ_emul=mipspe ;
+ 			targ_extra_ofiles="deffilep.o pe-dll.o" ;;
+ mips*-dec-ultrix*)	targ_emul=mipslit ;;
+@@ -436,18 +436,18 @@
+ mips*-*-vxworks*)	targ_emul=elf32ebmip
+ 		        targ_extra_emuls="elf32elmip" ;;
+ mips*-*-windiss)	targ_emul=elf32mipswindiss ;;
+-mips64*el-*-linux-gnu*)	targ_emul=elf32ltsmipn32
++mips64*el-*-linux-*)	targ_emul=elf32ltsmipn32
+ 			targ_extra_emuls="elf32btsmipn32 elf32ltsmip elf32btsmip elf64ltsmip elf64btsmip"
+ 			targ_extra_libpath="elf32ltsmip elf64ltsmip"
+ 			;;
+-mips64*-*-linux-gnu*)	targ_emul=elf32btsmipn32
++mips64*-*-linux-*)	targ_emul=elf32btsmipn32
+ 			targ_extra_emuls="elf32ltsmipn32 elf32btsmip elf32ltsmip elf64btsmip elf64ltsmip"
+ 			targ_extra_libpath="elf32btsmip elf64btsmip"
+ 			;;
+-mips*el-*-linux-gnu*)	targ_emul=elf32ltsmip
++mips*el-*-linux-*)	targ_emul=elf32ltsmip
+ 			targ_extra_emuls="elf32btsmip elf32ltsmipn32 elf64ltsmip elf32btsmipn32 elf64btsmip"
+ 			;;
+-mips*-*-linux-gnu*)	targ_emul=elf32btsmip
++mips*-*-linux-*)	targ_emul=elf32btsmip
+ 			targ_extra_emuls="elf32ltsmip elf32btsmipn32 elf64btsmip elf32ltsmipn32 elf64ltsmip"
+ 			;;
+ mips*-*-lnews*)		targ_emul=mipslnews ;;
+@@ -467,7 +467,7 @@
+ alpha*-*-linuxecoff*)	targ_emul=alpha targ_extra_emuls=elf64alpha
+ 			tdir_elf64alpha=`echo ${targ_alias} | sed -e 's/ecoff//'`
+ 			;;
+-alpha*-*-linux-gnu*)	targ_emul=elf64alpha targ_extra_emuls=alpha
++alpha*-*-linux-*)	targ_emul=elf64alpha targ_extra_emuls=alpha
+ 			tdir_alpha=`echo ${targ_alias} | sed -e 's/linux/linuxecoff/'`
+ 			;;
+ alpha*-*-osf*)		targ_emul=alpha ;;
+diff -ur binutils-2.15.97.orig/ld/emultempl/elf32.em binutils-2.15.97/ld/emultempl/elf32.em
+--- binutils-2.15.97.orig/ld/emultempl/elf32.em	2005-04-29 20:48:15.000000000 -0400
++++ binutils-2.15.97/ld/emultempl/elf32.em	2005-04-29 20:53:50.000000000 -0400
+@@ -65,7 +65,7 @@
+ 
+ if [ "x${USE_LIBPATH}" = xyes ] ; then
+   case ${target} in
+-    *-*-linux-gnu*)
++    *-*-linux-*)
+   cat >>e${EMULATION_NAME}.c <<EOF
+ #ifdef HAVE_GLOB
+ #include <glob.h>
+@@ -350,7 +350,7 @@
+ 
+ EOF
+ case ${target} in
+-  *-*-linux-gnu*)
++  *-*-linux-*)
+     cat >>e${EMULATION_NAME}.c <<EOF
+ 	  {
+ 	    struct bfd_link_needed_list *l;
+@@ -522,7 +522,7 @@
+ 
+ EOF
+   case ${target} in
+-    *-*-linux-gnu*)
++    *-*-linux-*)
+       cat >>e${EMULATION_NAME}.c <<EOF
+ /* For a native linker, check the file /etc/ld.so.conf for directories
+    in which we may find shared libraries.  /etc/ld.so.conf is really
+@@ -932,7 +932,7 @@
+ EOF
+ if [ "x${USE_LIBPATH}" = xyes ] ; then
+   case ${target} in
+-    *-*-linux-gnu*)
++    *-*-linux-*)
+       cat >>e${EMULATION_NAME}.c <<EOF
+ 	  if (gld${EMULATION_NAME}_check_ld_so_conf (l->name, force))
+ 	    break;

src/patches/binutils-uclibc-libtool-conf.patch

@@ -0,0 +1,218 @@
+diff -urN binutils-2.16.90.0.2-dist/bfd/configure binutils-2.16.90.0.2/bfd/configure
+--- binutils-2.16.90.0.2-dist/bfd/configure	2005-04-29 12:50:24.000000000 -0500
++++ binutils-2.16.90.0.2/bfd/configure	2005-04-30 11:34:59.246377032 -0500
+@@ -3584,6 +3584,11 @@
+   lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
+   ;;
+ 
++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 -urN binutils-2.16.90.0.2-dist/binutils/configure binutils-2.16.90.0.2/binutils/configure
+--- binutils-2.16.90.0.2-dist/binutils/configure	2005-04-29 12:50:26.000000000 -0500
++++ binutils-2.16.90.0.2/binutils/configure	2005-04-30 11:35:28.900868864 -0500
+@@ -1577,6 +1577,11 @@
+   lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
+   ;;
+ 
++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 -urN binutils-2.16.90.0.2-dist/configure binutils-2.16.90.0.2/configure
+--- binutils-2.16.90.0.2-dist/configure	2005-04-29 12:50:23.000000000 -0500
++++ binutils-2.16.90.0.2/configure	2005-04-30 11:31:12.525843792 -0500
+@@ -1111,7 +1111,7 @@
+     ;;
+ "")
+     case "${target}" in
+-    *-*-linux*-gnu | *-*-gnu* | *-*-k*bsd*-gnu)
++    *-*-linux*-gnu | *-*-gnu* | *-*-k*bsd*-gnu | *-*-linux-uclibc*)
+         # Enable libmudflap by default in GNU and friends.
+ 	;;
+     *-*-freebsd*)
+diff -urN binutils-2.16.90.0.2-dist/configure.in binutils-2.16.90.0.2/configure.in
+--- binutils-2.16.90.0.2-dist/configure.in	2005-04-29 12:50:23.000000000 -0500
++++ binutils-2.16.90.0.2/configure.in	2005-04-30 11:29:51.643139832 -0500
+@@ -328,7 +328,7 @@
+     ;;
+ "")
+     case "${target}" in
+-    *-*-linux*-gnu | *-*-gnu* | *-*-k*bsd*-gnu)
++    *-*-linux*-gnu | *-*-gnu* | *-*-k*bsd*-gnu | *-*-linux-uclibc*)
+         # Enable libmudflap by default in GNU and friends.
+ 	;;
+     *-*-freebsd*)
+diff -urN binutils-2.16.90.0.2-dist/gas/configure binutils-2.16.90.0.2/gas/configure
+--- binutils-2.16.90.0.2-dist/gas/configure	2005-04-29 12:50:27.000000000 -0500
++++ binutils-2.16.90.0.2/gas/configure	2005-04-30 11:35:21.097055224 -0500
+@@ -3421,6 +3421,11 @@
+   lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
+   ;;
+ 
++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 -urN binutils-2.16.90.0.2-dist/gas/testsuite/gas/sh/basic.exp binutils-2.16.90.0.2/gas/testsuite/gas/sh/basic.exp
+--- binutils-2.16.90.0.2-dist/gas/testsuite/gas/sh/basic.exp	2005-04-09 14:03:14.000000000 -0500
++++ binutils-2.16.90.0.2/gas/testsuite/gas/sh/basic.exp	2005-04-30 11:41:57.301822944 -0500
+@@ -20,7 +20,7 @@
+ 
+ # Written by Cygnus Support.
+ 
+-if [istarget "sh*-*-linux-gnu"] {
++if {[istarget "sh*-*-linux-gnu"] || [istarget "sh*-*-linux-uclibc"]} {
+     global ASFLAGS
+     set ASFLAGS "$ASFLAGS -big"
+ }
+diff -urN binutils-2.16.90.0.2-dist/gprof/configure binutils-2.16.90.0.2/gprof/configure
+--- binutils-2.16.90.0.2-dist/gprof/configure	2005-04-29 12:50:29.000000000 -0500
++++ binutils-2.16.90.0.2/gprof/configure	2005-04-30 11:35:36.880655752 -0500
+@@ -3419,6 +3419,11 @@
+   lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
+   ;;
+ 
++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 -urN binutils-2.16.90.0.2-dist/ld/configure binutils-2.16.90.0.2/ld/configure
+--- binutils-2.16.90.0.2-dist/ld/configure	2005-04-29 12:50:30.000000000 -0500
++++ binutils-2.16.90.0.2/ld/configure	2005-04-30 11:46:15.974498720 -0500
+@@ -1581,6 +1581,11 @@
+   lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
+   ;;
+ 
++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 -urN binutils-2.16.90.0.2-dist/ld/testsuite/ld-sh/sh.exp binutils-2.16.90.0.2/ld/testsuite/ld-sh/sh.exp
+--- binutils-2.16.90.0.2-dist/ld/testsuite/ld-sh/sh.exp	2005-04-09 14:03:29.000000000 -0500
++++ binutils-2.16.90.0.2/ld/testsuite/ld-sh/sh.exp	2005-04-30 11:45:07.890849008 -0500
+@@ -62,7 +62,7 @@
+ 
+ set testsrec "SH relaxing to S-records"
+ 
+-if [istarget sh*-linux-gnu] {
++if {[istarget sh*-linux-gnu] || [istarget sh*-*-linux-uclibc]} {
+     # This target needs the explicit entry address.
+     catch "exec $objdump -x tmpdir/sh1 | grep start\\ address | sed s/start\\ address//" entry_addr
+     set srec_relax_arg "-Ttext $entry_addr -relax --oformat srec tmpdir/sh1.o"
+@@ -117,7 +117,7 @@
+     return
+ }
+ 
+-if [istarget sh*-linux-gnu] {
++if {[istarget sh*-linux-gnu] || [istarget sh*-*-linux-uclibc]} {
+     exec sed -e s/_main/main/ -e s/_trap/trap/ -e s/_stack/stack/ \
+ 	    < $srcdir/$subdir/start.s >tmpdir/start.s
+ } else {
+diff -urN binutils-2.16.90.0.2-dist/ld/testsuite/ld-srec/srec.exp binutils-2.16.90.0.2/ld/testsuite/ld-srec/srec.exp
+--- binutils-2.16.90.0.2-dist/ld/testsuite/ld-srec/srec.exp	2005-04-29 12:50:30.000000000 -0500
++++ binutils-2.16.90.0.2/ld/testsuite/ld-srec/srec.exp	2005-04-30 11:44:26.358162936 -0500
+@@ -385,7 +385,7 @@
+ setup_xfail "v850*-*-elf"
+ 
+ # The S-record linker doesn't handle Alpha Elf relaxation.
+-setup_xfail "alpha*-*-elf*" "alpha*-*-linux-gnu*" "alpha*-*-gnu*"
++setup_xfail "alpha*-*-elf*" "alpha*-*-linux-gnu*" "alpha*-*-gnu*" "alpha*-*-linux-uclibc*"
+ setup_xfail "alpha*-*-netbsd*"
+ 
+ # The S-record linker hasn't any hope of coping with HPPA relocs.
+@@ -424,7 +424,7 @@
+ setup_xfail "thumb-*-*"
+ setup_xfail "powerpc*-*-eabi*"
+ setup_xfail "v850*-*-elf"
+-setup_xfail "alpha*-*-elf*" "alpha*-*-linux-gnu*" "alpha*-*-gnu*"
++setup_xfail "alpha*-*-elf*" "alpha*-*-linux-gnu*" "alpha*-*-gnu*" "alpha*-*-linux-uclibc*"
+ setup_xfail "alpha*-*-netbsd*"
+ setup_xfail "hppa*-*-*"
+ setup_xfail "ia64-*-*"
+diff -urN binutils-2.16.90.0.2-dist/libtool.m4 binutils-2.16.90.0.2/libtool.m4
+--- binutils-2.16.90.0.2-dist/libtool.m4	2004-07-27 23:36:06.000000000 -0500
++++ binutils-2.16.90.0.2/libtool.m4	2005-04-30 11:35:54.062043784 -0500
+@@ -645,6 +645,11 @@
+   lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
+   ;;
+ 
++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 -urN binutils-2.16.90.0.2-dist/ltconfig binutils-2.16.90.0.2/ltconfig
+--- binutils-2.16.90.0.2-dist/ltconfig	2004-11-22 14:33:30.000000000 -0600
++++ binutils-2.16.90.0.2/ltconfig	2005-04-30 11:22:10.594229920 -0500
+@@ -602,6 +602,7 @@
+ 
+ # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
+ case $host_os in
++linux-uclibc*) ;;
+ linux-gnu*) ;;
+ linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
+ esac
+@@ -1270,6 +1271,23 @@
+   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.
++  hardcode_into_libs=yes
++  # Assume using the uClibc dynamic linker.
++  dynamic_linker="uClibc ld.so"
++  ;;
++
+ netbsd*)
+   need_lib_prefix=no
+   need_version=no
+diff -urN binutils-2.16.90.0.2-dist/opcodes/configure binutils-2.16.90.0.2/opcodes/configure
+--- binutils-2.16.90.0.2-dist/opcodes/configure	2005-04-29 12:50:31.000000000 -0500
++++ binutils-2.16.90.0.2/opcodes/configure	2005-04-30 11:17:07.168357664 -0500
+@@ -3588,6 +3588,11 @@
+   lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
+   ;;
+ 
++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]+$'

src/patches/gcc-libstdc++-pic.patch

@@ -0,0 +1,45 @@
+--- gcc-4.0.0/libstdc++-v3/src/Makefile.am
++++ gcc-4.0.0/libstdc++-v3/src/Makefile.am
+@@ -214,6 +214,10 @@
+ 	  $(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) $(LDFLAGS) -o $@
+ 
+ 
++install-exec-local:
++	$(AR) cru libstdc++_pic.a *.o $(top_builddir)/libsupc++/*.o
++	$(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir)
++
+ # Added bits to build debug library.
+ if GLIBCXX_BUILD_DEBUG
+ all-local: build_debug
+--- gcc-4.0.0/libstdc++-v3/src/Makefile.in
++++ gcc-4.0.0/libstdc++-v3/src/Makefile.in
+@@ -625,7 +625,7 @@
+ 
+ install-data-am: install-data-local
+ 
+-install-exec-am: install-toolexeclibLTLIBRARIES
++install-exec-am: install-toolexeclibLTLIBRARIES install-exec-local
+ 
+ install-info: install-info-am
+ 
+@@ -664,7 +664,7 @@
+ 	maintainer-clean-generic mostlyclean mostlyclean-compile \
+ 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ 	tags uninstall uninstall-am uninstall-info-am \
+-	uninstall-toolexeclibLTLIBRARIES
++	uninstall-toolexeclibLTLIBRARIES install-exec-local
+ 
+ @GLIBCXX_BUILD_VERSIONED_SHLIB_TRUE@libstdc++-symbol.ver:  ${glibcxx_srcdir}/$(SYMVER_MAP)
+ @GLIBCXX_BUILD_VERSIONED_SHLIB_TRUE@	cp ${glibcxx_srcdir}/$(SYMVER_MAP) ./libstdc++-symbol.ver
+@@ -743,6 +743,11 @@
+ install_debug:
+ 	(cd ${debugdir} && $(MAKE) \
+ 	toolexeclibdir=$(glibcxx_toolexeclibdir)/debug install)
++
++install-exec-local:
++	$(AR) cru libstdc++_pic.a *.o $(top_builddir)/libsupc++/*.o
++	$(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir)
++
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:

src/patches/gcc-sdk-libstdc++-includes.patch

@@ -0,0 +1,22 @@
+diff -urN gcc-4.0.0-100/libstdc++-v3/fragment.am gcc-4.0.0/libstdc++-v3/fragment.am
+--- gcc-4.0.0-100/libstdc++-v3/fragment.am	2004-10-25 15:32:40.000000000 -0500
++++ gcc-4.0.0/libstdc++-v3/fragment.am	2005-04-28 21:48:43.000000000 -0500
+@@ -18,5 +18,5 @@
+ 	$(WARN_FLAGS) $(WERROR) -fdiagnostics-show-location=once
+ 
+ # -I/-D flags to pass when compiling.
+-AM_CPPFLAGS = $(GLIBCXX_INCLUDES)
++AM_CPPFLAGS = $(GLIBCXX_INCLUDES) -I$(toplevel_srcdir)/include
+ 
+diff -urN gcc-4.0.0-100/libstdc++-v3/libmath/Makefile.am gcc-4.0.0/libstdc++-v3/libmath/Makefile.am
+--- gcc-4.0.0-100/libstdc++-v3/libmath/Makefile.am	2003-08-27 16:29:42.000000000 -0500
++++ gcc-4.0.0/libstdc++-v3/libmath/Makefile.am	2005-04-28 21:48:43.000000000 -0500
+@@ -32,7 +32,7 @@
+ 
+ libmath_la_SOURCES = stubs.c
+ 
+-AM_CPPFLAGS = $(CANADIAN_INCLUDES)
++AM_CPPFLAGS = $(CANADIAN_INCLUDES) -I$(toplevel_srcdir)/include
+ 
+ # Only compiling "C" sources in this directory.
+ LIBTOOL = @LIBTOOL@ --tag CC

src/patches/gcc-uclibc-conf.patch

@@ -0,0 +1,553 @@
+--- gcc-4.0.2/gcc/config/t-linux-uclibc
++++ gcc-4.0.2/gcc/config/t-linux-uclibc
+@@ -0,0 +1,5 @@
++# Remove glibc specific files added in t-linux
++SHLIB_MAPFILES := $(filter-out $(srcdir)/config/libgcc-glibc.ver, $(SHLIB_MAPFILES))
++
++# Use unwind-dw2-fde instead of unwind-dw2-fde-glibc
++LIB2ADDEH := $(subst unwind-dw2-fde-glibc.c,unwind-dw2-fde.c,$(LIB2ADDEH))
+--- gcc-4.0.2/gcc/config.gcc
++++ gcc-4.0.2/gcc/config.gcc
+@@ -1778,7 +1778,7 @@
+ 	;;
+ sh-*-elf* | sh[12346l]*-*-elf* | sh*-*-kaos* | \
+ sh-*-symbianelf* | sh[12346l]*-*-symbianelf* | \
+-  sh-*-linux* | sh[346lbe]*-*-linux* | \
++  sh*-*-linux* | sh[346lbe]*-*-linux* | \
+   sh-*-netbsdelf* | shl*-*-netbsdelf* | sh5-*-netbsd* | sh5l*-*-netbsd* | \
+    sh64-*-netbsd* | sh64l*-*-netbsd*)
+ 	tmake_file="${tmake_file} sh/t-sh sh/t-elf"
+@@ -2234,10 +2234,16 @@
+ *)
+ 	echo "*** Configuration ${target} not supported" 1>&2
+ 	exit 1
+ 	;;
+ esac
++
++# Rather than hook into each target, just do it after all the linux
++# targets have been processed
++case ${target} in
++*-linux-uclibc*) tm_defines="${tm_defines} USE_UCLIBC" ; tmake_file="${tmake_file} t-linux-uclibc"
++esac
+ 
+ case ${target} in
+ i[34567]86-*-linux*aout* | i[34567]86-*-linux*libc1)
+ 	tmake_file="${tmake_file} i386/t-gmm_malloc"
+ 	;;
+--- gcc-4.0.2/gcc/config/alpha/linux-elf.h
++++ gcc-4.0.2/gcc/config/alpha/linux-elf.h
+@@ -27,7 +27,11 @@
+ #define SUBTARGET_EXTRA_SPECS \
+ { "elf_dynamic_linker", ELF_DYNAMIC_LINKER },
+ 
++#ifdef USE_UCLIBC
++#define ELF_DYNAMIC_LINKER	"/lib/ld-uClibc.so.0"
++#else
+ #define ELF_DYNAMIC_LINKER	"/lib/ld-linux.so.2"
++#endif
+ 
+ #define LINK_SPEC "-m elf64alpha %{G*} %{relax:-relax}		\
+   %{O*:-O3} %{!O*:-O1}						\
+--- gcc-4.0.2/gcc/config/arm/linux-elf.h
++++ gcc-4.0.2/gcc/config/arm/linux-elf.h
+@@ -81,14 +81,19 @@
+ #define ENDFILE_SPEC \
+   "%{!shared:crtend.o%s} %{shared:crtendS.o%s} crtn.o%s"
+ 
++#ifdef USE_UCLIBC
++#define ELF_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
++#else
++#define ELF_DYNAMIC_LINKER "/lib/ld-linux.so.2"
++#endif
+ #undef  LINK_SPEC
+ #define LINK_SPEC "%{h*} %{version:-v} \
+    %{b} %{Wl,*:%*} \
+    %{static:-Bstatic} \
+    %{shared:-shared} \
+    %{symbolic:-Bsymbolic} \
+    %{rdynamic:-export-dynamic} \
+-   %{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2} \
++   %{!dynamic-linker:-dynamic-linker " ELF_DYNAMIC_LINKER "} \
+    -X \
+    %{mbig-endian:-EB}" \
+    SUBTARGET_EXTRA_LINK_SPEC
+--- gcc-4.0.2/gcc/config/cris/linux.h
++++ gcc-4.0.2/gcc/config/cris/linux.h
+@@ -79,6 +79,25 @@
+ #undef CRIS_DEFAULT_CPU_VERSION
+ #define CRIS_DEFAULT_CPU_VERSION CRIS_CPU_NG
+ 
++#ifdef USE_UCLIBC
++
++#undef CRIS_SUBTARGET_VERSION
++#define CRIS_SUBTARGET_VERSION " - cris-axis-linux-uclibc"
++
++#undef CRIS_LINK_SUBTARGET_SPEC
++#define CRIS_LINK_SUBTARGET_SPEC \
++ "-mcrislinux\
++  -rpath-link include/asm/../..%s\
++  %{shared} %{static}\
++  %{symbolic:-Bdynamic} %{shlib:-Bdynamic} %{static:-Bstatic}\
++  %{!shared: \
++    %{!static: \
++      %{rdynamic:-export-dynamic} \
++      %{!dynamic-linker:-dynamic-linker /lib/ld-uClibc.so.0}}} \
++  %{!r:%{O2|O3: --gc-sections}}"
++
++#else  /* USE_UCLIBC */
++
+ #undef CRIS_SUBTARGET_VERSION
+ #define CRIS_SUBTARGET_VERSION " - cris-axis-linux-gnu"
+ 
+@@ -93,6 +112,8 @@
+   %{!shared:%{!static:%{rdynamic:-export-dynamic}}}\
+   %{!r:%{O2|O3: --gc-sections}}"
+ 
++#endif  /* USE_UCLIBC */
++
+ 
+ /* Node: Run-time Target */
+ 
+--- gcc-4.0.2/gcc/config/i386/linux.h
++++ gcc-4.0.2/gcc/config/i386/linux.h
+@@ -107,6 +107,11 @@
+ #define LINK_EMULATION "elf_i386"
+ #define DYNAMIC_LINKER "/lib/ld-linux.so.2"
+ 
++#ifdef USE_UCLIBC
++#undef DYNAMIC_LINKER
++#define DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
++#endif
++
+ #undef  SUBTARGET_EXTRA_SPECS
+ #define SUBTARGET_EXTRA_SPECS \
+   { "link_emulation", LINK_EMULATION },\
+--- gcc-4.0.2/gcc/config/i386/linux64.h
++++ gcc-4.0.2/gcc/config/i386/linux64.h
+@@ -54,14 +54,21 @@
+    When the -shared link option is used a final link is not being
+    done.  */
+ 
++#ifdef USE_UCLIBC
++#define ELF32_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
++#define ELF64_DYNAMIC_LINKER "/lib/ld64-uClibc.so.0"
++#else
++#define ELF32_DYNAMIC_LINKER "/lib/ld-linux.so.2"
++#define ELF64_DYNAMIC_LINKER "/lib64/ld-linux-x86-64.so.2"
++#endif
+ #undef	LINK_SPEC
+ #define LINK_SPEC "%{!m32:-m elf_x86_64} %{m32:-m elf_i386} \
+   %{shared:-shared} \
+   %{!shared: \
+     %{!static: \
+       %{rdynamic:-export-dynamic} \
+-      %{m32:%{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}} \
+-      %{!m32:%{!dynamic-linker:-dynamic-linker /lib64/ld-linux-x86-64.so.2}}} \
++      %{m32:%{!dynamic-linker:-dynamic-linker " ELF32_DYNAMIC_LINKER "}} \
++      %{!m32:%{!dynamic-linker:-dynamic-linker " ELF64_DYNAMIC_LINKER "}}} \
+     %{static:-static}}"
+ 
+ #define MULTILIB_DEFAULTS { "m64" }
+--- gcc-4.0.2/gcc/config/ia64/linux.h
++++ gcc-4.0.2/gcc/config/ia64/linux.h
+@@ -37,13 +37,18 @@
+ /* Define this for shared library support because it isn't in the main
+    linux.h file.  */
+ 
++#ifdef USE_UCLIBC
++#define ELF_DYNAMIC_LINKER	"/lib/ld-uClibc.so.0"
++#else
++#define ELF_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2"
++#endif
+ #undef LINK_SPEC
+ #define LINK_SPEC "\
+   %{shared:-shared} \
+   %{!shared: \
+     %{!static: \
+       %{rdynamic:-export-dynamic} \
+-      %{!dynamic-linker:-dynamic-linker /lib/ld-linux-ia64.so.2}} \
++      %{!dynamic-linker:-dynamic-linker " ELF_DYNAMIC_LINKER "}} \
+       %{static:-static}}"
+ 
+ 
+--- gcc-4.0.2/gcc/config/m68k/linux.h
++++ gcc-4.0.2/gcc/config/m68k/linux.h
+@@ -127,12 +127,17 @@
+ 
+ /* If ELF is the default format, we should not use /lib/elf.  */
+ 
++#ifdef USE_UCLIBC
++#define ELF_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
++#else
++#define ELF_DYNAMIC_LINKER "/lib/ld.so.1"
++#endif
+ #undef	LINK_SPEC
+ #define LINK_SPEC "-m m68kelf %{shared} \
+   %{!shared: \
+     %{!static: \
+       %{rdynamic:-export-dynamic} \
+-      %{!dynamic-linker*:-dynamic-linker /lib/ld.so.1}} \
++      %{!dynamic-linker*:-dynamic-linker " ELF_DYNAMIC_LINKER "}} \
+     %{static}}"
+ 
+ /* For compatibility with linux/a.out */
+--- gcc-4.0.2/gcc/config/mips/linux.h
++++ gcc-4.0.2/gcc/config/mips/linux.h
+@@ -108,14 +108,19 @@
+ 
+ /* Borrowed from sparc/linux.h */
+ #undef LINK_SPEC
++#ifdef USE_UCLIBC
++#define ELF_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
++#else
++#define ELF_DYNAMIC_LINKER "/lib/ld.so.1"
++#endif
+ #define LINK_SPEC \
+  "%(endian_spec) \
+   %{shared:-shared} \
+   %{!shared: \
+     %{!ibcs: \
+       %{!static: \
+         %{rdynamic:-export-dynamic} \
+-        %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}} \
++        %{!dynamic-linker:-dynamic-linker " ELF_DYNAMIC_LINKER "}} \
+         %{static:-static}}}"
+ 
+ #undef SUBTARGET_ASM_SPEC
+--- gcc-4.0.2/gcc/config/pa/pa-linux.h
++++ gcc-4.0.2/gcc/config/pa/pa-linux.h
+@@ -82,13 +82,18 @@
+ /* Define this for shared library support because it isn't in the main
+    linux.h file.  */
+ 
++#ifdef USE_UCLIBC
++#define ELF_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
++#else
++#define ELF_DYNAMIC_LINKER "/lib/ld.so.1"
++#endif
+ #undef LINK_SPEC
+ #define LINK_SPEC "\
+   %{shared:-shared} \
+   %{!shared: \
+     %{!static: \
+       %{rdynamic:-export-dynamic} \
+-      %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}} \
++      %{!dynamic-linker:-dynamic-linker " ELF_DYNAMIC_LINKER "}} \
+       %{static:-static}}"
+ 
+ /* glibc's profiling functions don't need gcc to allocate counters.  */
+--- gcc-4.0.2/gcc/config/rs6000/linux.h
++++ gcc-4.0.2/gcc/config/rs6000/linux.h
+@@ -69,7 +69,11 @@
+ #define LINK_START_DEFAULT_SPEC "%(link_start_linux)"
+ 
+ #undef	LINK_OS_DEFAULT_SPEC
++#ifdef USE_UCLIBC
++#define LINK_OS_DEFAULT_SPEC "%(link_os_linux_uclibc)"
++#else
+ #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)"
++#endif
+ 
+ #define LINK_GCC_C_SEQUENCE_SPEC \
+   "%{static:--start-group} %G %L %{static:--end-group}%{!static:%G}"
+--- gcc-4.0.2/gcc/config/rs6000/sysv4.h
++++ gcc-4.0.2/gcc/config/rs6000/sysv4.h
+@@ -949,6 +949,7 @@
+   mcall-linux  : %(link_os_linux)       ; \
+   mcall-gnu    : %(link_os_gnu)         ; \
+   mcall-netbsd : %(link_os_netbsd)      ; \
++  mcall-linux-uclibc : %(link_os_linux_uclibc); \
+   mcall-openbsd: %(link_os_openbsd)     ; \
+                : %(link_os_default)     }"
+ 
+@@ -1127,6 +1128,10 @@
+   %{rdynamic:-export-dynamic} \
+   %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}}}"
+ 
++#define LINK_OS_LINUX_UCLIBC_SPEC "-m elf32ppclinux %{!shared: %{!static: \
++  %{rdynamic:-export-dynamic} \
++  %{!dynamic-linker:-dynamic-linker /lib/ld-uClibc.so.0}}}"
++
+ #if defined(HAVE_LD_EH_FRAME_HDR)
+ # define LINK_EH_SPEC "%{!static:--eh-frame-hdr} "
+ #endif
+@@ -1293,6 +1298,7 @@
+   { "link_os_sim",		LINK_OS_SIM_SPEC },			\
+   { "link_os_freebsd",		LINK_OS_FREEBSD_SPEC },			\
+   { "link_os_linux",		LINK_OS_LINUX_SPEC },			\
++  { "link_os_linux_uclibc",	LINK_OS_LINUX_UCLIBC_SPEC },		\
+   { "link_os_gnu",		LINK_OS_GNU_SPEC },			\
+   { "link_os_netbsd",		LINK_OS_NETBSD_SPEC },			\
+   { "link_os_openbsd",		LINK_OS_OPENBSD_SPEC },			\
+--- gcc-4.0.2/gcc/config/s390/linux.h
++++ gcc-4.0.2/gcc/config/s390/linux.h
+@@ -77,6 +77,13 @@
+ #define MULTILIB_DEFAULTS { "m31" }
+ #endif
+ 
++#ifdef USE_UCLIBC
++#define ELF31_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
++#define ELF64_DYNAMIC_LINKER "/lib/ld64-uClibc.so.0"
++#else
++#define ELF31_DYNAMIC_LINKER "/lib/ld.so.1"
++#define ELF64_DYNAMIC_LINKER "/lib/ld64.so.1"
++#endif
+ #undef  LINK_SPEC
+ #define LINK_SPEC \
+   "%{m31:-m elf_s390}%{m64:-m elf64_s390} \
+@@ -86,8 +93,8 @@
+       %{!static: \
+ 	%{rdynamic:-export-dynamic} \
+ 	%{!dynamic-linker: \
+-          %{m31:-dynamic-linker /lib/ld.so.1} \
+-          %{m64:-dynamic-linker /lib/ld64.so.1}}}}"
++          %{m31:-dynamic-linker " ELF31_DYNAMIC_LINKER "} \
++          %{m64:-dynamic-linker " ELF64_DYNAMIC_LINKER "}}}}"
+ 
+ 
+ #define TARGET_ASM_FILE_END file_end_indicate_exec_stack
+--- gcc-4.0.2/gcc/config/sh/linux.h
++++ gcc-4.0.2/gcc/config/sh/linux.h
+@@ -67,11 +67,16 @@
+ #undef SUBTARGET_LINK_EMUL_SUFFIX
+ #define SUBTARGET_LINK_EMUL_SUFFIX "_linux"
+ #undef SUBTARGET_LINK_SPEC
++#ifdef USE_UCLIBC
++#define ELF_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
++#else
++#define ELF_DYNAMIC_LINKER "/lib/ld-linux.so.2"
++#endif
+ #define SUBTARGET_LINK_SPEC \
+   "%{shared:-shared} \
+    %{!static: \
+      %{rdynamic:-export-dynamic} \
+-     %{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}} \
++     %{!dynamic-linker:-dynamic-linker " ELF_DYNAMIC_LINKER "}} \
+    %{static:-static}"
+ 
+ #undef LIB_SPEC
+--- gcc-4.0.2/gcc/config/sparc/linux.h
++++ gcc-4.0.2/gcc/config/sparc/linux.h
+@@ -130,14 +130,19 @@
+ 
+ /* If ELF is the default format, we should not use /lib/elf.  */
+ 
++#ifdef USE_UCLIBC
++#define ELF_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
++#else
++#define ELF_DYNAMIC_LINKER "/lib/ld-linux.so.2"
++#endif
+ #undef  LINK_SPEC
+ #define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
+   %{!mno-relax:%{!r:-relax}} \
+   %{!shared: \
+     %{!ibcs: \
+       %{!static: \
+         %{rdynamic:-export-dynamic} \
+-        %{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}} \
++        %{!dynamic-linker:-dynamic-linker " ELF_DYNAMIC_LINKER "}} \
+         %{static:-static}}}"
+ 
+ /* The sun bundled assembler doesn't accept -Yd, (and neither does gas).
+--- gcc-4.0.2/gcc/config/sparc/linux64.h
++++ gcc-4.0.2/gcc/config/sparc/linux64.h
+@@ -167,12 +166,17 @@
+   { "link_arch_default", LINK_ARCH_DEFAULT_SPEC },	  \
+   { "link_arch",	 LINK_ARCH_SPEC },
+     
++#ifdef USE_UCLIBC
++#define ELF_DYNAMIC_LINKER	"/lib/ld-uClibc.so.0"
++#else
++#define ELF_DYNAMIC_LINKER  "/lib/ld-linux.so.2"
++#endif
+ #define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
+   %{!shared: \
+     %{!ibcs: \
+       %{!static: \
+         %{rdynamic:-export-dynamic} \
+-        %{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}} \
++        %{!dynamic-linker:-dynamic-linker " ELF_DYNAMIC_LINKER "}} \
+         %{static:-static}}} \
+ "
+ 
+--- gcc-4.0.2/libtool.m4
++++ gcc-4.0.2/libtool.m4
+@@ -682,6 +682,11 @@
+   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]+$']
+--- gcc-4.0.2/ltconfig
++++ gcc-4.0.2/ltconfig
+@@ -603,6 +603,7 @@
+ 
+ # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
+ case $host_os in
++linux-uclibc*) ;;
+ linux-gnu*) ;;
+ linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
+ esac
+@@ -1274,6 +1275,23 @@
+   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.
++  hardcode_into_libs=yes
++  # Assume using the uClibc dynamic linker.
++  dynamic_linker="uClibc ld.so"
++  ;;
++
+ netbsd*)
+   need_lib_prefix=no
+   need_version=no
+--- gcc-4.0.2/libffi/configure
++++ gcc-4.0.2/libffi/configure
+@@ -3457,6 +3457,11 @@
+   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]+$'
+--- gcc-4.0.2/libgfortran/configure
++++ gcc-4.0.2/libgfortran/configure
+@@ -3681,6 +3681,11 @@
+   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]+$'
+--- gcc-4.0.2/libjava/configure
++++ gcc-4.0.2/libjava/configure
+@@ -4351,6 +4351,11 @@
+   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]+$'
+--- gcc-4.0.2/libmudflap/configure
++++ gcc-4.0.2/libmudflap/configure
+@@ -5380,6 +5380,11 @@
+   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]+$'
+--- gcc-4.0.2/libobjc/configure
++++ gcc-4.0.2/libobjc/configure
+@@ -3283,6 +3283,11 @@
+   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]+$'
+--- gcc-4.0.2/boehm-gc/configure
++++ gcc-4.0.2/boehm-gc/configure
+@@ -4320,6 +4320,11 @@
+   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]+$'
+--- gcc-4.0.2/configure
++++ gcc-4.0.2/configure
+@@ -1141,7 +1141,7 @@
+     ;;
+ "")
+     case "${target}" in
+-    *-*-linux*-gnu | *-*-gnu* | *-*-k*bsd*-gnu)
++    *-*-linux*-gnu | *-*-gnu* | *-*-k*bsd*-gnu | *-*-linux-uclibc*)
+         # Enable libmudflap by default in GNU and friends.
+ 	;;
+     *-*-freebsd*)
+--- gcc-4.0.2/configure.in
++++ gcc-4.0.2/configure.in
+@@ -350,7 +350,7 @@
+     ;;
+ "")
+     case "${target}" in
+-    *-*-linux*-gnu | *-*-gnu* | *-*-k*bsd*-gnu)
++    *-*-linux*-gnu | *-*-gnu* | *-*-k*bsd*-gnu | *-*-linux-uclibc*)
+         # Enable libmudflap by default in GNU and friends.
+ 	;;
+     *-*-freebsd*)
+--- gcc-4.0.2/contrib/regression/objs-gcc.sh
++++ gcc-4.0.2/contrib/regression/objs-gcc.sh
+@@ -105,6 +105,10 @@
+  then
+   make all-gdb all-dejagnu all-ld || exit 1
+   make install-gdb install-dejagnu install-ld || exit 1
++elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ]
++ then
++  make all-gdb all-dejagnu all-ld || exit 1
++  make install-gdb install-dejagnu install-ld || exit 1
+ elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
+   make bootstrap || exit 1
+   make install || exit 1
+--- gcc-4.0.2/zlib/configure
++++ gcc-4.0.2/zlib/configure
+@@ -3426,6 +3426,11 @@
+   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]+$'