uClibc haengt...

Viele Rootfiles erstellt. git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@327 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
2026-04-09 18:45:54 +02:00 · 2006-10-23 21:16:38 +00:00
parent c3db995cc9
commit 1d4ec104ef
57 changed files with 11512 additions and 144 deletions
--- a/config/kernel/kernel.config.i586
+++ b/config/kernel/kernel.config.i586
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.16
-# Thu Oct 12 18:40:40 2006
+# Linux kernel version: 2.6.16.27
+# Sat Oct 21 21:08:41 2006
 #
 CONFIG_X86_32=y
 CONFIG_SEMAPHORE_SLEEPERS=y
@@ -38,6 +38,7 @@ CONFIG_VM86=y
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 # CONFIG_EMBEDDED is not set
 CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
 # CONFIG_KALLSYMS_EXTRA_PASS is not set
 CONFIG_HOTPLUG=y
 CONFIG_PRINTK=y
@@ -256,6 +257,7 @@ CONFIG_PCI_DIRECT=y
 CONFIG_PCI_MMCONFIG=y
 CONFIG_PCIEPORTBUS=y
 # CONFIG_PCI_LEGACY_PROC is not set
+# CONFIG_PCI_DEBUG is not set
 CONFIG_ISA_DMA_API=y
 CONFIG_ISA=y
 CONFIG_EISA=y
@@ -389,9 +391,9 @@ CONFIG_IP_NF_CONNTRACK_NETLINK=m
 CONFIG_IP_NF_CT_PROTO_SCTP=m
 CONFIG_IP_NF_FTP=m
 CONFIG_IP_NF_IRC=m
-CONFIG_IP_NF_NETBIOS_NS=m
-CONFIG_IP_NF_TFTP=m
-CONFIG_IP_NF_AMANDA=m
+# CONFIG_IP_NF_NETBIOS_NS is not set
+# CONFIG_IP_NF_TFTP is not set
+# CONFIG_IP_NF_AMANDA is not set
 CONFIG_IP_NF_PPTP=m
 CONFIG_IP_NF_QUEUE=m

@@ -509,38 +511,12 @@ CONFIG_NET_ESTIMATOR=y
 # CONFIG_NET_PKTGEN is not set
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
-CONFIG_BT=m
-CONFIG_BT_L2CAP=m
-CONFIG_BT_SCO=m
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_CMTP=m
-CONFIG_BT_HIDP=m
-
-#
-# Bluetooth device drivers
-#
-CONFIG_BT_HCIUSB=m
-CONFIG_BT_HCIUSB_SCO=y
-CONFIG_BT_HCIUART=m
-CONFIG_BT_HCIUART_H4=y
-CONFIG_BT_HCIUART_BCSP=y
-CONFIG_BT_HCIBCM203X=m
-CONFIG_BT_HCIBPA10X=m
-CONFIG_BT_HCIBFUSB=m
-CONFIG_BT_HCIDTL1=m
-CONFIG_BT_HCIBT3C=m
-CONFIG_BT_HCIBLUECARD=m
-CONFIG_BT_HCIBTUART=m
-CONFIG_BT_HCIVHCI=m
+# CONFIG_BT is not set
 CONFIG_IEEE80211=m
 # CONFIG_IEEE80211_DEBUG is not set
 CONFIG_IEEE80211_CRYPT_WEP=m
-CONFIG_IEEE80211_CRYPT_CCMP=m
-CONFIG_IEEE80211_CRYPT_TKIP=m
+# CONFIG_IEEE80211_CRYPT_CCMP is not set
+# CONFIG_IEEE80211_CRYPT_TKIP is not set

 #
 # Device Drivers
@@ -552,6 +528,7 @@ CONFIG_IEEE80211_CRYPT_TKIP=m
 # CONFIG_STANDALONE is not set
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
 CONFIG_FW_LOADER=m
+# CONFIG_DEBUG_DRIVER is not set

 #
 # Connector - unified userspace <-> kernelspace linker
@@ -1241,9 +1218,7 @@ CONFIG_ATM_FORE200E_DEBUG=0
 CONFIG_ATM_FORE200E=m
 CONFIG_ATM_HE=m
 CONFIG_ATM_HE_USE_SUNI=y
-CONFIG_FDDI=y
-CONFIG_DEFXX=m
-CONFIG_SKFP=m
+# CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
 CONFIG_PPP=m
 CONFIG_PPP_MULTILINK=y
@@ -1517,8 +1492,40 @@ CONFIG_SENSORS_HDAPS=m
 #
 # Graphics support
 #
-# CONFIG_FB is not set
+CONFIG_FB=m
+# CONFIG_FB_CFB_FILLRECT is not set
+# CONFIG_FB_CFB_COPYAREA is not set
+# CONFIG_FB_CFB_IMAGEBLIT is not set
+# CONFIG_FB_MACMODES is not set
+# CONFIG_FB_MODE_HELPERS is not set
+# CONFIG_FB_TILEBLITTING is not set
+# CONFIG_FB_CIRRUS is not set
+# CONFIG_FB_PM2 is not set
+# CONFIG_FB_CYBER2000 is not set
+# CONFIG_FB_ARC is not set
+# CONFIG_FB_VGA16 is not set
 CONFIG_VIDEO_SELECT=y
+# CONFIG_FB_HGA is not set
+# CONFIG_FB_S1D13XXX is not set
+# CONFIG_FB_NVIDIA is not set
+# CONFIG_FB_RIVA is not set
+# CONFIG_FB_I810 is not set
+# CONFIG_FB_INTEL is not set
+# CONFIG_FB_MATROX is not set
+# CONFIG_FB_RADEON_OLD is not set
+# CONFIG_FB_RADEON is not set
+# CONFIG_FB_ATY128 is not set
+# CONFIG_FB_ATY is not set
+# CONFIG_FB_SAVAGE is not set
+# CONFIG_FB_SIS is not set
+# CONFIG_FB_NEOMAGIC is not set
+# CONFIG_FB_KYRO is not set
+# CONFIG_FB_3DFX is not set
+# CONFIG_FB_VOODOO1 is not set
+# CONFIG_FB_CYBLA is not set
+# CONFIG_FB_TRIDENT is not set
+# CONFIG_FB_GEODE is not set
+# CONFIG_FB_VIRTUAL is not set

 #
 # Console display driver support
@@ -1526,6 +1533,13 @@ CONFIG_VIDEO_SELECT=y
 CONFIG_VGA_CONSOLE=y
 # CONFIG_MDA_CONSOLE is not set
 CONFIG_DUMMY_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE is not set
+
+#
+# Logo configuration
+#
+# CONFIG_LOGO is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set

 #
 # Sound
@@ -1701,10 +1715,7 @@ CONFIG_USB_XUSBATM=m
 #
 # MMC/SD Card support
 #
-CONFIG_MMC=m
-# CONFIG_MMC_DEBUG is not set
-CONFIG_MMC_BLOCK=m
-CONFIG_MMC_WBSD=m
+# CONFIG_MMC is not set

 #
 # InfiniBand support
@@ -1720,14 +1731,19 @@ CONFIG_MMC_WBSD=m
 # File systems
 #
 # CONFIG_EXT2_FS is not set
-CONFIG_EXT3_FS=m
+CONFIG_EXT3_FS=y
 CONFIG_EXT3_FS_XATTR=y
 CONFIG_EXT3_FS_POSIX_ACL=y
 CONFIG_EXT3_FS_SECURITY=y
-CONFIG_JBD=m
+CONFIG_JBD=y
 # CONFIG_JBD_DEBUG is not set
-CONFIG_FS_MBCACHE=m
-# CONFIG_REISERFS_FS is not set
+CONFIG_FS_MBCACHE=y
+CONFIG_REISERFS_FS=y
+# CONFIG_REISERFS_CHECK is not set
+CONFIG_REISERFS_PROC_INFO=y
+CONFIG_REISERFS_FS_XATTR=y
+CONFIG_REISERFS_FS_POSIX_ACL=y
+CONFIG_REISERFS_FS_SECURITY=y
 # CONFIG_JFS_FS is not set
 CONFIG_FS_POSIX_ACL=y
 # CONFIG_XFS_FS is not set
@@ -1792,8 +1808,19 @@ CONFIG_RAMFS=y
 #
 # Network File Systems
 #
-# CONFIG_NFS_FS is not set
-# CONFIG_NFSD is not set
+CONFIG_NFS_FS=m
+# CONFIG_NFS_V3 is not set
+# CONFIG_NFS_V4 is not set
+# CONFIG_NFS_DIRECTIO is not set
+CONFIG_NFSD=m
+# CONFIG_NFSD_V3 is not set
+CONFIG_NFSD_TCP=y
+CONFIG_LOCKD=m
+CONFIG_EXPORTFS=m
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=m
+# CONFIG_RPCSEC_GSS_KRB5 is not set
+# CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_SMB_FS is not set
 # CONFIG_CIFS is not set
 # CONFIG_NCP_FS is not set
@@ -1862,10 +1889,29 @@ CONFIG_NLS_DEFAULT="cp437"
 #
 # CONFIG_PRINTK_TIME is not set
 # CONFIG_MAGIC_SYSRQ is not set
-# CONFIG_DEBUG_KERNEL is not set
+CONFIG_DEBUG_KERNEL=y
 CONFIG_LOG_BUF_SHIFT=14
+CONFIG_DETECT_SOFTLOCKUP=y
+# CONFIG_SCHEDSTATS is not set
+# CONFIG_DEBUG_SLAB is not set
+CONFIG_DEBUG_MUTEXES=y
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_KOBJECT is not set
+# CONFIG_DEBUG_HIGHMEM is not set
 CONFIG_DEBUG_BUGVERBOSE=y
+# CONFIG_DEBUG_INFO is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_DEBUG_VM is not set
+# CONFIG_FRAME_POINTER is not set
+CONFIG_FORCED_INLINING=y
+# CONFIG_RCU_TORTURE_TEST is not set
 CONFIG_EARLY_PRINTK=y
+CONFIG_DEBUG_STACKOVERFLOW=y
+# CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_DEBUG_PAGEALLOC is not set
+# CONFIG_DEBUG_RODATA is not set
+CONFIG_4KSTACKS=y

 #
 # Security options
--- a/config/rootfiles/common/bash
+++ b/config/rootfiles/common/bash
@@ -0,0 +1,5 @@
+bin/bash
+bin/bashbug
+#usr/info/bash.info
+#usr/man/man1/bash.1
+#usr/man/man1/bashbug.1
--- a/config/rootfiles/common/berkeley
+++ b/config/rootfiles/common/berkeley
--- a/config/rootfiles/common/fcron
+++ b/config/rootfiles/common/fcron
@@ -0,0 +1,94 @@
+etc/fcron.allow
+etc/fcron.conf
+etc/fcron.cyclic
+etc/fcron.daily
+etc/fcron.deny
+etc/fcron.hourly
+etc/fcron.minutely
+#etc/fcron.minutely/loadstat
+etc/fcron.monthly
+etc/fcron.weekly
+usr/bin/fcronsighup
+usr/bin/fcrontab
+usr/sbin/fcron
+#usr/share/doc/fcron-3.0.1
+#usr/share/doc/fcron-3.0.1/en
+#usr/share/doc/fcron-3.0.1/en/HTML
+#usr/share/doc/fcron-3.0.1/en/HTML/LEGALNOTICE.html
+#usr/share/doc/fcron-3.0.1/en/HTML/changes.html
+#usr/share/doc/fcron-3.0.1/en/HTML/faq.html
+#usr/share/doc/fcron-3.0.1/en/HTML/fcron.8.html
+#usr/share/doc/fcron-3.0.1/en/HTML/fcron.conf.5.html
+#usr/share/doc/fcron-3.0.1/en/HTML/fcrondyn.1.html
+#usr/share/doc/fcron-3.0.1/en/HTML/fcrontab.1.html
+#usr/share/doc/fcron-3.0.1/en/HTML/fcrontab.5.html
+#usr/share/doc/fcron-3.0.1/en/HTML/fdl.html
+#usr/share/doc/fcron-3.0.1/en/HTML/gpl.html
+#usr/share/doc/fcron-3.0.1/en/HTML/how-and-why.html
+#usr/share/doc/fcron-3.0.1/en/HTML/index.html
+#usr/share/doc/fcron-3.0.1/en/HTML/install.html
+#usr/share/doc/fcron-3.0.1/en/HTML/manpages.html
+#usr/share/doc/fcron-3.0.1/en/HTML/readme.html
+#usr/share/doc/fcron-3.0.1/en/HTML/relnotes.html
+#usr/share/doc/fcron-3.0.1/en/HTML/thanks.html
+#usr/share/doc/fcron-3.0.1/en/HTML/todo.html
+#usr/share/doc/fcron-3.0.1/en/HTML/using-fcron.html
+#usr/share/doc/fcron-3.0.1/en/txt
+#usr/share/doc/fcron-3.0.1/en/txt/changes.txt
+#usr/share/doc/fcron-3.0.1/en/txt/faq.txt
+#usr/share/doc/fcron-3.0.1/en/txt/gpl.txt
+#usr/share/doc/fcron-3.0.1/en/txt/install.txt
+#usr/share/doc/fcron-3.0.1/en/txt/readme.txt
+#usr/share/doc/fcron-3.0.1/en/txt/relnotes.txt
+#usr/share/doc/fcron-3.0.1/en/txt/thanks.txt
+#usr/share/doc/fcron-3.0.1/en/txt/todo.txt
+#usr/share/doc/fcron-3.0.1/fr
+#usr/share/doc/fcron-3.0.1/fr/HTML
+#usr/share/doc/fcron-3.0.1/fr/HTML/LEGALNOTICE.html
+#usr/share/doc/fcron-3.0.1/fr/HTML/changes.html
+#usr/share/doc/fcron-3.0.1/fr/HTML/faq.html
+#usr/share/doc/fcron-3.0.1/fr/HTML/fcron.8.html
+#usr/share/doc/fcron-3.0.1/fr/HTML/fcron.conf.5.html
+#usr/share/doc/fcron-3.0.1/fr/HTML/fcrondyn.1.html
+#usr/share/doc/fcron-3.0.1/fr/HTML/fcrontab.1.html
+#usr/share/doc/fcron-3.0.1/fr/HTML/fcrontab.5.html
+#usr/share/doc/fcron-3.0.1/fr/HTML/fdl.html
+#usr/share/doc/fcron-3.0.1/fr/HTML/gpl.html
+#usr/share/doc/fcron-3.0.1/fr/HTML/how-and-why.html
+#usr/share/doc/fcron-3.0.1/fr/HTML/index.html
+#usr/share/doc/fcron-3.0.1/fr/HTML/install.html
+#usr/share/doc/fcron-3.0.1/fr/HTML/manpages.html
+#usr/share/doc/fcron-3.0.1/fr/HTML/readme.html
+#usr/share/doc/fcron-3.0.1/fr/HTML/relnotes.html
+#usr/share/doc/fcron-3.0.1/fr/HTML/thanks.html
+#usr/share/doc/fcron-3.0.1/fr/HTML/todo.html
+#usr/share/doc/fcron-3.0.1/fr/HTML/using-fcron.html
+#usr/share/doc/fcron-3.0.1/fr/txt
+#usr/share/doc/fcron-3.0.1/fr/txt/changes.txt
+#usr/share/doc/fcron-3.0.1/fr/txt/faq.txt
+#usr/share/doc/fcron-3.0.1/fr/txt/gpl.txt
+#usr/share/doc/fcron-3.0.1/fr/txt/install.txt
+#usr/share/doc/fcron-3.0.1/fr/txt/readme.txt
+#usr/share/doc/fcron-3.0.1/fr/txt/relnotes.txt
+#usr/share/doc/fcron-3.0.1/fr/txt/thanks.txt
+#usr/share/doc/fcron-3.0.1/fr/txt/todo.txt
+#usr/share/man/fr
+#usr/share/man/fr/man1
+#usr/share/man/fr/man1/fcrondyn.1
+#usr/share/man/fr/man1/fcrontab.1
+#usr/share/man/fr/man3
+#usr/share/man/fr/man3/bitstring.3
+#usr/share/man/fr/man5
+#usr/share/man/fr/man5/fcron.conf.5
+#usr/share/man/fr/man5/fcrontab.5
+#usr/share/man/fr/man8
+#usr/share/man/fr/man8/fcron.8
+#usr/share/man/man1/fcrondyn.1
+#usr/share/man/man1/fcrontab.1
+#usr/share/man/man3/bitstring.3
+#usr/share/man/man5/fcron.conf.5
+#usr/share/man/man5/fcrontab.5
+#usr/share/man/man8/fcron.8
+var/spool/cron
+#var/spool/cron/new.root
+#var/spool/cron/root.orig
--- a/config/rootfiles/common/iana-etc
+++ b/config/rootfiles/common/iana-etc
@@ -0,0 +1,2 @@
+etc/protocols
+etc/services
--- a/config/rootfiles/common/inetutils
+++ b/config/rootfiles/common/inetutils
@@ -0,0 +1,41 @@
+bin/ping
+#usr/bin/ftp
+#usr/bin/rcp
+#usr/bin/rlogin
+#usr/bin/rsh
+#usr/bin/talk
+#usr/bin/telnet
+#usr/bin/tftp
+usr/bin/whois
+#usr/sbin/ftpd
+#usr/sbin/inetd
+#usr/sbin/rexecd
+#usr/sbin/rlogind
+#usr/sbin/rshd
+#usr/sbin/talkd
+#usr/sbin/telnetd
+#usr/sbin/tftpd
+#usr/sbin/uucpd
+#usr/share/info/inetutils.info
+#usr/share/info/inetutils.info-1
+#usr/share/info/inetutils.info-2
+#usr/share/info/inetutils.info-3
+#usr/share/man/man1/ftp.1
+#usr/share/man/man1/logger.1
+#usr/share/man/man1/rcp.1
+#usr/share/man/man1/rlogin.1
+#usr/share/man/man1/rsh.1
+#usr/share/man/man1/talk.1
+#usr/share/man/man1/telnet.1
+#usr/share/man/man1/tftp.1
+#usr/share/man/man5/syslog.conf.5
+#usr/share/man/man8/ftpd.8
+#usr/share/man/man8/inetd.8
+#usr/share/man/man8/ping.8
+#usr/share/man/man8/rexecd.8
+#usr/share/man/man8/rlogind.8
+#usr/share/man/man8/rshd.8
+#usr/share/man/man8/syslogd.8
+#usr/share/man/man8/talkd.8
+#usr/share/man/man8/telnetd.8
+#usr/share/man/man8/tftpd.8
--- a/config/rootfiles/common/ipac-ng
+++ b/config/rootfiles/common/ipac-ng
@@ -0,0 +1,11 @@
+#bin/mail
+#etc/ipac-ng
+etc/ipac-ng/ipac.conf
+etc/ipac-ng/rules.conf
+#usr/man/man8/fetchipac.8
+#usr/man/man8/ipac-convert.8
+#usr/man/man8/ipacsum.8
+usr/sbin/fetchipac
+usr/sbin/ipac-convert
+#usr/sbin/ipacsum
+var/log/ip-acct
--- a/config/rootfiles/common/ipaddr
+++ b/config/rootfiles/common/ipaddr
@@ -0,0 +1,2 @@
+usr/lib/python2.4/ipaddr.py
+usr/lib/python2.4/ipaddr.pyc
--- a/config/rootfiles/common/iproute2
+++ b/config/rootfiles/common/iproute2
@@ -0,0 +1,72 @@
+#etc/iproute2
+etc/iproute2/ematch_map
+etc/iproute2/rt_dsfield
+etc/iproute2/rt_protos
+etc/iproute2/rt_realms
+etc/iproute2/rt_scopes
+etc/iproute2/rt_tables
+sbin/ctstat
+sbin/ifcfg
+sbin/ifstat
+sbin/ip
+sbin/lnstat
+sbin/nstat
+sbin/routef
+sbin/routel
+sbin/rtacct
+sbin/rtmon
+sbin/rtpr
+sbin/rtstat
+sbin/ss
+sbin/tc
+#usr/lib/tc
+#usr/lib/tc/experimental.dist
+#usr/lib/tc/normal.dist
+#usr/lib/tc/pareto.dist
+#usr/lib/tc/paretonormal.dist
+#usr/lib/tc/q_netem.so
+usr/sbin/arpd
+#usr/share/doc/iproute2
+#usr/share/doc/iproute2/SNAPSHOT.tex
+#usr/share/doc/iproute2/api-ip6-flowlabels.tex
+#usr/share/doc/iproute2/arpd.sgml
+#usr/share/doc/iproute2/examples
+#usr/share/doc/iproute2/examples/README.cbq
+#usr/share/doc/iproute2/examples/README.iproute2#tc
+#usr/share/doc/iproute2/examples/SYN-DoS.rate.limit
+#usr/share/doc/iproute2/examples/cbq.init-v0.7.3
+#usr/share/doc/iproute2/examples/cbqinit.eth1
+#usr/share/doc/iproute2/examples/dhcp-client-script
+#usr/share/doc/iproute2/examples/diffserv
+#usr/share/doc/iproute2/examples/diffserv/Edge1
+#usr/share/doc/iproute2/examples/diffserv/Edge2
+#usr/share/doc/iproute2/examples/diffserv/Edge31-ca-u32
+#usr/share/doc/iproute2/examples/diffserv/Edge31-cb-chains
+#usr/share/doc/iproute2/examples/diffserv/Edge32-ca-u32
+#usr/share/doc/iproute2/examples/diffserv/Edge32-cb-chains
+#usr/share/doc/iproute2/examples/diffserv/Edge32-cb-u32
+#usr/share/doc/iproute2/examples/diffserv/README
+#usr/share/doc/iproute2/examples/diffserv/afcbq
+#usr/share/doc/iproute2/examples/diffserv/ef-prio
+#usr/share/doc/iproute2/examples/diffserv/efcbq
+#usr/share/doc/iproute2/examples/diffserv/regression-testing
+#usr/share/doc/iproute2/ip-cref.tex
+#usr/share/doc/iproute2/ip-tunnels.tex
+#usr/share/doc/iproute2/nstat.sgml
+#usr/share/doc/iproute2/preamble.tex
+#usr/share/doc/iproute2/rtstat.sgml
+#usr/share/doc/iproute2/ss.sgml
+#usr/share/man/man3/libnetlink.3
+#usr/share/man/man8/ip.8
+#usr/share/man/man8/tc-bfifo.8
+#usr/share/man/man8/tc-cbq-details.8
+#usr/share/man/man8/tc-cbq.8
+#usr/share/man/man8/tc-htb.8
+#usr/share/man/man8/tc-pbfifo.8
+#usr/share/man/man8/tc-pfifo.8
+#usr/share/man/man8/tc-pfifo_fast.8
+#usr/share/man/man8/tc-prio.8
+#usr/share/man/man8/tc-red.8
+#usr/share/man/man8/tc-sfq.8
+#usr/share/man/man8/tc-tbf.8
+#usr/share/man/man8/tc.8
--- a/config/rootfiles/common/iptables
+++ b/config/rootfiles/common/iptables
@@ -0,0 +1,62 @@
+#lib/iptables
+lib/iptables/libipt_CLASSIFY.so
+lib/iptables/libipt_CONNMARK.so
+lib/iptables/libipt_DNAT.so
+lib/iptables/libipt_DSCP.so
+lib/iptables/libipt_ECN.so
+lib/iptables/libipt_LOG.so
+lib/iptables/libipt_MARK.so
+lib/iptables/libipt_MASQUERADE.so
+lib/iptables/libipt_MIRROR.so
+lib/iptables/libipt_NETMAP.so
+lib/iptables/libipt_NFQUEUE.so
+lib/iptables/libipt_NOTRACK.so
+lib/iptables/libipt_REDIRECT.so
+lib/iptables/libipt_REJECT.so
+lib/iptables/libipt_SAME.so
+lib/iptables/libipt_SNAT.so
+lib/iptables/libipt_TARPIT.so
+lib/iptables/libipt_TCPMSS.so
+lib/iptables/libipt_TOS.so
+lib/iptables/libipt_TRACE.so
+lib/iptables/libipt_TTL.so
+lib/iptables/libipt_ULOG.so
+lib/iptables/libipt_addrtype.so
+lib/iptables/libipt_ah.so
+lib/iptables/libipt_comment.so
+lib/iptables/libipt_connlimit.so
+lib/iptables/libipt_connmark.so
+lib/iptables/libipt_conntrack.so
+lib/iptables/libipt_dscp.so
+lib/iptables/libipt_ecn.so
+lib/iptables/libipt_esp.so
+lib/iptables/libipt_hashlimit.so
+lib/iptables/libipt_helper.so
+lib/iptables/libipt_icmp.so
+lib/iptables/libipt_iprange.so
+lib/iptables/libipt_length.so
+lib/iptables/libipt_limit.so
+lib/iptables/libipt_mac.so
+lib/iptables/libipt_mark.so
+lib/iptables/libipt_multiport.so
+lib/iptables/libipt_owner.so
+lib/iptables/libipt_physdev.so
+lib/iptables/libipt_pkttype.so
+lib/iptables/libipt_policy.so
+lib/iptables/libipt_realm.so
+lib/iptables/libipt_rpc.so
+lib/iptables/libipt_sctp.so
+lib/iptables/libipt_standard.so
+lib/iptables/libipt_state.so
+lib/iptables/libipt_tcp.so
+lib/iptables/libipt_tcpmss.so
+lib/iptables/libipt_tos.so
+lib/iptables/libipt_ttl.so
+lib/iptables/libipt_udp.so
+lib/iptables/libipt_unclean.so
+sbin/iptables
+sbin/iptables-restore
+sbin/iptables-save
+#usr/share/man/man8/iptables-restore.8
+#usr/share/man/man8/iptables-save.8
+#usr/share/man/man8/iptables.8
--- a/config/rootfiles/common/iptstate
+++ b/config/rootfiles/common/iptstate
@@ -0,0 +1,2 @@
+usr/sbin/iptstate
+#usr/share/man/man8/iptstate.8
--- a/config/rootfiles/common/iputils
+++ b/config/rootfiles/common/iputils
@@ -0,0 +1 @@
+usr/bin/ping
--- a/config/rootfiles/common/kbd
+++ b/config/rootfiles/common/kbd
@@ -0,0 +1,598 @@
+bin/kbd_mode
+bin/loadkeys
+bin/openvt
+bin/setfont
+#lib/kbd
+lib/kbd/consolefonts
+#lib/kbd/consolefonts/161.cp.gz
+#lib/kbd/consolefonts/162.cp.gz
+#lib/kbd/consolefonts/163.cp.gz
+#lib/kbd/consolefonts/164.cp.gz
+#lib/kbd/consolefonts/165.cp.gz
+#lib/kbd/consolefonts/737.cp.gz
+#lib/kbd/consolefonts/880.cp.gz
+#lib/kbd/consolefonts/928.cp.gz
+#lib/kbd/consolefonts/972.cp.gz
+#lib/kbd/consolefonts/Agafari-12.psfu.gz
+#lib/kbd/consolefonts/Agafari-14.psfu.gz
+#lib/kbd/consolefonts/Agafari-16.psfu.gz
+#lib/kbd/consolefonts/Cyr_a8x14.psfu.gz
+#lib/kbd/consolefonts/Cyr_a8x16.psfu.gz
+#lib/kbd/consolefonts/Cyr_a8x8.psfu.gz
+#lib/kbd/consolefonts/ERRORS
+#lib/kbd/consolefonts/Goha-12.psfu.gz
+#lib/kbd/consolefonts/Goha-14.psfu.gz
+#lib/kbd/consolefonts/Goha-16.psfu.gz
+#lib/kbd/consolefonts/GohaClassic-12.psfu.gz
+#lib/kbd/consolefonts/GohaClassic-14.psfu.gz
+#lib/kbd/consolefonts/GohaClassic-16.psfu.gz
+#lib/kbd/consolefonts/LatArCyrHeb-08.psfu.gz
+#lib/kbd/consolefonts/LatArCyrHeb-14.psfu.gz
+#lib/kbd/consolefonts/LatArCyrHeb-16#.psfu.gz
+#lib/kbd/consolefonts/LatArCyrHeb-16.psfu.gz
+#lib/kbd/consolefonts/LatArCyrHeb-19.psfu.gz
+#lib/kbd/consolefonts/Mik_8x16.gz
+#lib/kbd/consolefonts/README.12x22
+#lib/kbd/consolefonts/README.Arabic
+#lib/kbd/consolefonts/README.Cyrillic
+#lib/kbd/consolefonts/README.Ethiopic
+#lib/kbd/consolefonts/README.Greek
+#lib/kbd/consolefonts/README.Hebrew
+#lib/kbd/consolefonts/README.cp1250
+#lib/kbd/consolefonts/README.cybercafe
+#lib/kbd/consolefonts/README.drdos
+#lib/kbd/consolefonts/README.lat0
+#lib/kbd/consolefonts/README.lat7
+#lib/kbd/consolefonts/README.lat9
+#lib/kbd/consolefonts/README.psfu
+#lib/kbd/consolefonts/alt-8x14.gz
+#lib/kbd/consolefonts/alt-8x16.gz
+#lib/kbd/consolefonts/alt-8x8.gz
+#lib/kbd/consolefonts/altc-8x16.gz
+#lib/kbd/consolefonts/aply16.psf.gz
+#lib/kbd/consolefonts/arm8.fnt.gz
+#lib/kbd/consolefonts/cp1250.psfu.gz
+#lib/kbd/consolefonts/cp850-8x14.psfu.gz
+#lib/kbd/consolefonts/cp850-8x16.psfu.gz
+#lib/kbd/consolefonts/cp850-8x8.psfu.gz
+#lib/kbd/consolefonts/cp857.08.gz
+#lib/kbd/consolefonts/cp857.14.gz
+#lib/kbd/consolefonts/cp857.16.gz
+#lib/kbd/consolefonts/cp865-8x14.psfu.gz
+#lib/kbd/consolefonts/cp865-8x16.psfu.gz
+#lib/kbd/consolefonts/cp865-8x8.psfu.gz
+#lib/kbd/consolefonts/cp866-8x14.psf.gz
+#lib/kbd/consolefonts/cp866-8x16.psf.gz
+#lib/kbd/consolefonts/cp866-8x8.psf.gz
+#lib/kbd/consolefonts/cybercafe.fnt.gz
+#lib/kbd/consolefonts/cyr-sun16.psfu.gz
+#lib/kbd/consolefonts/default8x16.psfu.gz
+#lib/kbd/consolefonts/default8x9.psfu.gz
+#lib/kbd/consolefonts/drdos8x14.psfu.gz
+#lib/kbd/consolefonts/drdos8x16.psfu.gz
+#lib/kbd/consolefonts/drdos8x6.psfu.gz
+#lib/kbd/consolefonts/drdos8x8.psfu.gz
+#lib/kbd/consolefonts/gr737a-8x8.psfu.gz
+#lib/kbd/consolefonts/gr737a-9x14.psfu.gz
+#lib/kbd/consolefonts/gr737a-9x16.psfu.gz
+#lib/kbd/consolefonts/gr737b-8x11.psfu.gz
+#lib/kbd/consolefonts/gr737b-9x16-medieval.psfu.gz
+#lib/kbd/consolefonts/gr737c-8x14.psfu.gz
+#lib/kbd/consolefonts/gr737c-8x16.psfu.gz
+#lib/kbd/consolefonts/gr737c-8x6.psfu.gz
+#lib/kbd/consolefonts/gr737c-8x7.psfu.gz
+#lib/kbd/consolefonts/gr737c-8x8.psfu.gz
+#lib/kbd/consolefonts/gr737d-8x16.psfu.gz
+#lib/kbd/consolefonts/gr928-8x16-thin.psfu.gz
+#lib/kbd/consolefonts/gr928-9x14.psfu.gz
+#lib/kbd/consolefonts/gr928-9x16.psfu.gz
+#lib/kbd/consolefonts/gr928a-8x14.psfu.gz
+#lib/kbd/consolefonts/gr928a-8x16.psfu.gz
+#lib/kbd/consolefonts/gr928b-8x14.psfu.gz
+#lib/kbd/consolefonts/gr928b-8x16.psfu.gz
+#lib/kbd/consolefonts/greek-polytonic.psfu.gz
+#lib/kbd/consolefonts/iso01-12x22.psfu.gz
+#lib/kbd/consolefonts/iso01.08.gz
+#lib/kbd/consolefonts/iso01.14.gz
+#lib/kbd/consolefonts/iso01.16.gz
+#lib/kbd/consolefonts/iso02-12x22.psfu.gz
+#lib/kbd/consolefonts/iso02.08.gz
+#lib/kbd/consolefonts/iso02.14.gz
+#lib/kbd/consolefonts/iso02.16.gz
+#lib/kbd/consolefonts/iso03.08.gz
+#lib/kbd/consolefonts/iso03.14.gz
+#lib/kbd/consolefonts/iso03.16.gz
+#lib/kbd/consolefonts/iso04.08.gz
+#lib/kbd/consolefonts/iso04.14.gz
+#lib/kbd/consolefonts/iso04.16.gz
+#lib/kbd/consolefonts/iso05.08.gz
+#lib/kbd/consolefonts/iso05.14.gz
+#lib/kbd/consolefonts/iso05.16.gz
+#lib/kbd/consolefonts/iso06.08.gz
+#lib/kbd/consolefonts/iso06.14.gz
+#lib/kbd/consolefonts/iso06.16.gz
+#lib/kbd/consolefonts/iso07.14.gz
+#lib/kbd/consolefonts/iso07.16.gz
+#lib/kbd/consolefonts/iso07u-16.psfu.gz
+#lib/kbd/consolefonts/iso08.08.gz
+#lib/kbd/consolefonts/iso08.14.gz
+#lib/kbd/consolefonts/iso08.16.gz
+#lib/kbd/consolefonts/iso09.08.gz
+#lib/kbd/consolefonts/iso09.14.gz
+#lib/kbd/consolefonts/iso09.16.gz
+#lib/kbd/consolefonts/iso10.08.gz
+#lib/kbd/consolefonts/iso10.14.gz
+#lib/kbd/consolefonts/iso10.16.gz
+#lib/kbd/consolefonts/koi8-14.psf.gz
+#lib/kbd/consolefonts/koi8c-8x16.gz
+#lib/kbd/consolefonts/koi8r-8x14.gz
+#lib/kbd/consolefonts/koi8r-8x16.gz
+#lib/kbd/consolefonts/koi8r-8x8.gz
+#lib/kbd/consolefonts/koi8r.8x8.psfu.gz
+#lib/kbd/consolefonts/koi8u_8x14.psfu.gz
+#lib/kbd/consolefonts/koi8u_8x16.psfu.gz
+#lib/kbd/consolefonts/koi8u_8x8.psfu.gz
+#lib/kbd/consolefonts/lat0-08.psfu.gz
+#lib/kbd/consolefonts/lat0-10.psfu.gz
+#lib/kbd/consolefonts/lat0-12.psfu.gz
+#lib/kbd/consolefonts/lat0-14.psfu.gz
+#lib/kbd/consolefonts/lat0-16.psfu.gz
+#lib/kbd/consolefonts/lat1-08.psfu.gz
+#lib/kbd/consolefonts/lat1-10.psfu.gz
+#lib/kbd/consolefonts/lat1-12.psfu.gz
+#lib/kbd/consolefonts/lat1-14.psfu.gz
+#lib/kbd/consolefonts/lat1-16.psfu.gz
+#lib/kbd/consolefonts/lat2-08.psfu.gz
+#lib/kbd/consolefonts/lat2-10.psfu.gz
+#lib/kbd/consolefonts/lat2-12.psfu.gz
+#lib/kbd/consolefonts/lat2-14.psfu.gz
+#lib/kbd/consolefonts/lat2-16.psfu.gz
+#lib/kbd/consolefonts/lat2a-16.psfu.gz
+#lib/kbd/consolefonts/lat4-08.psfu.gz
+#lib/kbd/consolefonts/lat4-10.psfu.gz
+#lib/kbd/consolefonts/lat4-12.psfu.gz
+#lib/kbd/consolefonts/lat4-14.psfu.gz
+#lib/kbd/consolefonts/lat4-16#.psfu.gz
+#lib/kbd/consolefonts/lat4-16.psfu.gz
+#lib/kbd/consolefonts/lat4-19.psfu.gz
+#lib/kbd/consolefonts/lat4a-08.psfu.gz
+#lib/kbd/consolefonts/lat4a-10.psfu.gz
+#lib/kbd/consolefonts/lat4a-12.psfu.gz
+#lib/kbd/consolefonts/lat4a-14.psfu.gz
+#lib/kbd/consolefonts/lat4a-16#.psfu.gz
+#lib/kbd/consolefonts/lat4a-16.psfu.gz
+#lib/kbd/consolefonts/lat4a-19.psfu.gz
+#lib/kbd/consolefonts/lat5-12.psfu.gz
+#lib/kbd/consolefonts/lat5-14.psfu.gz
+#lib/kbd/consolefonts/lat5-16.psfu.gz
+#lib/kbd/consolefonts/lat7-14.psfu.gz
+#lib/kbd/consolefonts/lat7a-14.psfu.gz
+#lib/kbd/consolefonts/lat7a-16.psf.gz
+#lib/kbd/consolefonts/lat9-08.psf.gz
+#lib/kbd/consolefonts/lat9-10.psf.gz
+#lib/kbd/consolefonts/lat9-12.psf.gz
+#lib/kbd/consolefonts/lat9-14.psf.gz
+#lib/kbd/consolefonts/lat9-16.psf.gz
+#lib/kbd/consolefonts/lat9u-08.psfu.gz
+#lib/kbd/consolefonts/lat9u-10.psfu.gz
+#lib/kbd/consolefonts/lat9u-12.psfu.gz
+#lib/kbd/consolefonts/lat9u-14.psfu.gz
+#lib/kbd/consolefonts/lat9u-16.psfu.gz
+#lib/kbd/consolefonts/lat9v-08.psfu.gz
+#lib/kbd/consolefonts/lat9v-10.psfu.gz
+#lib/kbd/consolefonts/lat9v-12.psfu.gz
+#lib/kbd/consolefonts/lat9v-14.psfu.gz
+#lib/kbd/consolefonts/lat9v-16.psfu.gz
+#lib/kbd/consolefonts/lat9w-08.psfu.gz
+#lib/kbd/consolefonts/lat9w-10.psfu.gz
+#lib/kbd/consolefonts/lat9w-12.psfu.gz
+#lib/kbd/consolefonts/lat9w-14.psfu.gz
+#lib/kbd/consolefonts/lat9w-16.psfu.gz
+#lib/kbd/consolefonts/partialfonts
+#lib/kbd/consolefonts/partialfonts/8859-1.a0-ff.08.gz
+#lib/kbd/consolefonts/partialfonts/8859-1.a0-ff.14.gz
+#lib/kbd/consolefonts/partialfonts/8859-1.a0-ff.16.gz
+#lib/kbd/consolefonts/partialfonts/8859-10.a0-ff.08.gz
+#lib/kbd/consolefonts/partialfonts/8859-10.a0-ff.14.gz
+#lib/kbd/consolefonts/partialfonts/8859-10.a0-ff.16.gz
+#lib/kbd/consolefonts/partialfonts/8859-2.a0-ff.08.gz
+#lib/kbd/consolefonts/partialfonts/8859-2.a0-ff.14.gz
+#lib/kbd/consolefonts/partialfonts/8859-2.a0-ff.16.gz
+#lib/kbd/consolefonts/partialfonts/8859-3.a0-ff.08.gz
+#lib/kbd/consolefonts/partialfonts/8859-3.a0-ff.14.gz
+#lib/kbd/consolefonts/partialfonts/8859-3.a0-ff.16.gz
+#lib/kbd/consolefonts/partialfonts/8859-4.a0-ff.08.gz
+#lib/kbd/consolefonts/partialfonts/8859-4.a0-ff.14.gz
+#lib/kbd/consolefonts/partialfonts/8859-4.a0-ff.16.gz
+#lib/kbd/consolefonts/partialfonts/8859-5.a0-ff.08.gz
+#lib/kbd/consolefonts/partialfonts/8859-5.a0-ff.14.gz
+#lib/kbd/consolefonts/partialfonts/8859-5.a0-ff.16.gz
+#lib/kbd/consolefonts/partialfonts/8859-6.a0-ff.08.gz
+#lib/kbd/consolefonts/partialfonts/8859-6.a0-ff.14.gz
+#lib/kbd/consolefonts/partialfonts/8859-6.a0-ff.16.gz
+#lib/kbd/consolefonts/partialfonts/8859-7.a0-ff.08.gz
+#lib/kbd/consolefonts/partialfonts/8859-7.a0-ff.14.gz
+#lib/kbd/consolefonts/partialfonts/8859-7.a0-ff.16.gz
+#lib/kbd/consolefonts/partialfonts/8859-8.a0-ff.08.gz
+#lib/kbd/consolefonts/partialfonts/8859-8.a0-ff.14.gz
+#lib/kbd/consolefonts/partialfonts/8859-8.a0-ff.16.gz
+#lib/kbd/consolefonts/partialfonts/8859-9.a0-ff.08.gz
+#lib/kbd/consolefonts/partialfonts/8859-9.a0-ff.14.gz
+#lib/kbd/consolefonts/partialfonts/8859-9.a0-ff.16.gz
+#lib/kbd/consolefonts/partialfonts/ascii.20-7f.08.gz
+#lib/kbd/consolefonts/partialfonts/ascii.20-7f.14.gz
+#lib/kbd/consolefonts/partialfonts/ascii.20-7f.16.gz
+#lib/kbd/consolefonts/partialfonts/cp437.00-1f.08.gz
+#lib/kbd/consolefonts/partialfonts/cp437.00-1f.14.gz
+#lib/kbd/consolefonts/partialfonts/cp437.00-1f.16.gz
+#lib/kbd/consolefonts/partialfonts/none.00-17.08.gz
+#lib/kbd/consolefonts/partialfonts/none.00-17.14.gz
+#lib/kbd/consolefonts/partialfonts/none.00-17.16.gz
+#lib/kbd/consolefonts/ruscii_8x16.psfu.gz
+#lib/kbd/consolefonts/ruscii_8x8.psfu.gz
+#lib/kbd/consolefonts/sun12x22.psfu.gz
+#lib/kbd/consolefonts/t.fnt.gz
+#lib/kbd/consolefonts/t850b.fnt.gz
+#lib/kbd/consolefonts/tcvn8x16.psf.gz
+#lib/kbd/consolefonts/viscii10-8x16.psfu.gz
+#lib/kbd/consoletrans
+#lib/kbd/consoletrans/8859-10_to_uni.trans
+#lib/kbd/consoletrans/8859-13_to_uni.trans
+#lib/kbd/consoletrans/8859-14_to_uni.trans
+#lib/kbd/consoletrans/8859-15_to_uni.trans
+#lib/kbd/consoletrans/8859-1_to_uni.trans
+#lib/kbd/consoletrans/8859-2_to_uni.trans
+#lib/kbd/consoletrans/8859-3_to_uni.trans
+#lib/kbd/consoletrans/8859-4_to_uni.trans
+#lib/kbd/consoletrans/8859-5_to_uni.trans
+#lib/kbd/consoletrans/8859-6_to_uni.trans
+#lib/kbd/consoletrans/8859-7_to_uni.trans
+#lib/kbd/consoletrans/8859-8_to_uni.trans
+#lib/kbd/consoletrans/8859-9_to_uni.trans
+#lib/kbd/consoletrans/baltic.trans
+#lib/kbd/consoletrans/cp1250_to_uni.trans
+#lib/kbd/consoletrans/cp1251_to_uni.trans
+#lib/kbd/consoletrans/cp437_to_iso01.trans
+#lib/kbd/consoletrans/cp437_to_uni.trans
+#lib/kbd/consoletrans/cp737_to_uni.trans
+#lib/kbd/consoletrans/cp775_to_uni.trans
+#lib/kbd/consoletrans/cp850_to_iso01.trans
+#lib/kbd/consoletrans/cp850_to_uni.trans
+#lib/kbd/consoletrans/cp852_to_uni.trans
+#lib/kbd/consoletrans/cp853_to_uni.trans
+#lib/kbd/consoletrans/cp855_to_uni.trans
+#lib/kbd/consoletrans/cp857_to_uni.trans
+#lib/kbd/consoletrans/cp860_to_uni.trans
+#lib/kbd/consoletrans/cp861_to_uni.trans
+#lib/kbd/consoletrans/cp862_to_uni.trans
+#lib/kbd/consoletrans/cp863_to_uni.trans
+#lib/kbd/consoletrans/cp864_to_uni.trans
+#lib/kbd/consoletrans/cp865_to_uni.trans
+#lib/kbd/consoletrans/cp866_to_uni.trans
+#lib/kbd/consoletrans/cp869_to_uni.trans
+#lib/kbd/consoletrans/cp874_to_uni.trans
+#lib/kbd/consoletrans/iso02_to_cp1250.trans
+#lib/kbd/consoletrans/koi2alt
+#lib/kbd/consoletrans/koi8-r_to_uni.trans
+#lib/kbd/consoletrans/koi8-u_to_uni.trans
+#lib/kbd/consoletrans/koi8u2ruscii
+#lib/kbd/consoletrans/latin2u.trans
+#lib/kbd/consoletrans/null
+#lib/kbd/consoletrans/space
+#lib/kbd/consoletrans/trivial
+#lib/kbd/consoletrans/utflist
+#lib/kbd/consoletrans/vga2iso
+#lib/kbd/consoletrans/viscii1.0_to_tcvn.trans
+#lib/kbd/consoletrans/viscii1.0_to_viscii1.1.trans
+#lib/kbd/consoletrans/zero
+lib/kbd/keymaps
+#lib/kbd/keymaps/amiga
+#lib/kbd/keymaps/amiga/amiga-de.map.gz
+#lib/kbd/keymaps/amiga/amiga-us.map.gz
+#lib/kbd/keymaps/atari
+#lib/kbd/keymaps/atari/atari-de.map.gz
+#lib/kbd/keymaps/atari/atari-se.map.gz
+#lib/kbd/keymaps/atari/atari-uk-falcon.map.gz
+#lib/kbd/keymaps/atari/atari-us.map.gz
+#lib/kbd/keymaps/i386
+#lib/kbd/keymaps/i386/azerty
+#lib/kbd/keymaps/i386/azerty/azerty.map.gz
+#lib/kbd/keymaps/i386/azerty/be-latin1.map.gz
+#lib/kbd/keymaps/i386/azerty/fr-latin1.map.gz
+#lib/kbd/keymaps/i386/azerty/fr-latin9.map.gz
+#lib/kbd/keymaps/i386/azerty/fr-pc.map.gz
+#lib/kbd/keymaps/i386/azerty/fr.map.gz
+#lib/kbd/keymaps/i386/azerty/wangbe.map.gz
+#lib/kbd/keymaps/i386/azerty/wangbe2.map.gz
+#lib/kbd/keymaps/i386/dvorak
+#lib/kbd/keymaps/i386/dvorak/ANSI-dvorak.map.gz
+#lib/kbd/keymaps/i386/dvorak/dvorak-l.map.gz
+#lib/kbd/keymaps/i386/dvorak/dvorak-r.map.gz
+#lib/kbd/keymaps/i386/dvorak/dvorak.map.gz
+#lib/kbd/keymaps/i386/fgGIod
+#lib/kbd/keymaps/i386/fgGIod/tr_f-latin5.map.gz
+#lib/kbd/keymaps/i386/fgGIod/trf.map.gz
+#lib/kbd/keymaps/i386/include
+#lib/kbd/keymaps/i386/include/applkey.map.gz
+#lib/kbd/keymaps/i386/include/azerty-layout.inc
+#lib/kbd/keymaps/i386/include/backspace.map.gz
+#lib/kbd/keymaps/i386/include/ctrl.map.gz
+#lib/kbd/keymaps/i386/include/euro.map.gz
+#lib/kbd/keymaps/i386/include/euro1.inc
+#lib/kbd/keymaps/i386/include/euro1.map.gz
+#lib/kbd/keymaps/i386/include/euro2.map.gz
+#lib/kbd/keymaps/i386/include/keypad.map.gz
+#lib/kbd/keymaps/i386/include/linux-keys-bare.inc
+#lib/kbd/keymaps/i386/include/linux-keys-extd.inc
+#lib/kbd/keymaps/i386/include/linux-with-alt-and-altgr.inc
+#lib/kbd/keymaps/i386/include/linux-with-modeshift-altgr.inc
+#lib/kbd/keymaps/i386/include/linux-with-two-alt-keys.inc
+#lib/kbd/keymaps/i386/include/qwerty-layout.inc
+#lib/kbd/keymaps/i386/include/qwertz-layout.inc
+#lib/kbd/keymaps/i386/include/unicode.map.gz
+#lib/kbd/keymaps/i386/include/windowkeys.map.gz
+#lib/kbd/keymaps/i386/qwerty
+#lib/kbd/keymaps/i386/qwerty/bg-cp1251.map.gz
+#lib/kbd/keymaps/i386/qwerty/bg-cp855.map.gz
+#lib/kbd/keymaps/i386/qwerty/bg_bds-cp1251.map.gz
+#lib/kbd/keymaps/i386/qwerty/bg_bds-utf8.map.gz
+#lib/kbd/keymaps/i386/qwerty/bg_pho-cp1251.map.gz
+#lib/kbd/keymaps/i386/qwerty/bg_pho-utf8.map.gz
+#lib/kbd/keymaps/i386/qwerty/br-abnt.map.gz
+#lib/kbd/keymaps/i386/qwerty/br-abnt2.map.gz
+#lib/kbd/keymaps/i386/qwerty/br-latin1-abnt2.map.gz
+#lib/kbd/keymaps/i386/qwerty/br-latin1-us.map.gz
+#lib/kbd/keymaps/i386/qwerty/by.map.gz
+#lib/kbd/keymaps/i386/qwerty/cf.map.gz
+#lib/kbd/keymaps/i386/qwerty/cz-cp1250.map.gz
+#lib/kbd/keymaps/i386/qwerty/cz-lat2-prog.map.gz
+#lib/kbd/keymaps/i386/qwerty/cz-lat2.map.gz
+#lib/kbd/keymaps/i386/qwerty/cz.map.gz
+#lib/kbd/keymaps/i386/qwerty/defkeymap.map.gz
+#lib/kbd/keymaps/i386/qwerty/defkeymap_V1.0.map.gz
+#lib/kbd/keymaps/i386/qwerty/dk-latin1.map.gz
+#lib/kbd/keymaps/i386/qwerty/dk.map.gz
+#lib/kbd/keymaps/i386/qwerty/emacs.map.gz
+#lib/kbd/keymaps/i386/qwerty/emacs2.map.gz
+#lib/kbd/keymaps/i386/qwerty/es-cp850.map.gz
+#lib/kbd/keymaps/i386/qwerty/es.map.gz
+#lib/kbd/keymaps/i386/qwerty/et-nodeadkeys.map.gz
+#lib/kbd/keymaps/i386/qwerty/et.map.gz
+#lib/kbd/keymaps/i386/qwerty/fi-latin1.map.gz
+#lib/kbd/keymaps/i386/qwerty/fi-latin9.map.gz
+#lib/kbd/keymaps/i386/qwerty/fi.map.gz
+#lib/kbd/keymaps/i386/qwerty/gr-pc.map.gz
+#lib/kbd/keymaps/i386/qwerty/gr.map.gz
+#lib/kbd/keymaps/i386/qwerty/hu101.map.gz
+#lib/kbd/keymaps/i386/qwerty/hypermap.m4
+#lib/kbd/keymaps/i386/qwerty/il-heb.map.gz
+#lib/kbd/keymaps/i386/qwerty/il-phonetic.map.gz
+#lib/kbd/keymaps/i386/qwerty/il.map.gz
+#lib/kbd/keymaps/i386/qwerty/is-latin1-us.map.gz
+#lib/kbd/keymaps/i386/qwerty/is-latin1.map.gz
+#lib/kbd/keymaps/i386/qwerty/it-ibm.map.gz
+#lib/kbd/keymaps/i386/qwerty/it.map.gz
+#lib/kbd/keymaps/i386/qwerty/it2.map.gz
+#lib/kbd/keymaps/i386/qwerty/jp106.map.gz
+#lib/kbd/keymaps/i386/qwerty/la-latin1.map.gz
+#lib/kbd/keymaps/i386/qwerty/lt.baltic.map.gz
+#lib/kbd/keymaps/i386/qwerty/lt.l4.map.gz
+#lib/kbd/keymaps/i386/qwerty/lt.map.gz
+#lib/kbd/keymaps/i386/qwerty/mk-cp1251.map.gz
+#lib/kbd/keymaps/i386/qwerty/mk-utf.map.gz
+#lib/kbd/keymaps/i386/qwerty/mk.map.gz
+#lib/kbd/keymaps/i386/qwerty/mk0.map.gz
+#lib/kbd/keymaps/i386/qwerty/nl.map.gz
+#lib/kbd/keymaps/i386/qwerty/nl2.map.gz
+#lib/kbd/keymaps/i386/qwerty/no-latin1.doc
+#lib/kbd/keymaps/i386/qwerty/no-latin1.map.gz
+#lib/kbd/keymaps/i386/qwerty/no.map.gz
+#lib/kbd/keymaps/i386/qwerty/pc110.map.gz
+#lib/kbd/keymaps/i386/qwerty/pl.map.gz
+#lib/kbd/keymaps/i386/qwerty/pl2.map.gz
+#lib/kbd/keymaps/i386/qwerty/pt-latin1.map.gz
+#lib/kbd/keymaps/i386/qwerty/pt-latin9.map.gz
+#lib/kbd/keymaps/i386/qwerty/ro_win.map.gz
+#lib/kbd/keymaps/i386/qwerty/ru-cp1251.map.gz
+#lib/kbd/keymaps/i386/qwerty/ru-ms.map.gz
+#lib/kbd/keymaps/i386/qwerty/ru-yawerty.map.gz
+#lib/kbd/keymaps/i386/qwerty/ru.map.gz
+#lib/kbd/keymaps/i386/qwerty/ru1.map.gz
+#lib/kbd/keymaps/i386/qwerty/ru2.map.gz
+#lib/kbd/keymaps/i386/qwerty/ru3.map.gz
+#lib/kbd/keymaps/i386/qwerty/ru4.map.gz
+#lib/kbd/keymaps/i386/qwerty/ru_win.map.gz
+#lib/kbd/keymaps/i386/qwerty/se-fi-ir209.map.gz
+#lib/kbd/keymaps/i386/qwerty/se-fi-lat6.map.gz
+#lib/kbd/keymaps/i386/qwerty/se-ir209.map.gz
+#lib/kbd/keymaps/i386/qwerty/se-lat6.map.gz
+#lib/kbd/keymaps/i386/qwerty/sk-prog-qwerty.map.gz
+#lib/kbd/keymaps/i386/qwerty/sk-qwerty.map.gz
+#lib/kbd/keymaps/i386/qwerty/sr-cy.map.gz
+#lib/kbd/keymaps/i386/qwerty/sv-latin1.map.gz
+#lib/kbd/keymaps/i386/qwerty/tr_q-latin5.map.gz
+#lib/kbd/keymaps/i386/qwerty/tralt.map.gz
+#lib/kbd/keymaps/i386/qwerty/trq.map.gz
+#lib/kbd/keymaps/i386/qwerty/ua-utf-ws.map.gz
+#lib/kbd/keymaps/i386/qwerty/ua-utf.map.gz
+#lib/kbd/keymaps/i386/qwerty/ua-ws.map.gz
+#lib/kbd/keymaps/i386/qwerty/ua.map.gz
+#lib/kbd/keymaps/i386/qwerty/uk.map.gz
+#lib/kbd/keymaps/i386/qwerty/us-acentos.map.gz
+#lib/kbd/keymaps/i386/qwerty/us.map.gz
+#lib/kbd/keymaps/i386/qwertz
+#lib/kbd/keymaps/i386/qwertz/croat.map.gz
+#lib/kbd/keymaps/i386/qwertz/cz-us-qwertz.map.gz
+#lib/kbd/keymaps/i386/qwertz/de-latin1-nodeadkeys.map.gz
+#lib/kbd/keymaps/i386/qwertz/de-latin1.map.gz
+#lib/kbd/keymaps/i386/qwertz/de.map.gz
+#lib/kbd/keymaps/i386/qwertz/de_CH-latin1.map.gz
+#lib/kbd/keymaps/i386/qwertz/fr_CH-latin1.map.gz
+#lib/kbd/keymaps/i386/qwertz/fr_CH.map.gz
+#lib/kbd/keymaps/i386/qwertz/hu.map.gz
+#lib/kbd/keymaps/i386/qwertz/sg-latin1-lk450.map.gz
+#lib/kbd/keymaps/i386/qwertz/sg-latin1.map.gz
+#lib/kbd/keymaps/i386/qwertz/sg.map.gz
+#lib/kbd/keymaps/i386/qwertz/sk-prog-qwertz.map.gz
+#lib/kbd/keymaps/i386/qwertz/sk-qwertz.map.gz
+#lib/kbd/keymaps/i386/qwertz/slovene.map.gz
+#lib/kbd/keymaps/include
+#lib/kbd/keymaps/include/compose.8859_7
+#lib/kbd/keymaps/include/compose.8859_8
+#lib/kbd/keymaps/include/compose.latin
+#lib/kbd/keymaps/include/compose.latin1
+#lib/kbd/keymaps/include/compose.latin2
+#lib/kbd/keymaps/include/compose.latin3
+#lib/kbd/keymaps/include/compose.latin4
+#lib/kbd/keymaps/include/vim-compose.latin1
+#lib/kbd/keymaps/mac
+#lib/kbd/keymaps/mac/all
+#lib/kbd/keymaps/mac/all/mac-be.map.gz
+#lib/kbd/keymaps/mac/all/mac-de-latin1-nodeadkeys.map.gz
+#lib/kbd/keymaps/mac/all/mac-de-latin1.map.gz
+#lib/kbd/keymaps/mac/all/mac-de_CH.map.gz
+#lib/kbd/keymaps/mac/all/mac-dk-latin1.map.gz
+#lib/kbd/keymaps/mac/all/mac-dvorak.map.gz
+#lib/kbd/keymaps/mac/all/mac-es.map.gz
+#lib/kbd/keymaps/mac/all/mac-fi-latin1.map.gz
+#lib/kbd/keymaps/mac/all/mac-fr.map.gz
+#lib/kbd/keymaps/mac/all/mac-fr_CH-latin1.map.gz
+#lib/kbd/keymaps/mac/all/mac-it.map.gz
+#lib/kbd/keymaps/mac/all/mac-pt-latin1.map.gz
+#lib/kbd/keymaps/mac/all/mac-se.map.gz
+#lib/kbd/keymaps/mac/all/mac-template.map.gz
+#lib/kbd/keymaps/mac/all/mac-uk.map.gz
+#lib/kbd/keymaps/mac/all/mac-us.map.gz
+#lib/kbd/keymaps/mac/include
+#lib/kbd/keymaps/mac/include/mac-azerty-layout.inc
+#lib/kbd/keymaps/mac/include/mac-euro.map.gz
+#lib/kbd/keymaps/mac/include/mac-linux-keys-bare.inc
+#lib/kbd/keymaps/mac/include/mac-qwerty-layout.inc
+#lib/kbd/keymaps/mac/include/mac-qwertz-layout.inc
+#lib/kbd/keymaps/ppc
+#lib/kbd/keymaps/sun
+#lib/kbd/keymaps/sun/sun-pl-altgraph.map.gz
+#lib/kbd/keymaps/sun/sun-pl.map.gz
+#lib/kbd/keymaps/sun/sundvorak.map.gz
+#lib/kbd/keymaps/sun/sunkeymap.map.gz
+#lib/kbd/keymaps/sun/sunt4-es.map.gz
+#lib/kbd/keymaps/sun/sunt4-fi-latin1.map.gz
+#lib/kbd/keymaps/sun/sunt4-no-latin1.map.gz
+#lib/kbd/keymaps/sun/sunt5-cz-us.map.gz
+#lib/kbd/keymaps/sun/sunt5-de-latin1.map.gz
+#lib/kbd/keymaps/sun/sunt5-es.map.gz
+#lib/kbd/keymaps/sun/sunt5-fi-latin1.map.gz
+#lib/kbd/keymaps/sun/sunt5-fr-latin1.map.gz
+#lib/kbd/keymaps/sun/sunt5-ru.map.gz
+#lib/kbd/keymaps/sun/sunt5-uk.map.gz
+#lib/kbd/keymaps/sun/sunt5-us-cz.map.gz
+lib/kbd/unimaps
+#lib/kbd/unimaps/8859-1.a0-ff.uni
+#lib/kbd/unimaps/8859-10.a0-ff.uni
+#lib/kbd/unimaps/8859-13.a0-ff.uni
+#lib/kbd/unimaps/8859-14.a0-ff.uni
+#lib/kbd/unimaps/8859-15.a0-ff.uni
+#lib/kbd/unimaps/8859-2.a0-ff.uni
+#lib/kbd/unimaps/8859-3.a0-ff.uni
+#lib/kbd/unimaps/8859-4.a0-ff.uni
+#lib/kbd/unimaps/8859-5.a0-ff.uni
+#lib/kbd/unimaps/8859-6.a0-ff.uni
+#lib/kbd/unimaps/8859-7.a0-ff.uni
+#lib/kbd/unimaps/8859-8.a0-ff.uni
+#lib/kbd/unimaps/8859-9.a0-ff.uni
+#lib/kbd/unimaps/ECMA144.uni
+#lib/kbd/unimaps/README
+#lib/kbd/unimaps/armscii8.uni
+#lib/kbd/unimaps/ascii.20-7f.uni
+#lib/kbd/unimaps/cp1250.uni
+#lib/kbd/unimaps/cp437.00-1f.uni
+#lib/kbd/unimaps/cp437.uni
+#lib/kbd/unimaps/cp737.uni
+#lib/kbd/unimaps/cp737a.uni
+#lib/kbd/unimaps/cp737b.uni
+#lib/kbd/unimaps/cp737c.uni
+#lib/kbd/unimaps/cp850.uni
+#lib/kbd/unimaps/cp850a.uni
+#lib/kbd/unimaps/cp850b.uni
+#lib/kbd/unimaps/cp850z.uni
+#lib/kbd/unimaps/cp865.uni
+#lib/kbd/unimaps/cp865a.uni
+#lib/kbd/unimaps/cp866.uni
+#lib/kbd/unimaps/cp866a.uni
+#lib/kbd/unimaps/cybercafe.uni
+#lib/kbd/unimaps/cyralt.uni
+#lib/kbd/unimaps/def.uni
+#lib/kbd/unimaps/empty.uni
+#lib/kbd/unimaps/ethiopic.uni
+#lib/kbd/unimaps/iso01.uni
+#lib/kbd/unimaps/iso02.uni
+#lib/kbd/unimaps/iso03.uni
+#lib/kbd/unimaps/iso04.uni
+#lib/kbd/unimaps/iso05.uni
+#lib/kbd/unimaps/iso06.uni
+#lib/kbd/unimaps/iso07.uni
+#lib/kbd/unimaps/iso07u.uni
+#lib/kbd/unimaps/iso08.uni
+#lib/kbd/unimaps/iso09.uni
+#lib/kbd/unimaps/iso10.uni
+#lib/kbd/unimaps/iso15.uni
+#lib/kbd/unimaps/koi8r.uni
+#lib/kbd/unimaps/koi8u.uni
+#lib/kbd/unimaps/lat1.uni
+#lib/kbd/unimaps/lat1u.uni
+#lib/kbd/unimaps/lat2.uni
+#lib/kbd/unimaps/lat2u.uni
+#lib/kbd/unimaps/lat4.uni
+#lib/kbd/unimaps/lat4u.uni
+#lib/kbd/unimaps/lat7.uni
+#lib/kbd/unimaps/lat9u.uni
+#lib/kbd/unimaps/lat9v.uni
+#lib/kbd/unimaps/lat9w.uni
+#lib/kbd/unimaps/ruscii.uni
+#lib/kbd/unimaps/tcvn.uni
+#lib/kbd/unimaps/viscii.uni
+usr/bin/chvt
+usr/bin/deallocvt
+usr/bin/dumpkeys
+usr/bin/fgconsole
+usr/bin/getkeycodes
+usr/bin/kbdrate
+usr/bin/loadunimap
+usr/bin/mapscrn
+usr/bin/psfaddtable
+usr/bin/psfgettable
+usr/bin/psfstriptable
+usr/bin/psfxtable
+usr/bin/resizecons
+usr/bin/setkeycodes
+usr/bin/setleds
+usr/bin/setmetamode
+usr/bin/showconsolefont
+usr/bin/showkey
+usr/bin/unicode_start
+usr/bin/unicode_stop
+#usr/share/man/man1/chvt.1
+#usr/share/man/man1/deallocvt.1
+#usr/share/man/man1/dumpkeys.1
+#usr/share/man/man1/fgconsole.1
+#usr/share/man/man1/kbd_mode.1
+#usr/share/man/man1/loadkeys.1
+#usr/share/man/man1/openvt.1
+#usr/share/man/man1/psfaddtable.1
+#usr/share/man/man1/psfgettable.1
+#usr/share/man/man1/psfstriptable.1
+#usr/share/man/man1/psfxtable.1
+#usr/share/man/man1/setleds.1
+#usr/share/man/man1/setmetamode.1
+#usr/share/man/man1/showkey.1
+#usr/share/man/man1/unicode_start.1
+#usr/share/man/man1/unicode_stop.1
+#usr/share/man/man5/keymaps.5
+#usr/share/man/man8/getkeycodes.8
+#usr/share/man/man8/kbdrate.8
+#usr/share/man/man8/loadunimap.8
+#usr/share/man/man8/mapscrn.8
+#usr/share/man/man8/resizecons.8
+#usr/share/man/man8/setfont.8
+#usr/share/man/man8/setkeycodes.8
+#usr/share/man/man8/showconsolefont.8
--- a/config/rootfiles/common/less
+++ b/config/rootfiles/common/less
@@ -0,0 +1,6 @@
+usr/bin/less
+#usr/bin/lessecho
+#usr/bin/lesskey
+#usr/man/man1/less.1
+#usr/man/man1/lessecho.1
+#usr/man/man1/lesskey.1
--- a/config/rootfiles/common/lzo
+++ b/config/rootfiles/common/lzo
@@ -0,0 +1,19 @@
+#usr/include/lzo
+#usr/include/lzo/lzo1.h
+#usr/include/lzo/lzo1a.h
+#usr/include/lzo/lzo1b.h
+#usr/include/lzo/lzo1c.h
+#usr/include/lzo/lzo1f.h
+#usr/include/lzo/lzo1x.h
+#usr/include/lzo/lzo1y.h
+#usr/include/lzo/lzo1z.h
+#usr/include/lzo/lzo2a.h
+#usr/include/lzo/lzo_asm.h
+#usr/include/lzo/lzoconf.h
+#usr/include/lzo/lzodefs.h
+#usr/include/lzo/lzoutil.h
+#usr/lib/liblzo2.a
+#usr/lib/liblzo2.la
+usr/lib/liblzo2.so
+usr/lib/liblzo2.so.2
+usr/lib/liblzo2.so.2.0.0
--- a/config/rootfiles/common/openvpn
+++ b/config/rootfiles/common/openvpn
@@ -0,0 +1,15 @@
+#usr/man/man8/openvpn.8
+usr/sbin/openvpn
+var/ipfire/ovpn
+var/ipfire/ovpn/ca
+var/ipfire/ovpn/caconfig
+var/ipfire/ovpn/certs
+var/ipfire/ovpn/certs/index.txt
+var/ipfire/ovpn/certs/serial
+var/ipfire/ovpn/crls
+var/ipfire/ovpn/n2nconf
+var/ipfire/ovpn/openssl
+var/ipfire/ovpn/openssl/ovpn.cnf
+var/ipfire/ovpn/ovpnconfig
+var/ipfire/ovpn/settings
+var/ipfire/ovpn/verify
--- a/config/rootfiles/common/pcre
+++ b/config/rootfiles/common/pcre
@@ -0,0 +1,61 @@
+lib/libpcre.so.0
+lib/libpcre.so.0.0.1
+#usr/bin/pcre-config
+#usr/bin/pcregrep
+#usr/bin/pcretest
+#usr/include/pcre.h
+#usr/include/pcre_scanner.h
+#usr/include/pcre_stringpiece.h
+#usr/include/pcrecpp.h
+#usr/include/pcrecpparg.h
+#usr/include/pcreposix.h
+#usr/lib/libpcre.a
+#usr/lib/libpcre.la
+usr/lib/libpcre.so
+#usr/lib/libpcrecpp.a
+#usr/lib/libpcrecpp.la
+usr/lib/libpcrecpp.so
+usr/lib/libpcrecpp.so.0
+usr/lib/libpcrecpp.so.0.0.0
+#usr/lib/libpcreposix.a
+#usr/lib/libpcreposix.la
+usr/lib/libpcreposix.so
+usr/lib/libpcreposix.so.0
+usr/lib/libpcreposix.so.0.0.0
+#usr/lib/pkgconfig/libpcre.pc
+#usr/man/man1/pcregrep.1
+#usr/man/man1/pcretest.1
+#usr/man/man3/pcre.3
+#usr/man/man3/pcre_compile.3
+#usr/man/man3/pcre_compile2.3
+#usr/man/man3/pcre_config.3
+#usr/man/man3/pcre_copy_named_substring.3
+#usr/man/man3/pcre_copy_substring.3
+#usr/man/man3/pcre_dfa_exec.3
+#usr/man/man3/pcre_exec.3
+#usr/man/man3/pcre_free_substring.3
+#usr/man/man3/pcre_free_substring_list.3
+#usr/man/man3/pcre_fullinfo.3
+#usr/man/man3/pcre_get_named_substring.3
+#usr/man/man3/pcre_get_stringnumber.3
+#usr/man/man3/pcre_get_stringtable_entries.3
+#usr/man/man3/pcre_get_substring.3
+#usr/man/man3/pcre_get_substring_list.3
+#usr/man/man3/pcre_info.3
+#usr/man/man3/pcre_maketables.3
+#usr/man/man3/pcre_refcount.3
+#usr/man/man3/pcre_study.3
+#usr/man/man3/pcre_version.3
+#usr/man/man3/pcreapi.3
+#usr/man/man3/pcrebuild.3
+#usr/man/man3/pcrecallout.3
+#usr/man/man3/pcrecompat.3
+#usr/man/man3/pcrecpp.3
+#usr/man/man3/pcrematching.3
+#usr/man/man3/pcrepartial.3
+#usr/man/man3/pcrepattern.3
+#usr/man/man3/pcreperform.3
+#usr/man/man3/pcreposix.3
+#usr/man/man3/pcreprecompile.3
+#usr/man/man3/pcresample.3
+#usr/man/man3/pcrestack.3
--- a/config/rootfiles/common/perl
+++ b/config/rootfiles/common/perl
--- a/config/rootfiles/common/popt
+++ b/config/rootfiles/common/popt
@@ -0,0 +1,7 @@
+#usr/include/popt.h
+#usr/lib/libpopt.a
+#usr/lib/libpopt.la
+usr/lib/libpopt.so
+usr/lib/libpopt.so.0
+usr/lib/libpopt.so.0.0.0
+#usr/man/man3/popt.3
--- a/config/rootfiles/common/tar
+++ b/config/rootfiles/common/tar
@@ -0,0 +1,5 @@
+bin/tar
+#usr/info/tar.info
+#usr/info/tar.info-1
+#usr/info/tar.info-2
+usr/sbin/rmt
--- a/config/rootfiles/common/udev
+++ b/config/rootfiles/common/udev
@@ -0,0 +1,59 @@
+etc/scsi_id.config
+etc/udev
+#etc/udev/rules.d
+#etc/udev/rules.d/05-udev-early.rules
+#etc/udev/rules.d/25-lfs.rules
+#etc/udev/rules.d/26-modprobe.rules
+#etc/udev/rules.d/27-firmware.rules
+#etc/udev/rules.d/60-persistent-storage.rules
+#etc/udev/rules.d/81-cdrom.rules
+#etc/udev/udev.conf
+lib/firmware
+lib/libvolume_id.so.0
+lib/libvolume_id.so.0.66.0
+lib/udev
+#lib/udev/ata_id
+#lib/udev/cdrom_id
+#lib/udev/create_floppy_devices
+#lib/udev/devices
+#lib/udev/devices/core
+#lib/udev/devices/fd
+#lib/udev/devices/null
+#lib/udev/devices/pts
+#lib/udev/devices/shm
+#lib/udev/devices/stderr
+#lib/udev/devices/stdin
+#lib/udev/devices/stdout
+#lib/udev/edd_id
+#lib/udev/firmware.sh
+#lib/udev/path_id
+#lib/udev/scsi_id
+#lib/udev/usb_id
+#lib/udev/vol_id
+sbin/scsi_id
+sbin/udevcontrol
+sbin/udevd
+sbin/udevsettle
+sbin/udevtrigger
+usr/bin/udevinfo
+usr/bin/udevtest
+#usr/include/libvolume_id.h
+#usr/lib/libvolume_id.a
+usr/lib/libvolume_id.so
+#usr/lib/pkgconfig/libvolume_id.pc
+usr/sbin/udevmonitor
+#usr/share/doc/udev-096
+#usr/share/doc/udev-096/index.html
+#usr/share/man/man7/udev.7
+#usr/share/man/man8/ata_id.8
+#usr/share/man/man8/cdrom_id.8
+#usr/share/man/man8/edd_id.8
+#usr/share/man/man8/scsi_id.8
+#usr/share/man/man8/udevcontrol.8
+#usr/share/man/man8/udevd.8
+#usr/share/man/man8/udevinfo.8
+#usr/share/man/man8/udevmonitor.8
+#usr/share/man/man8/udevsettle.8
+#usr/share/man/man8/udevtest.8
+#usr/share/man/man8/udevtrigger.8
+#usr/share/man/man8/vol_id.8
--- a/config/rootfiles/common/util-linux
+++ b/config/rootfiles/common/util-linux
@@ -0,0 +1,156 @@
+bin/arch
+bin/dmesg
+bin/more
+bin/mount
+bin/umount
+etc/fdprm
+#sbin/agetty
+sbin/blockdev
+sbin/cfdisk
+sbin/ctrlaltdel
+sbin/elvtune
+sbin/fdisk
+sbin/fsck.cramfs
+sbin/fsck.minix
+sbin/hwclock
+sbin/losetup
+sbin/mkfs
+sbin/mkfs.bfs
+sbin/mkfs.cramfs
+sbin/mkfs.minix
+sbin/mkswap
+sbin/pivot_root
+sbin/sfdisk
+sbin/swapoff
+sbin/swapon
+usr/bin/cal
+usr/bin/chkdupexe
+usr/bin/col
+usr/bin/colcrt
+usr/bin/colrm
+usr/bin/column
+usr/bin/cytune
+usr/bin/ddate
+usr/bin/fdformat
+usr/bin/flock
+usr/bin/getopt
+usr/bin/hexdump
+usr/bin/ipcrm
+usr/bin/ipcs
+usr/bin/isosize
+usr/bin/line
+usr/bin/logger
+usr/bin/look
+usr/bin/mcookie
+usr/bin/namei
+usr/bin/pg
+usr/bin/raw
+usr/bin/rename
+usr/bin/renice
+usr/bin/rev
+usr/bin/script
+usr/bin/setfdprm
+usr/bin/setsid
+usr/bin/setterm
+usr/bin/tailf
+usr/bin/ul
+usr/bin/whereis
+usr/bin/write
+usr/sbin/ramsize
+usr/sbin/rdev
+usr/sbin/readprofile
+usr/sbin/rootflags
+usr/sbin/tunelp
+usr/sbin/vidmode
+#usr/share/info/ipc.info
+#usr/share/locale/ca/LC_MESSAGES/util-linux.mo
+#usr/share/locale/cs/LC_MESSAGES/util-linux.mo
+#usr/share/locale/da/LC_MESSAGES/util-linux.mo
+#usr/share/locale/de/LC_MESSAGES/util-linux.mo
+#usr/share/locale/es/LC_MESSAGES/util-linux.mo
+#usr/share/locale/et
+#usr/share/locale/et/LC_MESSAGES
+#usr/share/locale/et/LC_MESSAGES/util-linux.mo
+#usr/share/locale/fi/LC_MESSAGES/util-linux.mo
+#usr/share/locale/fr/LC_MESSAGES/util-linux.mo
+#usr/share/locale/it/LC_MESSAGES/util-linux.mo
+#usr/share/locale/ja/LC_MESSAGES/util-linux.mo
+#usr/share/locale/nl/LC_MESSAGES/util-linux.mo
+#usr/share/locale/pt_BR/LC_MESSAGES/util-linux.mo
+#usr/share/locale/sl
+#usr/share/locale/sl/LC_MESSAGES
+#usr/share/locale/sl/LC_MESSAGES/util-linux.mo
+#usr/share/locale/sv/LC_MESSAGES/util-linux.mo
+#usr/share/locale/tr/LC_MESSAGES/util-linux.mo
+#usr/share/locale/uk
+#usr/share/locale/uk/LC_MESSAGES
+#usr/share/locale/uk/LC_MESSAGES/util-linux.mo
+#usr/share/man/man1/arch.1
+#usr/share/man/man1/cal.1
+#usr/share/man/man1/chkdupexe.1
+#usr/share/man/man1/col.1
+#usr/share/man/man1/colcrt.1
+#usr/share/man/man1/colrm.1
+#usr/share/man/man1/column.1
+#usr/share/man/man1/ddate.1
+#usr/share/man/man1/flock.1
+#usr/share/man/man1/getopt.1
+#usr/share/man/man1/hexdump.1
+#usr/share/man/man1/line.1
+#usr/share/man/man1/look.1
+#usr/share/man/man1/mcookie.1
+#usr/share/man/man1/more.1
+#usr/share/man/man1/namei.1
+#usr/share/man/man1/pg.1
+#usr/share/man/man1/readprofile.1
+#usr/share/man/man1/rename.1
+#usr/share/man/man1/rev.1
+#usr/share/man/man1/script.1
+#usr/share/man/man1/setterm.1
+#usr/share/man/man1/tailf.1
+#usr/share/man/man1/ul.1
+#usr/share/man/man1/whereis.1
+#usr/share/man/man1/write.1
+#usr/share/man/man5/fstab.5
+#usr/share/man/man5/nfs.5
+#usr/share/man/man8/agetty.8
+#usr/share/man/man8/blockdev.8
+#usr/share/man/man8/cfdisk.8
+#usr/share/man/man8/ctrlaltdel.8
+#usr/share/man/man8/cytune.8
+#usr/share/man/man8/dmesg.8
+#usr/share/man/man8/elvtune.8
+#usr/share/man/man8/fdformat.8
+#usr/share/man/man8/fdisk.8
+#usr/share/man/man8/fsck.minix.8
+#usr/share/man/man8/hwclock.8
+#usr/share/man/man8/ipcrm.8
+#usr/share/man/man8/ipcs.8
+#usr/share/man/man8/isosize.8
+#usr/share/man/man8/losetup.8
+#usr/share/man/man8/mkfs.8
+#usr/share/man/man8/mkfs.bfs.8
+#usr/share/man/man8/mkfs.minix.8
+#usr/share/man/man8/mkswap.8
+#usr/share/man/man8/mount.8
+#usr/share/man/man8/pivot_root.8
+#usr/share/man/man8/ramsize.8
+#usr/share/man/man8/raw.8
+#usr/share/man/man8/rdev.8
+#usr/share/man/man8/renice.8
+#usr/share/man/man8/rootflags.8
+#usr/share/man/man8/setfdprm.8
+#usr/share/man/man8/setsid.8
+#usr/share/man/man8/sfdisk.8
+#usr/share/man/man8/sln.8
+#usr/share/man/man8/swapoff.8
+#usr/share/man/man8/swapon.8
+#usr/share/man/man8/tunelp.8
+#usr/share/man/man8/umount.8
+#usr/share/man/man8/vidmode.8
+#usr/share/misc/getopt
+#usr/share/misc/getopt/getopt-parse.bash
+#usr/share/misc/getopt/getopt-parse.tcsh
+#usr/share/misc/getopt/getopt-test.bash
+#usr/share/misc/getopt/getopt-test.tcsh
+var/lib/hwclock
--- a/config/rootfiles/common/vim
+++ b/config/rootfiles/common/vim
--- a/config/rootfiles/common/vlan
+++ b/config/rootfiles/common/vlan
@@ -0,0 +1 @@
+sbin/vconfig
--- a/config/rootfiles/common/wireless
+++ b/config/rootfiles/common/wireless
@@ -0,0 +1,20 @@
+#usr/include/iwlib.h
+#usr/include/wireless.h
+usr/lib/libiw.so
+usr/lib/libiw.so.28
+#usr/man/man5/iftab.5
+#usr/man/man7/wireless.7
+#usr/man/man8/ifrename.8
+#usr/man/man8/iwconfig.8
+#usr/man/man8/iwevent.8
+#usr/man/man8/iwgetid.8
+#usr/man/man8/iwlist.8
+#usr/man/man8/iwpriv.8
+#usr/man/man8/iwspy.8
+usr/sbin/ifrename
+usr/sbin/iwconfig
+usr/sbin/iwevent
+usr/sbin/iwgetid
+usr/sbin/iwlist
+usr/sbin/iwpriv
+usr/sbin/iwspy
--- a/lfs/cyrusimap
+++ b/lfs/cyrusimap
@@ -104,7 +104,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 				--with-auth=unix --with-perl --with-sasl --with-idle=idled \
 				--with-syslogfacility=MAIL --enable-listext --without-snmp
 	cd $(DIR_APP) && make depend
-	cd $(DIR_APP) && make $(MAKETUNING)
+	cd $(DIR_APP) && make
 	cd $(DIR_APP) && make install
 	-mkdir /var/imap
 	chown cyrus:mail /var/imap
--- a/lfs/ethereal
+++ b/lfs/ethereal
@@ -76,7 +76,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc --enable-threads
-	cd $(DIR_APP) && make
+	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	# install -v -m644 FAQ README{,.linux} doc/README.* doc/*.{pod,txt} /usr/share/ethereal
 	# install -v -m644 -D ethereal.desktop /usr/share/applications/ethereal.desktop
--- a/lfs/syslinux
+++ b/lfs/syslinux
@@ -18,12 +18,6 @@
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: syslinux,v 1.6.2.11 2006/09/18 06:23:26 gespinasse Exp $
-#                                                                             #
 ###############################################################################

 ###############################################################################
@@ -32,7 +26,7 @@

 include Config

-VER        = 3.20
+VER        = 3.11

 THISAPP    = syslinux-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -48,7 +42,7 @@ objects = $(DL_FILE)

 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = dbb7c5acfa58220a158cd67854ef4625
+$(DL_FILE)_MD5 = 4aa8643bad413e5cf99fee4065f75734

 install : $(TARGET)

@@ -78,7 +72,8 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/syslinux-3.11-nossp.patch
+	#cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/syslinux-3.11-nossp.patch
+	#cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/syslinux-3.11-nopie.patch
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
--- a/lfs/uClibc
+++ b/lfs/uClibc
@@ -18,12 +18,6 @@
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: uClibc,v 1.9.2.4 2005/02/05 15:38:16 gespinasse Exp $
-#                                                                             #
 ###############################################################################

 ###############################################################################
@@ -32,10 +26,10 @@

 include Config

-VER        = 0.9.26
+VER        = 0.9.28

 THISAPP    = uClibc-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -44,13 +38,11 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 # Top-level Rules
 ###############################################################################

-objects = $(DL_FILE) gcc-3.3.1.tar.gz
+objects = $(DL_FILE)

 $(DL_FILE)           = $(DL_FROM)/$(DL_FILE)
-gcc-3.3.1.tar.gz     = $(URL_GNU)/gcc/gcc-3.3.1.tar.gz

-$(DL_FILE)_MD5       = b63183651a1b13456c20387ea88b018f
-gcc-3.3.1.tar.gz_MD5 = 46d58197212818b5f7c403267ff24e4e
+$(DL_FILE)_MD5       = 1ada58d919a82561061e4741fb6abd29

 install : $(TARGET)

@@ -83,10 +75,26 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@rm -rf /opt/$(MACHINE)-uClibc
 	@mkdir -p $(DIR_APP)
 	cd $(DIR_APP) && cp -R $(DIR_SRC)/src/uClibc/* .
-	cd $(DIR_APP) && sed -i -e 's/ARCH:=i386/ARCH:=$(MACHINE)/' Makefile
+	cd $(DIR_APP) && sed -e 's/UCLIBC_HAS_THREADS=y/# UCLIBC_HAS_THREADS is not set/' \
+			-e 's/DO_C99_MATH=y/# DO_C99_MATH is not set/' \
+			-e 's/LDSO_CACHE_SUPPORT=y/# LDSO_CACHE_SUPPORT is not set/' \
+			-e 's/UCLIBC_HAS_FTW=y/# UCLIBC_HAS_FTW is not set/' \
+			-e 's,/usr/src/linux,&-$(KVER),' -i sources/uClibc.config-$(MACHINE)
+	cd $(DIR_APP) && sed -e 's,^LINUX_DIR.*$$,&-$(KVER),' -i make/uclibc.mk
 	cd $(DIR_APP) && chmod +x sources/patch-kernel.sh
 	cd $(DIR_APP) && make
 	-mkdir -p /install/initrd/bin
-	cd $(DIR_APP)/toolchain_build_$(MACHINE)/$(THISAPP) && make PREFIX=/install/initrd install_runtime
+	cd $(DIR_APP)/toolchain_build_$(MACHINE)/$(THISAPP) && make PREFIX=/opt/$(MACHINE)-uClibc install
+	cd $(DIR_APP)/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
+	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)
 	@$(POSTBUILD)
--- a/make.sh
+++ b/make.sh
@@ -510,7 +510,6 @@ buildipfire() {
 # ipfiremake bristuff
  ipfiremake asterisk
  ipfiremake mpg123
-exiterror Bis hierhin und nicht weiter!
  ipfiremake libmad
  ipfiremake libogg
  ipfiremake libvorbis
--- a/src/patches/syslinux-3.11-nopie.patch
+++ b/src/patches/syslinux-3.11-nopie.patch
@@ -0,0 +1,23 @@
+borrowed from gentoo
+--- syslinux/com32/libutil/Makefile
+++ syslinux/com32/libutil/Makefile
+@@ -40,7 +40,7 @@
+ AR	   = ar
+ NASM	   = nasm
+ RANLIB	   = ranlib
+-CFLAGS     = $(M32) -mregparm=3 -DREGPARM=3 -D__COM32__ -W -Wall -march=i386 -Os -fomit-frame-pointer -I./include -I../include $(call gcc_ok,-fno-stack-protector,)
+CFLAGS     = $(M32) -mregparm=3 -DREGPARM=3 -D__COM32__ -W -Wall -march=i386 -Os -fomit-frame-pointer -I./include -I../include $(call gcc_ok,-fno-stack-protector,) $(call gcc_ok,-nopie,)
+ SFLAGS     = $(M32) -D__COM32__ -march=i386
+ LDFLAGS    = -T ../lib/com32.ld
+ LNXCFLAGS  = -I./include -W -Wall -fno-stack-protector -O -g
+--- syslinux/dos/Makefile
+++ syslinux/dos/Makefile
+@@ -3,7 +3,7 @@
+ OBJCOPY  = objcopy
+ OPTFLAGS = -g -Os -march=i386 -falign-functions=0 -falign-jumps=0 -falign-loops=0 -fomit-frame-pointer
+ INCLUDES = -include code16.h -I. -I.. -I../libfat
+-CFLAGS	 = -W -Wall -fno-stack-protector -ffreestanding -msoft-float $(OPTFLAGS) $(INCLUDES)
+CFLAGS	 = -W -Wall -nopie -fno-stack-protector -ffreestanding -msoft-float $(OPTFLAGS) $(INCLUDES)
+ LDFLAGS	 = -T com16.ld
+ AR       = ar
+ RANLIB   = ranlib
--- a/src/patches/uClibc-gen_wctype-segfault.patch
+++ b/src/patches/uClibc-gen_wctype-segfault.patch
@@ -0,0 +1,11 @@
+--- Makefile.bak	2006-10-24 00:56:23.000000000 +0000
+++ Makefile	2006-10-23 19:57:49.000000000 +0000
+@@ -32,7 +32,7 @@
+ 	./gen_wc8bit `cat codesets.txt`
+ 
+ gen_wctype: gen_wctype.c
+-	$(HOSTCC) $(HOSTCFLAGS) $(NATIVE_LDFLAGS) -D__UCLIBC_GEN_LOCALE $^ -o $@
+	$(HOSTCC) $(HOSTCFLAGS) $(NATIVE_LDFLAGS) -O1 -D__UCLIBC_GEN_LOCALE $^ -o $@
+ 
+ # Warning! Beware tr_TR toupper/tolower exceptions!
+ wctables.h: gen_wctype
--- a/src/uClibc/Makefile
+++ b/src/uClibc/Makefile
@@ -27,7 +27,7 @@
 #############################################################

 # What sortof target system shall we compile this for?
-ARCH:=i386
+ARCH:=$(MACHINE)
 #ARCH:=arm
 #ARCH:=mips
 #ARCH:=mipsel
@@ -144,14 +144,14 @@ STAGING_DIR=$(BUILD_DIR)
 TOOL_BUILD_DIR=$(BASE_DIR)/toolchain_build_$(ARCH)$(ARCH_FPU_SUFFIX)
 TARGET_PATH=/usr/local/bin:$(STAGING_DIR)/bin:/bin:/sbin:/usr/bin:/usr/sbin
 #TARGET_CROSS=$(STAGING_DIR)/bin/$(ARCH)-uclibc-
-TARGET_CROSS=$(STAGING_DIR)/bin/$(ARCH)-linux-
+TARGET_CROSS=$(STAGING_DIR)/bin/$(ARCH)-linux-uclibc-
 TARGET_CC=$(TARGET_CROSS)gcc$(TARGET_SOFT_FLOAT)
 STRIP=$(TARGET_CROSS)strip --remove-section=.comment --remove-section=.note
 #STRIP:=/bin/true
 IMAGE:=$(BASE_DIR)/root_fs_$(ARCH)$(ARCH_FPU_SUFFIX)
-GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)-linux
+GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)-linux-uclibc
 #KERNEL_CROSS=$(STAGING_DIR)/bin/$(ARCH)-uclibc-
-KERNEL_CROSS=$(STAGING_DIR)/bin/$(ARCH)-linux-
+KERNEL_CROSS=$(STAGING_DIR)/bin/$(ARCH)-linux-uclibc-
 HOST_ARCH:=$(shell $(HOSTCC) -dumpmachine | sed -e s'/-.*//' \
 	-e 's/sparc.*/sparc/' \
 	-e 's/arm.*/arm/g' \
--- a/src/uClibc/make/binutils.mk
+++ b/src/uClibc/make/binutils.mk
@@ -4,8 +4,9 @@
 #
 #############################################################
 #BINUTILS_SITE:=http://ftp.kernel.org/pub/linux/devel/binutils
-BINUTILS_SOURCE:=binutils-2.15.90.0.3.tar.bz2
-BINUTILS_DIR:=$(TOOL_BUILD_DIR)/binutils-2.15.90.0.3
+BINUTILS_VER:=2.16.1
+BINUTILS_SOURCE:=binutils-$(BINUTILS_VER).tar.bz2
+BINUTILS_DIR:=$(TOOL_BUILD_DIR)/binutils-$(BINUTILS_VER)
 BINUTILS_CAT:=bzcat

 BINUTILS_DIR1:=$(TOOL_BUILD_DIR)/binutils-build
@@ -28,7 +29,7 @@ $(BINUTILS_DIR)/.unpacked: $(DL_DIR)/$(BINUTILS_SOURCE)

 $(BINUTILS_DIR)/.patched: $(BINUTILS_DIR)/.unpacked
 	# Apply any files named binutils-*.patch from the source directory to binutils
-	$(SOURCE_DIR)/patch-kernel.sh $(BINUTILS_DIR) $(SOURCE_DIR) binutils-*.patch
+	$(SOURCE_DIR)/patch-kernel.sh $(BINUTILS_DIR) $(SOURCE_DIR) binutils/$(BINUTILS_VER)/*.patch
 	touch $(BINUTILS_DIR)/.patched

 $(BINUTILS_DIR1)/.configured: $(BINUTILS_DIR)/.patched
@@ -56,7 +57,7 @@ $(BINUTILS_DIR1)/.configured: $(BINUTILS_DIR)/.patched
 		--with-sysroot=$(STAGING_DIR) \
 		$(MULTILIB) \
 		$(SOFT_FLOAT_CONFIG_OPTION) \
-		--program-prefix=$(ARCH)-linux-);
+		--program-prefix=$(ARCH)-linux-uclibc-);
 	touch $(BINUTILS_DIR1)/.configured

 $(BINUTILS_DIR1)/binutils/objdump: $(BINUTILS_DIR1)/.configured
@@ -75,12 +76,12 @@ $(STAGING_DIR)/$(GNU_TARGET_NAME)/bin/ld: $(BINUTILS_DIR1)/binutils/objdump
 	for app in addr2line ar as c++filt gprof ld nm objcopy \
 		    objdump ranlib readelf size strings strip ; \
 	do \
-		if [ -x $(STAGING_DIR)/bin/$(ARCH)-linux-$${app} ] ; then \
+		if [ -x $(STAGING_DIR)/bin/$(ARCH)-linux-uclibc-$${app} ] ; then \
 		    (cd $(STAGING_DIR)/$(GNU_TARGET_NAME)/bin; \
-			ln -fs ../../bin/$(ARCH)-linux-$${app} $${app}; \
+			ln -fs ../../bin/$(ARCH)-linux-uclibc-$${app} $${app}; \
 		    ); \
 		    (cd $(STAGING_DIR)/usr/bin; \
-			ln -fs ../../bin/$(ARCH)-linux-$${app} $${app}; \
+			ln -fs ../../bin/$(ARCH)-linux-uclibc-$${app} $${app}; \
 		    ); \
 		fi; \
 	done;
--- a/src/uClibc/make/gcc-3.3.mk
+++ b/src/uClibc/make/gcc-3.3.mk
@@ -20,12 +20,12 @@ ifneq ($(GCC_2_95_TOOLCHAIN),true)

 # Older stuff...
 #GCC_SITE:=ftp://ftp.gnu.org/gnu/gcc/
-#GCC_SOURCE:=gcc-3.3.tar.gz
+#GCC_SOURCE:=gcc-3.3.tar.bz2
 #GCC_DIR:=$(TOOL_BUILD_DIR)/gcc-3.3
 #GCC_CAT:=zcat

 # Shiny new stuff...
-GCC_VERSION:=3.3.1
+GCC_VERSION:=4.0.3
 #GCC_SITE:=ftp://ftp.gnu.org/gnu/gcc/gcc-$(GCC_VERSION)
 #GCC_SITE:=http://www.binarycode.org/gcc/releases/gcc-$(GCC_VERSION)
 GCC_SITE:=http://gcc.get-software.com/releases/gcc-$(GCC_VERSION)
@@ -35,9 +35,9 @@ GCC_SITE:=http://gcc.get-software.com/releases/gcc-$(GCC_VERSION)
 #GCC_VERSION:=3.3-20031013
 #GCC_SITE:=http://gcc.get-software.com/snapshots/$(GCC_VERSION)
 #
-GCC_SOURCE:=gcc-$(GCC_VERSION).tar.gz
+GCC_SOURCE:=gcc-$(GCC_VERSION).tar.bz2
 GCC_DIR:=$(TOOL_BUILD_DIR)/gcc-$(GCC_VERSION)
-GCC_CAT:=gzip -dc
+GCC_CAT:=bzip2 -dc

 #############################################################
 #
@@ -56,23 +56,19 @@ endif
 # build the first pass gcc compiler
 #
 #############################################################
-GCC_BUILD_DIR1:=$(TOOL_BUILD_DIR)/gcc-3.3-initial
+GCC_BUILD_DIR1:=$(TOOL_BUILD_DIR)/gcc-$(GCC_VERSION)-initial

 $(DL_DIR)/$(GCC_SOURCE):
 #	$(WGET) -P $(DL_DIR) $(GCC_SITE)/$(GCC_SOURCE)

 $(GCC_DIR)/.unpacked: $(DL_DIR)/$(GCC_SOURCE)
 	$(GCC_CAT) $(DL_DIR)/$(GCC_SOURCE) | tar -C $(TOOL_BUILD_DIR) -xvf -
+	$(GCC_CAT) $(DL_DIR)/gcc-$(GCC_VERSION).tar.bz2 | tar -C $(TOOL_BUILD_DIR) -xvf -
 	touch $(GCC_DIR)/.unpacked

 $(GCC_DIR)/.patched: $(GCC_DIR)/.unpacked
 	# Apply any files named gcc-*.patch from the source directory to gcc
-	$(SOURCE_DIR)/patch-kernel.sh $(GCC_DIR) $(SOURCE_DIR) gcc-*.patch
-ifeq ($(SOFT_FLOAT),true)
-ifeq ("$(strip $(ARCH))","i386")
-	$(SOURCE_DIR)/patch-kernel.sh $(GCC_DIR) $(SOURCE_DIR) i386-gcc-soft-float.patch
-endif
-endif
+	$(SOURCE_DIR)/patch-kernel.sh $(GCC_DIR) $(SOURCE_DIR) gcc/$(GCC_VERSION)/*.patch
 	touch $(GCC_DIR)/.patched

 $(GCC_DIR)/.gcc3_3_build_hacks: $(GCC_DIR)/.patched
@@ -148,34 +144,34 @@ $(GCC_BUILD_DIR1)/.configured: $(GCC_DIR)/.gcc3_3_build_hacks
 		--enable-target-optspace $(DISABLE_NLS) --with-gnu-ld \
 		--disable-shared --enable-languages=c --disable-__cxa_atexit \
 		$(SOFT_FLOAT_CONFIG_OPTION) \
-		$(EXTRA_GCC_CONFIG_OPTIONS) --program-prefix=$(ARCH)-linux-);
+		$(EXTRA_GCC_CONFIG_OPTIONS) --program-prefix=$(ARCH)-linux-uclibc-);
 	touch $(GCC_BUILD_DIR1)/.configured

 $(GCC_BUILD_DIR1)/.compiled: $(GCC_BUILD_DIR1)/.configured
 	PATH=$(TARGET_PATH) $(MAKE) $(JLEVEL) -C $(GCC_BUILD_DIR1) \
 	    CC="$(HOSTCC)" \
 	    LDFLAGS="$(HOSTLDFLAGS)" \
-	    AR_FOR_TARGET=$(STAGING_DIR)/bin/$(ARCH)-linux-ar \
-	    RANLIB_FOR_TARGET=$(STAGING_DIR)/bin/$(ARCH)-linux-ranlib \
+	    AR_FOR_TARGET=$(STAGING_DIR)/bin/$(ARCH)-linux-uclibc-ar \
+	    RANLIB_FOR_TARGET=$(STAGING_DIR)/bin/$(ARCH)-linux-uclibc-ranlib \
 	    CC_FOR_TARGET=$(GCC_BUILD_DIR1)/target_gcc \
 	    GCC_FOR_TARGET=$(GCC_BUILD_DIR1)/target_gcc
 	touch $(GCC_BUILD_DIR1)/.compiled

-$(STAGING_DIR)/bin/$(ARCH)-linux-gcc: $(GCC_BUILD_DIR1)/.compiled
+$(STAGING_DIR)/bin/$(ARCH)-linux-uclibc-gcc: $(GCC_BUILD_DIR1)/.compiled
 	PATH=$(TARGET_PATH) $(MAKE) $(JLEVEL) \
 	    CC="$(HOSTCC)" \
 	    LDFLAGS="$(HOSTLDFLAGS)" \
 	    -C $(GCC_BUILD_DIR1) install;
 	#Cleanup then mess when --program-prefix mysteriously fails 
-	-mv $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-cpp $(STAGING_DIR)/bin/$(ARCH)-linux-cpp
-	-mv $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-gcc $(STAGING_DIR)/bin/$(ARCH)-linux-gcc
+	-mv $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-cpp $(STAGING_DIR)/bin/$(ARCH)-linux-uclibc-cpp
+	-mv $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-gcc $(STAGING_DIR)/bin/$(ARCH)-linux-uclibc-gcc
 	if [ -n "$(strip $(TARGET_SOFT_FLOAT))" ] ; then \
 		for app in gcc c++ g++ ; do \
-			if [ -x $(STAGING_DIR)/bin/$(ARCH)-linux-$${app} ] ; then \
+			if [ -x $(STAGING_DIR)/bin/$(ARCH)-linux-uclibc-$${app} ] ; then \
 			    (cd $(STAGING_DIR)/bin; \
-				rm -f $(ARCH)-linux-$${app}$(TARGET_SOFT_FLOAT); \
-				echo -e "#!/bin/sh\nexec $(STAGING_DIR)/bin/$(ARCH)-linux-$${app} -msoft-float \$$@" > $(ARCH)-linux-$${app}$(TARGET_SOFT_FLOAT); \
-				chmod a+x $(ARCH)-linux-$${app}$(TARGET_SOFT_FLOAT); \
+				rm -f $(ARCH)-linux-uclibc-$${app}$(TARGET_SOFT_FLOAT); \
+				echo -e "#!/bin/sh\nexec $(STAGING_DIR)/bin/$(ARCH)-linux-uclibc-$${app} -msoft-float \$$@" > $(ARCH)-linux-uclibc-$${app}$(TARGET_SOFT_FLOAT); \
+				chmod a+x $(ARCH)-linux-uclibc-$${app}$(TARGET_SOFT_FLOAT); \
 			    ); \
 			fi; \
 		done; \
@@ -184,7 +180,7 @@ $(STAGING_DIR)/bin/$(ARCH)-linux-gcc: $(GCC_BUILD_DIR1)/.compiled
 	rm -rf $(STAGING_DIR)/info $(STAGING_DIR)/man $(STAGING_DIR)/share/doc \
 		$(STAGING_DIR)/share/locale

-gcc3_3_initial: binutils uclibc-configured $(STAGING_DIR)/bin/$(ARCH)-linux-gcc
+gcc3_3_initial: binutils uclibc-configured $(STAGING_DIR)/bin/$(ARCH)-linux-uclibc-gcc

 gcc3_3_initial-clean:
 	rm -rf $(GCC_BUILD_DIR1)
@@ -199,7 +195,7 @@ gcc3_3_initial-dirclean:
 # the newly built shared uClibc library.
 #
 #############################################################
-GCC_BUILD_DIR2:=$(TOOL_BUILD_DIR)/gcc-3.3-final
+GCC_BUILD_DIR2:=$(TOOL_BUILD_DIR)/gcc-$(GCC_VERSION)-final
 $(GCC_BUILD_DIR2)/.configured: $(GCC_DIR)/.patched
 	mkdir -p $(GCC_BUILD_DIR2)
 	echo -e "#!/bin/sh\nexec $(GCC_BUILD_DIR2)/gcc/xgcc -B$(GCC_BUILD_DIR2)/gcc/ -B$(STAGING_DIR)/$(ARCH)-linux/bin/ -B$(STAGING_DIR)/$(ARCH)-linux/lib/ -isystem $(STAGING_DIR)/$(ARCH)-linux/include $(TARGET_SOFT_FLOAT) \$$@" > $(GCC_BUILD_DIR2)/target_g++
@@ -235,12 +231,12 @@ $(GCC_BUILD_DIR2)/.configured: $(GCC_DIR)/.patched
 		--with-gnu-ld --disable-__cxa_atexit \
 		--enable-languages=$(TARGET_LANGUAGES) \
 		$(EXTRA_GCC_CONFIG_OPTIONS) \
-		--program-prefix=$(ARCH)-linux- \
+		--program-prefix=$(ARCH)-linux-uclibc- \
 	);
 	touch $(GCC_BUILD_DIR2)/.configured

 $(GCC_BUILD_DIR2)/.compiled: $(GCC_BUILD_DIR2)/.configured
-	$(SED) 's/\-lc//' $(GCC_BUILD_DIR2)/gcc/Makefile
+	# $(SED) 's/\-lc//' $(GCC_BUILD_DIR2)/gcc/Makefile
 	PATH=$(TARGET_PATH) $(MAKE) $(JLEVEL) \
 	    CC="$(HOSTCC)" \
 	    LDFLAGS="$(HOSTLDFLAGS)" \
@@ -260,33 +256,33 @@ $(GCC_BUILD_DIR2)/.installed: $(GCC_BUILD_DIR2)/.compiled $(STAGING_DIR)/lib/lib
 	-mv $(STAGING_DIR)/bin/gcc $(STAGING_DIR)/usr/bin;
 	-mv $(STAGING_DIR)/bin/protoize $(STAGING_DIR)/usr/bin;
 	-mv $(STAGING_DIR)/bin/unprotoize $(STAGING_DIR)/usr/bin;
-	-mv $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-cpp $(STAGING_DIR)/bin/$(ARCH)-linux-cpp
-	-mv $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-gcc $(STAGING_DIR)/bin/$(ARCH)-linux-gcc
-	-mv $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-c++ $(STAGING_DIR)/bin/$(ARCH)-linux-c++
-	-mv $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-g++ $(STAGING_DIR)/bin/$(ARCH)-linux-g++
-	-mv $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-c++filt $(STAGING_DIR)/bin/$(ARCH)-linux-c++filt
+	-mv $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-cpp $(STAGING_DIR)/bin/$(ARCH)-linux-uclibc-cpp
+	-mv $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-gcc $(STAGING_DIR)/bin/$(ARCH)-linux-uclibc-gcc
+	-mv $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-c++ $(STAGING_DIR)/bin/$(ARCH)-linux-uclibc-c++
+	-mv $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-g++ $(STAGING_DIR)/bin/$(ARCH)-linux-uclibc-g++
+	-mv $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-c++filt $(STAGING_DIR)/bin/$(ARCH)-linux-uclibc-c++filt
 	rm -f $(STAGING_DIR)/bin/cpp $(STAGING_DIR)/bin/gcov $(STAGING_DIR)/bin/*gccbug
-	rm -f $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-$(ARCH)-linux-*
+	rm -f $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-$(ARCH)-linux-uclibc-*
 	rm -rf $(STAGING_DIR)/info $(STAGING_DIR)/man $(STAGING_DIR)/share/doc \
 		$(STAGING_DIR)/share/locale
 	# Strip the host binaries
 	-strip --strip-all -R .note -R .comment $(STAGING_DIR)/bin/*
 	if [ -n "$(strip $(TARGET_SOFT_FLOAT))" ] ; then \
 		for app in gcc c++ g++ ; do \
-			if [ -x $(STAGING_DIR)/bin/$(ARCH)-linux-$${app} ] ; then \
+			if [ -x $(STAGING_DIR)/bin/$(ARCH)-linux-uclibc-$${app} ] ; then \
 			    (cd $(STAGING_DIR)/bin; \
-				rm -f $(ARCH)-linux-$${app}$(TARGET_SOFT_FLOAT); \
-				echo -e "#!/bin/sh\nexec $(STAGING_DIR)/bin/$(ARCH)-linux-$${app} -msoft-float \$$@" > $(ARCH)-linux-$${app}$(TARGET_SOFT_FLOAT); \
-				chmod a+x $(ARCH)-linux-$${app}$(TARGET_SOFT_FLOAT); \
+				rm -f $(ARCH)-linux-uclibc-$${app}$(TARGET_SOFT_FLOAT); \
+				echo -e "#!/bin/sh\nexec $(STAGING_DIR)/bin/$(ARCH)-linux-uclibc-$${app} -msoft-float \$$@" > $(ARCH)-linux-uclibc-$${app}$(TARGET_SOFT_FLOAT); \
+				chmod a+x $(ARCH)-linux-uclibc-$${app}$(TARGET_SOFT_FLOAT); \
 			    ); \
 			fi; \
 		done; \
 	fi; \
 	set -e; \
 	for app in cc gcc c89 cpp c++ g++ ; do \
-		if [ -x $(STAGING_DIR)/bin/$(ARCH)-linux-$${app} ] ; then \
+		if [ -x $(STAGING_DIR)/bin/$(ARCH)-linux-uclibc-$${app} ] ; then \
 		    (cd $(STAGING_DIR)/usr/bin; \
-			ln -fs ../../bin/$(ARCH)-linux-$${app} $${app}; \
+			ln -fs ../../bin/$(ARCH)-linux-uclibc-$${app} $${app}; \
 		    ); \
 		fi; \
 	done;
@@ -300,10 +296,7 @@ $(TARGET_DIR)/lib/libstdc++.so.5.0.5: $(GCC_BUILD_DIR2)/.installed
 	cp -a $(STAGING_DIR)/lib/libstdc++.so* $(TARGET_DIR)/lib/

 $(GCC_BUILD_DIR2)/.shared_libgcc: $(GCC_BUILD_DIR2)/.installed
-	# Make sure a copy of libgcc_s is in the target's /lib.
-	if [ -f $(STAGING_DIR)/lib/libgcc_s.so.0.9.9 ] ; then \
-		cp -a $(STAGING_DIR)/lib/libgcc_s.so* $(TARGET_DIR)/lib/ ; \
-	fi
+	cp -fa $(STAGING_DIR)/lib/libgcc_s.so* $(TARGET_DIR)/lib/ ; \
 	touch $(GCC_BUILD_DIR2)/.shared_libgcc

 GCC_TARGETS:=$(GCC_BUILD_DIR2)/.shared_libgcc
@@ -330,7 +323,7 @@ gcc3_3-dirclean:
 # Next build target gcc compiler
 #
 #############################################################
-GCC_BUILD_DIR3:=$(BUILD_DIR)/gcc-3.3-target
+GCC_BUILD_DIR3:=$(BUILD_DIR)/gcc-$(GCC_VERSION)-target

 TARGET_GCC_ARGS= $(TARGET_CONFIGURE_OPTS) \
 		AR_FOR_BUILD=ar \
@@ -364,10 +357,7 @@ $(GCC_BUILD_DIR3)/.unpacked: $(DL_DIR)/$(GCC_SOURCE)

 $(GCC_BUILD_DIR3)/.patched: $(GCC_BUILD_DIR3)/.unpacked
 	# Apply any files named gcc-*.patch from the source directory to gcc
-	$(SOURCE_DIR)/patch-kernel.sh $(GCC_BUILD_DIR3) $(SOURCE_DIR) gcc-*.patch
-ifeq ("$(strip $(ARCH))","i386")
-	$(SOURCE_DIR)/patch-kernel.sh $(GCC_BUILD_DIR3) $(SOURCE_DIR) i386-gcc-*.patch
-endif
+	$(SOURCE_DIR)/patch-kernel.sh $(GCC_BUILD_DIR3) $(SOURCE_DIR) gcc/$(GCC_VERSION)/*.patch
 	touch $(GCC_BUILD_DIR3)/.patched

 $(GCC_BUILD_DIR3)/.gcc3_3_build_hacks: $(GCC_BUILD_DIR3)/.patched
@@ -390,7 +380,7 @@ $(GCC_BUILD_DIR3)/.gcc3_3_build_hacks: $(GCC_BUILD_DIR3)/.patched

 $(GCC_BUILD_DIR3)/.configured: $(GCC_BUILD_DIR3)/.gcc3_3_build_hacks
 	mkdir -p $(GCC_BUILD_DIR3)
-	#(cd $(GCC_BUILD_DIR3); ln -fs $(ARCH)-linux build-$(GNU_TARGET_NAME))
+	#(cd $(GCC_BUILD_DIR3); ln -fs $(ARCH)-linux-uclibc- build-$(GNU_TARGET_NAME))
 	(cd $(GCC_BUILD_DIR3); \
 		$(TARGET_GCC_ARGS) \
 		gcc_cv_as_hidden=no \
@@ -402,7 +392,7 @@ $(GCC_BUILD_DIR3)/.configured: $(GCC_BUILD_DIR3)/.gcc3_3_build_hacks
 		--prefix=/usr \
 		--mandir=/usr/man \
 		--infodir=/usr/info \
-		--with-gxx-include-dir=/usr/include/c++/3.3 \
+		--with-gxx-include-dir=/usr/include/c++/$(GCC_VERSION) \
 		--enable-target-optspace \
 		--enable-shared \
 		$(MULTILIB) \
@@ -442,7 +432,7 @@ $(TARGET_DIR)/usr/bin/gcc: $(GCC_BUILD_DIR3)/.compiled
 	# Work around problem of missing syslimits.h
 	cp -f $(STAGING_DIR)/usr/lib/gcc-lib/$(ARCH)-linux/$(GCC_VERSION)/include/syslimits.h  $(TARGET_DIR)/usr/lib/gcc-lib/$(ARCH)-linux/$(GCC_VERSION)/include/
 	# These are in /lib, so...
-	rm -rf $(TARGET_DIR)/usr/lib/libgcc_s.so*
+	# rm -rf $(TARGET_DIR)/usr/lib/libgcc_s.so*
 	touch -c $(TARGET_DIR)/usr/bin/gcc

 gcc3_3_target: uclibc_target binutils_target $(TARGET_DIR)/usr/bin/gcc
--- a/src/uClibc/make/uclibc.mk
+++ b/src/uClibc/make/uclibc.mk
@@ -9,8 +9,8 @@ UCLIBC_DIR=$(TOOL_BUILD_DIR)/uClibc
 UCLIBC_SOURCE=uClibc-snapshot.tar.gz
 UCLIBC_SITE:=http://www.uclibc.org/downloads/snapshots
 else
-UCLIBC_DIR:=$(TOOL_BUILD_DIR)/uClibc-0.9.26
-UCLIBC_SOURCE:=uClibc-0.9.26.tar.gz
+UCLIBC_DIR:=$(TOOL_BUILD_DIR)/uClibc-0.9.28
+UCLIBC_SOURCE:=uClibc-0.9.28.tar.bz2
 UCLIBC_SITE:=http://www.uclibc.org/downloads
 endif
 LINUX_DIR:=/usr/src/linux
@@ -34,16 +34,18 @@ $(DL_DIR)/$(UCLIBC_SOURCE):
 #	$(WGET) -P $(DL_DIR) $(UCLIBC_SITE)/$(UCLIBC_SOURCE)

 $(UCLIBC_DIR)/.unpacked: $(DL_DIR)/$(UCLIBC_SOURCE)
-	gzip -dc $(DL_DIR)/$(UCLIBC_SOURCE) | tar -C $(TOOL_BUILD_DIR) -xvf -
+	bzip2 -dc $(DL_DIR)/$(UCLIBC_SOURCE) | tar -C $(TOOL_BUILD_DIR) -xf -
+	sed -i -e 's/include <sys\/types.h>/include <sys\/types.h>\n#include <pthread.h>/' $(UCLIBC_DIR)/librt/kernel-posix-timers.h
 	touch $(UCLIBC_DIR)/.unpacked

 $(UCLIBC_DIR)/.configured: $(UCLIBC_DIR)/.unpacked 
 	$(MAKE) -C $(UCLIBC_DIR) defconfig;
-	cp $(SOURCE_DIR)/uClibc.config $(UCLIBC_DIR)/.config
+	cp $(SOURCE_DIR)/uClibc.config-$(MACHINE) $(UCLIBC_DIR)/.config
 	cp $(SOURCE_DIR)/locales.txt $(UCLIBC_DIR)/extra/locale
 	cp $(SOURCE_DIR)/codesets.txt $(UCLIBC_DIR)/extra/locale
 	$(MAKE) -C $(UCLIBC_DIR) PREFIX=$(STAGING_DIR) headers;
 	(cd $(UCLIBC_DIR)/extra/locale; \
+		patch -Np0 < /usr/src/src/patches/uClibc-gen_wctype-segfault.patch; \
 		$(MAKE); \
 	)
 	$(MAKE) -C $(UCLIBC_DIR) PREFIX=$(STAGING_DIR) install_dev;
@@ -57,6 +59,7 @@ $(UCLIBC_DIR)/lib/libc.a: $(UCLIBC_DIR)/.configured $(LIBFLOAT_TARGET)
 	$(MAKE) -C $(UCLIBC_DIR) headers
 	-$(MAKE) -C $(UCLIBC_DIR) pregen
 	(cd $(UCLIBC_DIR)/extra/locale; \
+		patch -Np0 < /usr/src/src/patches/uClibc-gen_wctype-segfault.patch; \
 		$(MAKE); \
 	)
 	$(MAKE) -C $(UCLIBC_DIR)
@@ -91,7 +94,7 @@ endif

 uclibc-configured: $(UCLIBC_DIR)/.configured

-uclibc: $(STAGING_DIR)/bin/$(ARCH)-linux-gcc $(STAGING_DIR)/lib/libc.a \
+uclibc: $(STAGING_DIR)/bin/$(ARCH)-linux-uclibc-gcc $(STAGING_DIR)/lib/libc.a \
 	$(UCLIBC_TARGETS)

 uclibc-source: $(DL_DIR)/$(UCLIBC_SOURCE)
--- a/src/uClibc/sources/binutils/2.16.1/100-uclibc-conf.patch
+++ b/src/uClibc/sources/binutils/2.16.1/100-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;
--- a/src/uClibc/sources/binutils/2.16.1/110-uclibc-libtool-conf.patch
+++ b/src/uClibc/sources/binutils/2.16.1/110-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]+$'
--- a/src/uClibc/sources/binutils/2.16.1/300-001_ld_makefile_patch.patch
+++ b/src/uClibc/sources/binutils/2.16.1/300-001_ld_makefile_patch.patch
@@ -0,0 +1,52 @@
+#!/bin/sh -e
+## 001_ld_makefile_patch.dpatch
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: correct where ld scripts are installed
+## DP: Author: Chris Chimelis <chris@debian.org>
+## DP: Upstream status: N/A
+## DP: Date: ??
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+       -patch) patch $patch_opts -p1 < $0;;
+       -unpatch) patch $patch_opts -p1 -R < $0;;
+        *)
+                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+                exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+diff -urNad /home/james/debian/packages/binutils/binutils-2.14.90.0.6/ld/Makefile.am binutils-2.14.90.0.6/ld/Makefile.am
+--- /home/james/debian/packages/binutils/binutils-2.14.90.0.6/ld/Makefile.am	2003-08-21 16:28:48.000000000 +0100
+++ binutils-2.14.90.0.6/ld/Makefile.am	2003-09-10 23:12:09.000000000 +0100
+@@ -19,7 +19,7 @@
+ # We put the scripts in the directory $(scriptdir)/ldscripts.
+ # We can't put the scripts in $(datadir) because the SEARCH_DIR
+ # directives need to be different for native and cross linkers.
+-scriptdir = $(tooldir)/lib
+scriptdir = $(libdir)
+ 
+ EMUL = @EMUL@
+ EMULATION_OFILES = @EMULATION_OFILES@
+diff -urNad /home/james/debian/packages/binutils/binutils-2.14.90.0.6/ld/Makefile.in binutils-2.14.90.0.6/ld/Makefile.in
+--- /home/james/debian/packages/binutils/binutils-2.14.90.0.6/ld/Makefile.in	2003-08-21 16:28:48.000000000 +0100
+++ binutils-2.14.90.0.6/ld/Makefile.in	2003-09-10 23:12:09.000000000 +0100
+@@ -128,7 +128,7 @@
+ # We put the scripts in the directory $(scriptdir)/ldscripts.
+ # We can't put the scripts in $(datadir) because the SEARCH_DIR
+ # directives need to be different for native and cross linkers.
+-scriptdir = $(tooldir)/lib
+scriptdir = $(libdir)
+ 
+ EMUL = @EMUL@
+ EMULATION_OFILES = @EMULATION_OFILES@
--- a/src/uClibc/sources/binutils/2.16.1/300-006_better_file_error.patch
+++ b/src/uClibc/sources/binutils/2.16.1/300-006_better_file_error.patch
@@ -0,0 +1,43 @@
+#!/bin/sh -e
+## 006_better_file_error.dpatch by David Kimdon <dwhedon@gordian.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Specify which filename is causing an error if the filename is a
+## DP: directory. (#45832)
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+       -patch) patch $patch_opts -p1 < $0;;
+       -unpatch) patch $patch_opts -p1 -R < $0;;
+        *)
+                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+                exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+diff -urNad /home/james/debian/packages/binutils/binutils-2.14.90.0.6/bfd/opncls.c binutils-2.14.90.0.6/bfd/opncls.c
+--- /home/james/debian/packages/binutils/binutils-2.14.90.0.6/bfd/opncls.c	2003-07-23 16:08:09.000000000 +0100
+++ binutils-2.14.90.0.6/bfd/opncls.c	2003-09-10 22:35:00.000000000 +0100
+@@ -150,6 +150,13 @@
+ {
+   bfd *nbfd;
+   const bfd_target *target_vec;
+  struct stat s;
+
+  if (stat (filename, &s) == 0)
+    if (S_ISDIR(s.st_mode)) {
+      bfd_set_error (bfd_error_file_not_recognized);
+      return NULL;
+    }
+ 
+   nbfd = _bfd_new_bfd ();
+   if (nbfd == NULL)
--- a/src/uClibc/sources/binutils/2.16.1/300-012_check_ldrunpath_length.patch
+++ b/src/uClibc/sources/binutils/2.16.1/300-012_check_ldrunpath_length.patch
@@ -0,0 +1,47 @@
+#!/bin/sh -e
+## 012_check_ldrunpath_length.dpatch by Chris Chimelis <chris@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Only generate an RPATH entry if LD_RUN_PATH is not empty, for
+## DP: cases where -rpath isn't specified. (#151024)
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+       -patch) patch $patch_opts -p1 < $0;;
+       -unpatch) patch $patch_opts -p1 -R < $0;;
+        *)
+                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+                exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+diff -urNad /home/james/debian/packages/binutils/new/binutils-2.15/ld/emultempl/elf32.em binutils-2.15/ld/emultempl/elf32.em
+--- /home/james/debian/packages/binutils/new/binutils-2.15/ld/emultempl/elf32.em	2004-05-21 23:12:58.000000000 +0100
+++ binutils-2.15/ld/emultempl/elf32.em	2004-05-21 23:12:59.000000000 +0100
+@@ -692,6 +692,8 @@
+ 	      && command_line.rpath == NULL)
+ 	    {
+ 	      lib_path = (const char *) getenv ("LD_RUN_PATH");
+	      if ((lib_path) && (strlen (lib_path) == 0))
+		  lib_path = NULL;
+ 	      if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
+ 						      force))
+ 		break;
+@@ -871,6 +873,8 @@
+   rpath = command_line.rpath;
+   if (rpath == NULL)
+     rpath = (const char *) getenv ("LD_RUN_PATH");
+  if ((rpath) && (strlen (rpath) == 0))
+      rpath = NULL;
+   if (! (bfd_elf_size_dynamic_sections
+ 	 (output_bfd, command_line.soname, rpath,
+ 	  command_line.filter_shlib,
--- a/src/uClibc/sources/binutils/2.16.1/400-mips-ELF_MAXPAGESIZE-4K.patch
+++ b/src/uClibc/sources/binutils/2.16.1/400-mips-ELF_MAXPAGESIZE-4K.patch
@@ -0,0 +1,26 @@
+--- binutils/bfd/elf32-mips.c~
+++ binutils/bfd/elf32-mips.c
+@@ -1613,7 +1613,9 @@
+ 
+ /* The SVR4 MIPS ABI says that this should be 0x10000, and Linux uses
+    page sizes of up to that limit, so we need to respect it.  */
+-#define ELF_MAXPAGESIZE			0x10000
+/*#define ELF_MAXPAGESIZE			0x10000*/
+/* Use 4K to shrink the elf header.  NOT for general use! */
+#define ELF_MAXPAGESIZE			0x1000
+ #define elf32_bed			elf32_tradbed
+ 
+ /* Include the target file again for this target.  */
+--- binutils/bfd/elfn32-mips.c~
+++ binutils/bfd/elfn32-mips.c
+@@ -2399,7 +2399,9 @@
+ 
+ /* The SVR4 MIPS ABI says that this should be 0x10000, and Linux uses
+    page sizes of up to that limit, so we need to respect it.  */
+-#define ELF_MAXPAGESIZE			0x10000
+/*#define ELF_MAXPAGESIZE			0x10000*/
+/* Use 4K to shrink the elf header.  NOT for general use! */
+#define ELF_MAXPAGESIZE			0x1000
+ #define elf32_bed			elf32_tradbed
+ 
+ /* Include the target file again for this target.  */
--- a/src/uClibc/sources/binutils/2.16.1/702-binutils-skip-comments.patch
+++ b/src/uClibc/sources/binutils/2.16.1/702-binutils-skip-comments.patch
@@ -0,0 +1,93 @@
+Retrieved from http://sources.redhat.com/ml/binutils/2004-04/msg00646.html
+Fixes
+localealias.s:544: Error: junk at end of line, first unrecognized character is `,' 
+when building glibc-2.3.2 with gcc-3.4.0 and binutils-2.15.90.0.3
+
+Paths adjusted to match crosstool's patcher.
+
+Message-Id: m3n052qw2g.fsf@whitebox.m5r.de
+From: Andreas Schwab <schwab at suse dot de>
+To: Nathan Sidwell <nathan at codesourcery dot com>
+Cc: Ian Lance Taylor <ian at wasabisystems dot com>, binutils at sources dot redhat dot com
+Date: Fri, 23 Apr 2004 22:27:19 +0200
+Subject: Re: demand_empty_rest_of_line and ignore_rest_of_line
+
+Nathan Sidwell <nathan@codesourcery.com> writes:
+
+> Index: read.c
+> ===================================================================
+> RCS file: /cvs/src/src/gas/read.c,v
+> retrieving revision 1.76
+> diff -c -3 -p -r1.76 read.c
+> *** read.c	12 Mar 2004 17:48:12 -0000	1.76
+> --- read.c	18 Mar 2004 09:56:05 -0000
+> *************** read_a_source_file (char *name)
+> *** 1053,1059 ****
+>   #endif
+>   	  input_line_pointer--;
+>   	  /* Report unknown char as ignored.  */
+> ! 	  ignore_rest_of_line ();
+>   	}
+>   
+>   #ifdef md_after_pass_hook
+> --- 1053,1059 ----
+>   #endif
+>   	  input_line_pointer--;
+>   	  /* Report unknown char as ignored.  */
+> ! 	  demand_empty_rest_of_line ();
+>   	}
+>   
+>   #ifdef md_after_pass_hook
+
+This means that the unknown character is no longer ignored, despite the
+comment.  As a side effect a line starting with a line comment character
+not followed by APP in NO_APP mode now triggers an error instead of just a
+warning, breaking builds of glibc on m68k-linux.  Earlier in
+read_a_source_file where #APP is handled there is another comment that
+claims that unknown comments are ignored, when in fact they aren't (only
+the initial line comment character is skipped).
+
+Note that the presence of #APP will mess up the line counters, but
+that appears to be difficult to fix.
+
+Andreas.
+
+2004-04-23  Andreas Schwab  <schwab@suse.de>
+
+	* read.c (read_a_source_file): Ignore unknown text after line
+	comment character.  Fix misleading comment.
+
+--- binutils/gas/read.c.~1.78.~	2004-04-23 08:58:23.000000000 +0200
+++ binutils/gas/read.c	2004-04-23 21:49:01.000000000 +0200
+@@ -950,10 +950,14 @@ read_a_source_file (char *name)
+ 	      unsigned int new_length;
+ 	      char *tmp_buf = 0;
+ 
+-	      bump_line_counters ();
+ 	      s = input_line_pointer;
+ 	      if (strncmp (s, "APP\n", 4))
+-		continue;	/* We ignore it */
+		{
+		  /* We ignore it */
+		  ignore_rest_of_line ();
+		  continue;
+		}
+	      bump_line_counters ();
+ 	      s += 4;
+ 
+ 	      sb_new (&sbuf);
+@@ -1052,7 +1056,7 @@ read_a_source_file (char *name)
+ 	    continue;
+ #endif
+ 	  input_line_pointer--;
+-	  /* Report unknown char as ignored.  */
+	  /* Report unknown char as error.  */
+ 	  demand_empty_rest_of_line ();
+ 	}
+ 
+
+-- 
+Andreas Schwab, SuSE Labs, schwab@suse.de
+SuSE Linux AG, Maxfeldstra&#xC3;e 5, 90409 N&#xC3;rnberg, Germany
+Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
+"And now for something completely different."
--- a/src/uClibc/sources/binutils/2.16.1/sh-flags-off-by-one.patch
+++ b/src/uClibc/sources/binutils/2.16.1/sh-flags-off-by-one.patch
@@ -0,0 +1,21 @@
+2005-08-25  Kaz Kojima  <kkojima@rr.iij4u.or.jp>
+
+	* elf32-sh.c (sh_elf_get_flags_from_mach): Fix off-by-one error.
+
+Index: bfd/elf32-sh.c
+===================================================================
+RCS file: /cvs/src/src/bfd/elf32-sh.c,v
+retrieving revision 1.128
+retrieving revision 1.129
+diff -u -p -r1.128 -r1.129
+--- binutils/bfd/elf32-sh.c	25 Aug 2005 02:32:10 -0000	1.128
+++ binutils/bfd/elf32-sh.c	25 Aug 2005 05:10:22 -0000	1.129
+@@ -6655,7 +6655,7 @@ sh_elf_set_mach_from_flags (bfd *abfd)
+ int
+ sh_elf_get_flags_from_mach (unsigned long mach)
+ {
+-  int i = ARRAY_SIZE (sh_ef_bfd_table);
+  int i = ARRAY_SIZE (sh_ef_bfd_table) - 1;
+   
+   for (; i>0; i--)
+     if (sh_ef_bfd_table[i] == mach)
--- a/src/uClibc/sources/codesets.txt
+++ b/src/uClibc/sources/codesets.txt
@@ -1,3 +1,2 @@
 ./charmaps/ASCII.pairs
 ./charmaps/ISO-8859-1.pairs
-
--- a/src/uClibc/sources/gcc/4.0.3/100-uclibc-conf.patch
+++ b/src/uClibc/sources/gcc/4.0.3/100-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]+$'
--- a/src/uClibc/sources/gcc/4.0.3/200-uclibc-locale.patch
+++ b/src/uClibc/sources/gcc/4.0.3/200-uclibc-locale.patch
--- a/src/uClibc/sources/gcc/4.0.3/300-libstdc++-pic.patch
+++ b/src/uClibc/sources/gcc/4.0.3/300-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:
--- a/src/uClibc/sources/gcc/4.0.3/301-missing-execinfo_h.patch
+++ b/src/uClibc/sources/gcc/4.0.3/301-missing-execinfo_h.patch
@@ -0,0 +1,11 @@
+--- gcc-4.0.0/boehm-gc/include/gc.h-orig	2005-04-28 22:28:57.000000000 -0500
+++ gcc-4.0.0/boehm-gc/include/gc.h	2005-04-28 22:30:38.000000000 -0500
+@@ -500,7 +500,7 @@
+ #ifdef __linux__
+ # include <features.h>
+ # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \
+-     && !defined(__ia64__)
+     && !defined(__ia64__) && !defined(__UCLIBC__)
+ #   ifndef GC_HAVE_BUILTIN_BACKTRACE
+ #     define GC_HAVE_BUILTIN_BACKTRACE
+ #   endif
--- a/src/uClibc/sources/gcc/4.0.3/302-c99-snprintf.patch
+++ b/src/uClibc/sources/gcc/4.0.3/302-c99-snprintf.patch
@@ -0,0 +1,11 @@
+--- gcc-4.0.0/libstdc++-v3/include/c_std/std_cstdio.h-orig	2005-04-29 00:08:41.000000000 -0500
+++ gcc-4.0.0/libstdc++-v3/include/c_std/std_cstdio.h	2005-04-29 00:08:45.000000000 -0500
+@@ -142,7 +142,7 @@
+   using ::vsprintf;
+ }
+ 
+-#if _GLIBCXX_USE_C99
+#if _GLIBCXX_USE_C99 || defined(__UCLIBC__)
+ 
+ #undef snprintf
+ #undef vfscanf
--- a/src/uClibc/sources/gcc/4.0.3/303-c99-complex-ugly-hack.patch
+++ b/src/uClibc/sources/gcc/4.0.3/303-c99-complex-ugly-hack.patch
@@ -0,0 +1,12 @@
+--- gcc-4.0.0/libstdc++-v3/configure-old	2005-04-30 22:04:48.061603912 -0500
+++ gcc-4.0.0/libstdc++-v3/configure	2005-04-30 22:06:13.678588152 -0500
+@@ -7194,6 +7194,9 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ #include <complex.h>
+#ifdef __UCLIBC__
+#error ugly hack to make sure configure test fails here for cross until uClibc supports the complex funcs
+#endif
+ int
+ main ()
+ {
--- a/src/uClibc/sources/gcc/4.0.3/304-index_macro.patch
+++ b/src/uClibc/sources/gcc/4.0.3/304-index_macro.patch
@@ -0,0 +1,24 @@
+--- gcc-4.1.0/libstdc++-v3/include/ext/rope.mps	2006-03-24 01:49:51 +0100
+++ gcc-4.1.0/libstdc++-v3/include/ext/rope	2006-03-24 01:49:37 +0100
+@@ -59,6 +59,9 @@
+ #include <bits/allocator.h>
+ #include <ext/hash_fun.h>
+ 
+/* cope w/ index defined as macro, SuSv3 proposal */
+#undef index
+
+ # ifdef __GC
+ #   define __GC_CONST const
+ # else
+--- gcc-4.1.0/libstdc++-v3/include/ext/ropeimpl.h.mps	2006-03-24 01:50:04 +0100
+++ gcc-4.1.0/libstdc++-v3/include/ext/ropeimpl.h	2006-03-24 01:50:28 +0100
+@@ -53,6 +53,9 @@
+ #include <ext/memory> // For uninitialized_copy_n
+ #include <ext/numeric> // For power
+ 
+/* cope w/ index defined as macro, SuSv3 proposal */
+#undef index
+
+ namespace __gnu_cxx
+ {
+   using std::size_t;
--- a/src/uClibc/sources/gcc/4.0.3/602-sdk-libstdc++-includes.patch
+++ b/src/uClibc/sources/gcc/4.0.3/602-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
--- a/src/uClibc/sources/gcc/4.0.3/800-arm-bigendian.patch
+++ b/src/uClibc/sources/gcc/4.0.3/800-arm-bigendian.patch
@@ -0,0 +1,67 @@
+By Lennert Buytenhek <buytenh@wantstofly.org>
+Adds support for arm*b-linux* big-endian ARM targets
+
+See http://gcc.gnu.org/PR16350
+
+--- gcc-4.0.3/gcc/config/arm/linux-elf.h
+++ gcc-4.0.3/gcc/config/arm/linux-elf.h
+@@ -31,19 +31,33 @@
+ /* Do not assume anything about header files.  */
+ #define NO_IMPLICIT_EXTERN_C
+ 
+/*
+ * 'config.gcc' defines TARGET_BIG_ENDIAN_DEFAULT as 1 for arm*b-*
+ * (big endian) configurations.
+ */
+#if TARGET_BIG_ENDIAN_DEFAULT
+#define TARGET_ENDIAN_DEFAULT ARM_FLAG_BIG_END
+#define TARGET_ENDIAN_OPTION "mbig-endian"
+#define TARGET_LINKER_EMULATION "armelfb_linux"
+#else
+#define TARGET_ENDIAN_DEFAULT 0
+#define TARGET_ENDIAN_OPTION "mlittle-endian"
+#define TARGET_LINKER_EMULATION "armelf_linux"
+#endif
+
+ #undef  TARGET_DEFAULT_FLOAT_ABI
+ #define TARGET_DEFAULT_FLOAT_ABI ARM_FLOAT_ABI_HARD
+ 
+ #undef  TARGET_DEFAULT
+-#define TARGET_DEFAULT (0)
+#define TARGET_DEFAULT (TARGET_ENDIAN_DEFAULT)
+ 
+ #define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm6
+ 
+-#define SUBTARGET_EXTRA_LINK_SPEC " -m armelf_linux -p"
+#define SUBTARGET_EXTRA_LINK_SPEC " -m " TARGET_LINKER_EMULATION " -p"
+ 
+ #undef  MULTILIB_DEFAULTS
+ #define MULTILIB_DEFAULTS \
+-	{ "marm", "mlittle-endian", "mhard-float", "mno-thumb-interwork" }
+	{ "marm", TARGET_ENDIAN_OPTION, "mhard-float", "mno-thumb-interwork" }
+ 
+ /* The GNU C++ standard library requires that these macros be defined.  */
+ #undef CPLUSPLUS_CPP_SPEC
+@@ -90,7 +104,7 @@
+    %{rdynamic:-export-dynamic} \
+    %{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2} \
+    -X \
+-   %{mbig-endian:-EB}" \
+   %{mbig-endian:-EB} %{mlittle-endian:-EL}" \
+    SUBTARGET_EXTRA_LINK_SPEC
+ 
+ #define TARGET_OS_CPP_BUILTINS()		\
+--- gcc-4.0.3/gcc/config.gcc
+++ gcc-4.0.3/gcc/config.gcc
+@@ -672,6 +672,11 @@
+ 	;;
+ arm*-*-linux*)			# ARM GNU/Linux with ELF
+ 	tm_file="dbxelf.h elfos.h linux.h arm/elf.h  arm/linux-gas.h arm/linux-elf.h arm/aout.h arm/arm.h"
+	case $target in
+	arm*b-*)
+		tm_defines="TARGET_BIG_ENDIAN_DEFAULT=1 $tm_defines"
+		;;
+	esac
+ 	tmake_file="${tmake_file} arm/t-arm arm/t-linux"
+ 	extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
+ 	gnu_ld=yes
--- a/src/uClibc/sources/locales.txt
+++ b/src/uClibc/sources/locales.txt
@@ -5,3 +5,4 @@ UTF-8 yes
 8-BIT yes
 #---------------------------------------------------------------------------
 en_US.UTF-8 UTF-8
+en_US ISO-8859-1
--- a/src/uClibc/sources/patch-kernel.sh
+++ b/src/uClibc/sources/patch-kernel.sh
@@ -8,7 +8,8 @@
 # Set directories from arguments, or use defaults.
 targetdir=${1-.}
 patchdir=${2-../kernel-patches}
-patchpattern=${3-*}
+shift 2
+patchpattern=${@-*}

 if [ ! -d "${targetdir}" ] ; then
    echo "Aborting.  '${targetdir}' is not a directory."
@@ -19,7 +20,7 @@ if [ ! -d "${patchdir}" ] ; then
    exit 1
 fi
    
-for i in ${patchdir}/${patchpattern} ; do 
+for i in `cd ${patchdir}; ls -d ${patchpattern} 2> /dev/null` ; do 
    case "$i" in
 	*.gz)
 	type="gzip"; uncomp="gunzip -dc"; ;; 
@@ -36,7 +37,7 @@ for i in ${patchdir}/${patchpattern} ; do
    esac
    echo ""
    echo "Applying ${i} using ${type}: " 
-    ${uncomp} ${i} | patch -p1 -E -d ${targetdir} 
+    ${uncomp} ${patchdir}/${i} | patch -p1 -E -d ${targetdir} 
    if [ $? != 0 ] ; then
        echo "Patch failed!  Please fix $i!"
 	exit 1
--- a/src/uClibc/sources/uClibc.config-i586
+++ b/src/uClibc/sources/uClibc.config-i586
@@ -0,0 +1,186 @@
+#
+# Automatically generated make config: don't edit
+#
+# TARGET_alpha is not set
+# TARGET_arm is not set
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+TARGET_i386=y
+# TARGET_i960 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+HAVE_ELF=y
+ARCH_SUPPORTS_LITTLE_ENDIAN=y
+TARGET_ARCH="i386"
+# CONFIG_GENERIC_386 is not set
+# CONFIG_386 is not set
+# CONFIG_486 is not set
+CONFIG_586=y
+# CONFIG_586MMX is not set
+# CONFIG_686 is not set
+# CONFIG_PENTIUMII is not set
+# CONFIG_PENTIUMIII is not set
+# CONFIG_PENTIUM4 is not set
+# CONFIG_K6 is not set
+# CONFIG_K7 is not set
+# CONFIG_ELAN is not set
+# CONFIG_CRUSOE is not set
+# CONFIG_WINCHIPC6 is not set
+# CONFIG_WINCHIP2 is not set
+# CONFIG_CYRIXIII is not set
+# CONFIG_NEHEMIAH is not set
+ARCH_LITTLE_ENDIAN=y
+# ARCH_BIG_ENDIAN is not set
+# ARCH_HAS_NO_MMU is not set
+ARCH_HAS_MMU=y
+UCLIBC_HAS_FLOATS=y
+HAS_FPU=y
+DO_C99_MATH=y
+KERNEL_SOURCE="/usr"
+C_SYMBOL_PREFIX=""
+HAVE_DOT_CONFIG=y
+
+#
+# General Library Settings
+#
+# HAVE_NO_PIC is not set
+DOPIC=y
+# HAVE_NO_SHARED is not set
+HAVE_SHARED=y
+# ARCH_HAS_NO_LDSO is not set
+BUILD_UCLIBC_LDSO=y
+FORCE_SHAREABLE_TEXT_SEGMENTS=y
+LDSO_LDD_SUPPORT=y
+LDSO_CACHE_SUPPORT=y
+# LDSO_PRELOAD_FILE_SUPPORT is not set
+LDSO_BASE_FILENAME="ld.so"
+LDSO_RUNPATH=y
+# DL_FINI_CRT_COMPAT is not set
+UCLIBC_CTOR_DTOR=y
+# HAS_NO_THREADS is not set
+UCLIBC_HAS_THREADS=y
+# PTHREADS_DEBUG_SUPPORT is not set
+UCLIBC_HAS_LFS=y
+# UCLIBC_STATIC_LDCONFIG is not set
+# MALLOC is not set
+# MALLOC_SIMPLE is not set
+MALLOC_STANDARD=y
+MALLOC_GLIBC_COMPAT=y
+UCLIBC_DYNAMIC_ATEXIT=y
+HAS_SHADOW=y
+UNIX98PTY_ONLY=y
+ASSUME_DEVPTS=y
+UCLIBC_HAS_TM_EXTENSIONS=y
+UCLIBC_HAS_TZ_CACHING=y
+UCLIBC_HAS_TZ_FILE=y
+UCLIBC_HAS_TZ_FILE_READ_MANY=y
+UCLIBC_TZ_FILE_PATH="/etc/TZ"
+
+#
+# Networking Support
+#
+# UCLIBC_HAS_IPV6 is not set
+# UCLIBC_HAS_RPC is not set
+
+#
+# String and Stdio Support
+#
+UCLIBC_HAS_STRING_GENERIC_OPT=y
+UCLIBC_HAS_STRING_ARCH_OPT=y
+UCLIBC_HAS_CTYPE_TABLES=y
+UCLIBC_HAS_CTYPE_SIGNED=y
+UCLIBC_HAS_CTYPE_UNSAFE=y
+# UCLIBC_HAS_CTYPE_CHECKED is not set
+# UCLIBC_HAS_CTYPE_ENFORCED is not set
+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_HEXADECIMAL_FLOATS is not set
+# UCLIBC_HAS_GLIBC_DIGIT_GROUPING is not set
+UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
+UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
+# UCLIBC_HAS_SCANF_GLIBC_A_FLAG is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_256 is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set
+UCLIBC_HAS_STDIO_BUFSIZ_4096=y
+# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set
+UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y
+# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set
+# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set
+# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set
+UCLIBC_HAS_STDIO_GETC_MACRO=y
+UCLIBC_HAS_STDIO_PUTC_MACRO=y
+UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y
+# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set
+# UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE is not set
+# UCLIBC_HAS_GLIBC_CUSTOM_STREAMS is not set
+# UCLIBC_HAS_PRINTF_M_SPEC is not set
+UCLIBC_HAS_ERRNO_MESSAGES=y
+# UCLIBC_HAS_SYS_ERRLIST is not set
+UCLIBC_HAS_SIGNUM_MESSAGES=y
+UCLIBC_HAS_SYS_SIGLIST=y
+UCLIBC_HAS_GNU_GETOPT=y
+
+#
+# Big and Tall
+#
+UCLIBC_HAS_REGEX=y
+# UCLIBC_HAS_WORDEXP is not set
+UCLIBC_HAS_FTW=y
+UCLIBC_HAS_GLOB=y
+
+#
+# Library Installation Options
+#
+SHARED_LIB_LOADER_PREFIX="/lib"
+RUNTIME_PREFIX="/"
+DEVEL_PREFIX="/usr/"
+
+#
+# uClibc security related options
+#
+UCLIBC_SECURITY=y
+UCLIBC_BUILD_PIE=y
+UCLIBC_HAS_SSP=y
+# SSP_QUICK_CANARY is not set
+# SSP_USE_ERANDOM is not set
+PROPOLICE_BLOCK_ABRT=y
+# PROPOLICE_BLOCK_SEGV is not set
+# PROPOLICE_BLOCK_KILL is not set
+UCLIBC_BUILD_SSP=y
+UCLIBC_BUILD_RELRO=y
+UCLIBC_BUILD_NOW=y
+UCLIBC_BUILD_NOEXECSTACK=y
+
+#
+# uClibc development/debugging options
+#
+CROSS_COMPILER_PREFIX=""
+# DODEBUG is not set
+# DODEBUG_PT is not set
+# DOASSERTS is not set
+# SUPPORT_LD_DEBUG is not set
+# SUPPORT_LD_DEBUG_EARLY is not set
+WARNINGS="-Wall"
+# UCLIBC_MJN3_ONLY is not set