merge of 016c6244729b3a1e0b642424fa21373b86defa21

     and 1f2a8090a62969a13a937ea60ea66023fb6d48e2

29 files changed, 111 insertions, 3008 deletions

diff --git a/packages/altboot/altboot_1.0.7.bb b/packages/altboot/altboot_1.0.7.bb
index ee0fb7c1df..245cf2a426 100644
--- a/packages/altboot/altboot_1.0.7.bb
+++ b/packages/altboot/altboot_1.0.7.bb
@@ -13,18 +13,25 @@ LICENSE = "GPL"
 
 ######################################################################################
 
-RRECOMMENDS = "e2fsprogs-e2fsck dosfstools"
-RRECOMMENDS_append_akita = " kexec-tools"
-RRECOMMENDS_append_spitz = " kexec-tools"
-RRECOMMENDS_append_c7x0 = " kexec-tools"
+RRECOMMENDS_${PN} = "e2fsprogs-e2fsck dosfstools"
+RRECOMMENDS_${PN}_append_akita = " kexec-tools"
+RRECOMMENDS_${PN}_append_spitz = " kexec-tools"
+RRECOMMENDS_${PN}_append_c7x0 = " kexec-tools"
+
+RDEPENDS_${PN} = "${PN}-conf"
+RDEPENDS_${PN}-conf = "${PN}"
 
 ######################################################################################
 
-PR = "r1"
+PR = "r0"
 
 ######################################################################################
 
-PACKAGE_ARCH = "${MACHINE}"
+PACKAGES = "${PN}-conf ${PN}-doc ${PN}"
+
+PACKAGE_ARCH_${PN} = all
+PACKAGE_ARCH_${PN}-doc = all
+PACKAGE_ARCH_${PN}-conf = "${MACHINE}"
 
 TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '-')}"
 
@@ -34,6 +41,10 @@ S = "${WORKDIR}/altboot/"
 
 ######################################################################################
 
+FILES_${PN}-conf = "/etc/altboot*.cfg"
+
+######################################################################################
+
 do_install() {
 	install -d ${D}/sbin
 	install -d ${D}/etc/altboot-menu
@@ -53,19 +64,9 @@ do_install() {
 	install -m 0644 ${WORKDIR}/altboot/altboot.func ${D}/etc
 	install -m 0755 ${WORKDIR}/altboot/init.altboot ${D}/sbin
 	
-	if test -d ${WORKDIR}/altboot/${MACHINE}/altboot-menu/	
-	then
-		install -m 0755 ${WORKDIR}/altboot/${MACHINE}/altboot-menu/*-* ${D}/etc/altboot-menu
-	else
-		install -m 0755 ${WORKDIR}/altboot/altboot-menu/*-* ${D}/etc/altboot-menu
-	fi
+	install -m 0755 ${WORKDIR}/altboot/altboot-menu/*-* ${D}/etc/altboot-menu
 
-	if test -d ${WORKDIR}/altboot/${MACHINE}/altboot-menu/Advanced/
-	then
-		install -m 0755 ${WORKDIR}/altboot/${MACHINE}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced
-	else
-		install -m 0755 ${WORKDIR}/altboot/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced
-	fi
+	install -m 0755 ${WORKDIR}/altboot/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced
 	
 	install -m 0755 ${WORKDIR}/altboot/altboot.rc/*.sh ${D}/etc/altboot.rc
 	install -m 0644 ${WORKDIR}/altboot/altboot.rc/*.txt ${D}/etc/altboot.rc	
@@ -80,13 +81,13 @@ do_configure() {
 
 ######################################################################################
 
-pkg_postinst() {
+pkg_postinst_${PN}() {
 	update-alternatives --install /sbin/init init /sbin/init.altboot 55
 }
 
 ######################################################################################
 
-pkg_postrm() {
+pkg_postrm_${PN}() {
 	update-alternatives --remove init /sbin/init.altboot
 }
 
diff --git a/packages/binutils/binutils-2.15.90.0.3/600-arm-textrel.patch b/packages/binutils/binutils-2.15.90.0.3/600-arm-textrel.patch
deleted file mode 100644
index 73d5b9df8e..0000000000
--- a/packages/binutils/binutils-2.15.90.0.3/600-arm-textrel.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-http://sources.redhat.com/ml/binutils/2004-06/msg00010.html
---- binutils-2.15.90.0.3-old/bfd/elf32-arm.h	2004-04-12 14:56:33.000000000 -0500
-+++ binutils-2.15.90.0.3/bfd/elf32-arm.h	2004-09-03 06:56:40.000000000 -0500
-@@ -87,6 +87,8 @@
- #endif
- static bfd_boolean allocate_dynrelocs 
-   PARAMS ((struct elf_link_hash_entry *h, PTR inf));
-+static bfd_boolean elf32_arm_readonly_dynrelocs
-+  PARAMS ((struct elf_link_hash_entry *, PTR));
- static bfd_boolean create_got_section 
-   PARAMS ((bfd * dynobj, struct bfd_link_info * info));
- static bfd_boolean elf32_arm_create_dynamic_sections 
-@@ -3531,6 +3533,37 @@
-   return TRUE;
- }
- 
-+/* Find any dynamic relocs that apply to read-only sections.  */
-+
-+static bfd_boolean
-+elf32_arm_readonly_dynrelocs (h, inf)
-+     struct elf_link_hash_entry *h;
-+     PTR inf;
-+{
-+  struct elf32_arm_link_hash_entry *eh;
-+  struct elf32_arm_relocs_copied *p;
-+
-+  if (h->root.type == bfd_link_hash_warning)
-+    h = (struct elf_link_hash_entry *) h->root.u.i.link;
-+
-+  eh = (struct elf32_arm_link_hash_entry *) h;
-+  for (p = eh->relocs_copied; p != NULL; p = p->next)
-+    {
-+      asection *s = p->section;
-+
-+      if (s != NULL && (s->flags & SEC_READONLY) != 0)
-+       {
-+         struct bfd_link_info *info = (struct bfd_link_info *) inf;
-+
-+         info->flags |= DF_TEXTREL;
-+
-+         /* Not an error, just cut short the traversal.  */
-+         return FALSE;
-+       }
-+    }
-+  return TRUE;
-+}
-+
- /* Set the sizes of the dynamic sections.  */
- 
- static bfd_boolean
-@@ -3740,6 +3773,12 @@
- 	    return FALSE;
- 	}
- 
-+      /* If any dynamic relocs apply to a read-only section,
-+         then we need a DT_TEXTREL entry.  */
-+      if ((info->flags & DF_TEXTREL) == 0)
-+        elf_link_hash_traverse (&htab->root, elf32_arm_readonly_dynrelocs,
-+                                (PTR) info);
-+
-       if ((info->flags & DF_TEXTREL) != 0)
- 	{
- 	  if (!add_dynamic_entry (DT_TEXTREL, 0))
diff --git a/packages/binutils/binutils-2.15.90.0.3/binutils-100_cflags_for_build.patch b/packages/binutils/binutils-2.15.90.0.3/binutils-100_cflags_for_build.patch
deleted file mode 100644
index 2329ce2284..0000000000
--- a/packages/binutils/binutils-2.15.90.0.3/binutils-100_cflags_for_build.patch
+++ /dev/null
@@ -1,86 +0,0 @@
---- binutils-2.14.90.0.6/bfd/doc/Makefile.am.cflags_for_build	2003-12-04 21:51:44.000000000 -0500
-+++ binutils-2.14.90.0.6/bfd/doc/Makefile.am	2003-12-04 21:52:33.000000000 -0500
-@@ -55,10 +55,10 @@
- MKDOC = chew$(EXEEXT_FOR_BUILD)
- 
- $(MKDOC): chew.o
--	$(CC_FOR_BUILD) -o $(MKDOC) chew.o $(CFLAGS) $(LOADLIBES) $(LDFLAGS)
-+	$(CC_FOR_BUILD) -o $(MKDOC) chew.o $(CFLAGS_FOR_BUILD) $(LOADLIBES) $(LDFLAGS_FOR_BUILD)
- 
- chew.o: chew.c
--	$(CC_FOR_BUILD) -c -I.. -I$(srcdir)/.. -I$(srcdir)/../../include -I$(srcdir)/../../intl -I../../intl $(H_CFLAGS) $(CFLAGS) $(srcdir)/chew.c
-+	$(CC_FOR_BUILD) -c -I.. -I$(srcdir)/.. -I$(srcdir)/../../include -I$(srcdir)/../../intl -I../../intl $(H_CFLAGS) $(CFLAGS_FOR_BUILD) $(srcdir)/chew.c
- 
- protos: libbfd.h libcoff.h bfd.h
- 
---- binutils-2.14.90.0.6/binutils/Makefile.am.cflags_for_build	2003-12-04 21:51:44.000000000 -0500
-+++ binutils-2.14.90.0.6/binutils/Makefile.am	2003-12-04 21:53:16.000000000 -0500
-@@ -219,20 +219,20 @@
- 	./sysinfo$(EXEEXT_FOR_BUILD) -d <$(srcdir)/sysroff.info >sysroff.h
- 
- sysinfo$(EXEEXT_FOR_BUILD): sysinfo.o syslex.o
--	$(CC_FOR_BUILD) $(CFLAGS) $(LDFLAGS) -o $@ sysinfo.o syslex.o 
-+	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ sysinfo.o syslex.o 
- 
- syslex.o: syslex.c sysinfo.h
- 	if [ -r syslex.c ]; then \
--	  $(CC_FOR_BUILD) -c -I. $(CFLAGS)  syslex.c  ; \
-+	  $(CC_FOR_BUILD) -c -I. $(CFLAGS_FOR_BUILD)  syslex.c  ; \
- 	else \
--	  $(CC_FOR_BUILD) -c -I. -I$(srcdir) $(CFLAGS) $(srcdir)/syslex.c ;\
-+	  $(CC_FOR_BUILD) -c -I. -I$(srcdir) $(CFLAGS_FOR_BUILD) $(srcdir)/syslex.c ;\
- 	fi
- 
- sysinfo.o: sysinfo.c
- 	if [ -r sysinfo.c ]; then \
--	  $(CC_FOR_BUILD) -c -I. $(CFLAGS)  sysinfo.c  ; \
-+	  $(CC_FOR_BUILD) -c -I. $(CFLAGS_FOR_BUILD)  sysinfo.c  ; \
- 	else \
--	  $(CC_FOR_BUILD) -c -I. $(CFLAGS) $(srcdir)/sysinfo.c ; \
-+	  $(CC_FOR_BUILD) -c -I. $(CFLAGS_FOR_BUILD) $(srcdir)/sysinfo.c ; \
- 	fi
- 
- # We need these for parallel make.
---- binutils-2.14.90.0.6/bfd/doc/Makefile.in~	2003-07-23 11:08:09.000000000 -0400
-+++ binutils-2.14.90.0.6/bfd/doc/Makefile.in	2003-12-04 23:16:31.000000000 -0500
-@@ -469,10 +469,10 @@
- 
- 
- $(MKDOC): chew.o
--	$(CC_FOR_BUILD) -o $(MKDOC) chew.o $(CFLAGS) $(LOADLIBES) $(LDFLAGS)
-+	$(CC_FOR_BUILD) -o $(MKDOC) chew.o $(CFLAGS_FOR_BUILD) $(LOADLIBES) $(LDFLAGS_FOR_BUILD)
- 
- chew.o: chew.c
--	$(CC_FOR_BUILD) -c -I.. -I$(srcdir)/.. -I$(srcdir)/../../include -I$(srcdir)/../../intl -I../../intl $(H_CFLAGS) $(CFLAGS) $(srcdir)/chew.c
-+	$(CC_FOR_BUILD) -c -I.. -I$(srcdir)/.. -I$(srcdir)/../../include -I$(srcdir)/../../intl -I../../intl $(H_CFLAGS) $(CFLAGS_FOR_BUILD) $(srcdir)/chew.c
- 
- protos: libbfd.h libcoff.h bfd.h
- 
---- binutils-2.14.90.0.6/binutils/Makefile.in~	2003-08-21 11:28:48.000000000 -0400
-+++ binutils-2.14.90.0.6/binutils/Makefile.in	2003-12-04 23:17:34.000000000 -0500
-@@ -978,20 +978,20 @@
- 	./sysinfo$(EXEEXT_FOR_BUILD) -d <$(srcdir)/sysroff.info >sysroff.h
- 
- sysinfo$(EXEEXT_FOR_BUILD): sysinfo.o syslex.o
--	$(CC_FOR_BUILD) $(CFLAGS) $(LDFLAGS) -o $@ sysinfo.o syslex.o 
-+	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ sysinfo.o syslex.o 
- 
- syslex.o: syslex.c sysinfo.h
- 	if [ -r syslex.c ]; then \
--	  $(CC_FOR_BUILD) -c -I. $(CFLAGS)  syslex.c  ; \
-+	  $(CC_FOR_BUILD) -c -I. $(CFLAGS_FOR_BUILD)  syslex.c  ; \
- 	else \
--	  $(CC_FOR_BUILD) -c -I. -I$(srcdir) $(CFLAGS) $(srcdir)/syslex.c ;\
-+	  $(CC_FOR_BUILD) -c -I. -I$(srcdir) $(CFLAGS_FOR_BUILD) $(srcdir)/syslex.c ;\
- 	fi
- 
- sysinfo.o: sysinfo.c
- 	if [ -r sysinfo.c ]; then \
--	  $(CC_FOR_BUILD) -c -I. $(CFLAGS)  sysinfo.c  ; \
-+	  $(CC_FOR_BUILD) -c -I. $(CFLAGS_FOR_BUILD)  sysinfo.c  ; \
- 	else \
--	  $(CC_FOR_BUILD) -c -I. $(CFLAGS) $(srcdir)/sysinfo.c ; \
-+	  $(CC_FOR_BUILD) -c -I. $(CFLAGS_FOR_BUILD) $(srcdir)/sysinfo.c ; \
- 	fi
- 
- # We need these for parallel make.
diff --git a/packages/binutils/binutils-2.15.90.0.3/binutils-2.15.90.0.3-uclibc-100-conf.patch b/packages/binutils/binutils-2.15.90.0.3/binutils-2.15.90.0.3-uclibc-100-conf.patch
deleted file mode 100644
index 4f6e2c7f8d..0000000000
--- a/packages/binutils/binutils-2.15.90.0.3/binutils-2.15.90.0.3-uclibc-100-conf.patch
+++ /dev/null
@@ -1,600 +0,0 @@
---- binutils-2.15.90.0.3/bfd/config.bfd.conf	2004-04-12 15:56:33.000000000 -0400
-+++ binutils-2.15.90.0.3/bfd/config.bfd	2004-04-22 21:58:37.000000000 -0400
-@@ -126,7 +126,7 @@
-     targ_defvec=ecoffalpha_little_vec
-     targ_selvecs=bfd_elf64_alpha_vec
-     ;;
--  alpha*-*-linux-gnu* | alpha*-*-elf*)
-+  alpha*-*-linux-gnu* | alpha*-*-linux-uclibc* | alpha*-*-elf*)
-     targ_defvec=bfd_elf64_alpha_vec
-     targ_selvecs=ecoffalpha_little_vec
-     ;;
-@@ -136,7 +136,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-gnu* | ia64*-*-elf* | ia64*-*-linux-uclibc* | ia64*-*-kfreebsd*-gnu)
-     targ_defvec=bfd_elf64_ia64_little_vec
-     targ_selvecs="bfd_elf64_ia64_big_vec bfd_efi_app_ia64_vec"
-     ;;
-@@ -213,7 +213,7 @@
-     targ_defvec=bfd_elf32_littlearm_vec
-     targ_selvecs=bfd_elf32_bigarm_vec
-     ;;
--  armeb-*-elf | arm*b-*-linux-gnu*)
-+  armeb-*-elf | arm*b-*-linux-gnu* | arm*b-*-linux-uclibc*)
-     targ_defvec=bfd_elf32_bigarm_vec
-     targ_selvecs=bfd_elf32_littlearm_vec
-     ;;
-@@ -221,8 +221,8 @@
-     targ_defvec=bfd_elf32_littlearm_vec
-     targ_selvecs=bfd_elf32_bigarm_vec
-     ;;
--  arm-*-elf | arm-*-freebsd* | arm*-*-linux-gnu* | arm*-*-conix* | \
--  arm*-*-uclinux* | arm-*-kfreebsd*-gnu | arm-*-vxworks)
-+  arm-*-elf | arm-*-freebsd* | arm*-*-linux-gnu* | arm*-*-linux-uclibc* | \
-+  arm*-*-conix* | arm*-*-uclinux* | arm-*-kfreebsd*-gnu | arm-*-vxworks)
-     targ_defvec=bfd_elf32_littlearm_vec
-     targ_selvecs=bfd_elf32_bigarm_vec
-     ;;
-@@ -360,7 +360,7 @@
-     ;;
- 
- #ifdef BFD64
--  hppa*64*-*-linux-gnu*)
-+  hppa*64*-*-linux-gnu* | hppa*64*-*-linux-uclibc*)
-     targ_defvec=bfd_elf64_hppa_linux_vec
-     targ_selvecs=bfd_elf64_hppa_vec
-     ;;
-@@ -371,7 +371,7 @@
-     ;;
- #endif
- 
--  hppa*-*-linux-gnu* | hppa*-*-netbsd*)
-+  hppa*-*-linux-gnu* | hppa*-*-netbsd* | hppa*-*-linux-uclibc*)
-     targ_defvec=bfd_elf32_hppa_linux_vec
-     targ_selvecs=bfd_elf32_hppa_vec
-     ;;
-@@ -494,7 +494,7 @@
-     targ_selvecs=bfd_elf32_i386_vec
-     targ_underscore=yes
-     ;;
--  i[3-7]86-*-linux-gnu*)
-+  i[3-7]86-*-linux-gnu* | i[3-7]86-*-linux-uclibc*)
-     targ_defvec=bfd_elf32_i386_vec
-     targ_selvecs="i386linux_vec bfd_efi_app_ia32_vec"
-     targ64_selvecs=bfd_elf64_x86_64_vec
-@@ -508,7 +508,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-gnu* | x86_64-*-linux-uclibc*)
-     targ_defvec=bfd_elf64_x86_64_vec
-     targ_selvecs="bfd_elf32_i386_vec i386linux_vec bfd_efi_app_ia32_vec"
-     ;;
-@@ -683,7 +683,7 @@
-     targ_selvecs=bfd_elf32_m68k_vec
-     targ_underscore=yes
-     ;;
--  m68*-*-linux-gnu*)
-+  m68*-*-linux-gnu* | m68*-*-linux-uclibc*)
-     targ_defvec=bfd_elf32_m68k_vec
-     targ_selvecs=m68klinux_vec
-     ;;
-@@ -955,7 +955,8 @@
-     ;;
- #endif
-   powerpc-*-*bsd* | powerpc-*-elf* | powerpc-*-sysv4* | powerpc-*-eabi* | \
--  powerpc-*-solaris2* | powerpc-*-linux-gnu* | powerpc-*-rtems* | \
-+  powerpc-*-solaris2* | powerpc-*-linux-gnu* | powerpc-*-linux-uclibc* | \
-+  powerpc-*-rtems* | \
-   powerpc-*-chorus* | powerpc-*-vxworks* | powerpc-*-windiss*)
-     targ_defvec=bfd_elf32_powerpc_vec
-     targ_selvecs="rs6000coff_vec bfd_elf32_powerpcle_vec ppcboot_vec"
-@@ -987,8 +988,8 @@
-     targ_selvecs="rs6000coff_vec bfd_elf32_powerpc_vec ppcboot_vec"
-     ;;
-   powerpcle-*-elf* | powerpcle-*-sysv4* | powerpcle-*-eabi* | \
--  powerpcle-*-solaris2* | powerpcle-*-linux-gnu* | powerpcle-*-vxworks* |\
--  powerpcle-*-rtems*)
-+  powerpcle-*-solaris2* | powerpcle-*-linux-gnu* | powerpcle-*-linux-uclibc* |\
-+  powerpcle-*-vxworks* | powerpcle-*-rtems*)
-     targ_defvec=bfd_elf32_powerpcle_vec
-     targ_selvecs="rs6000coff_vec bfd_elf32_powerpc_vec ppcboot_vec"
-     targ64_selvecs="bfd_elf64_powerpc_vec bfd_elf64_powerpcle_vec"
-@@ -1149,7 +1150,7 @@
-     targ_selvecs="bfd_elf32_sparc_vec sunos_big_vec"
-     targ_underscore=yes
-     ;;
--  sparc-*-linux-gnu*)
-+  sparc-*-linux-gnu* | sparc-*-linux-uclibc*)
-     targ_defvec=bfd_elf32_sparc_vec
-     targ_selvecs="sparclinux_vec bfd_elf64_sparc_vec sunos_big_vec"
-     ;;
-@@ -1196,7 +1197,7 @@
-     targ_defvec=sunos_big_vec
-     targ_underscore=yes
-     ;;
--  sparc64-*-linux-gnu*)
-+  sparc64-*-linux-gnu* | sparc64-*-linux-uclibc*)
-     targ_defvec=bfd_elf64_sparc_vec
-     targ_selvecs="bfd_elf32_sparc_vec sparclinux_vec sunos_big_vec"
-     ;;
---- binutils-2.15.90.0.3/bfd/configure.conf	2004-04-15 00:26:05.000000000 -0400
-+++ binutils-2.15.90.0.3/bfd/configure	2004-04-22 21:58:37.000000000 -0400
-@@ -1699,6 +1699,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*)
-   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-     lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
-@@ -5278,7 +5283,7 @@
-   alpha*-*-freebsd* | alpha*-*-kfreebsd*-gnu)
- 	COREFILE=''
- 	;;
--  alpha*-*-linux-gnu*)
-+  alpha*-*-linux-gnu* | alpha*-*-linux-uclibc*)
- 	COREFILE=trad-core.lo
- 	TRAD_HEADER='"hosts/alphalinux.h"'
- 	;;
-@@ -5338,7 +5343,7 @@
- 	COREFILE=trad-core.lo
- 	TRAD_HEADER='"hosts/i386mach3.h"'
- 	;;
--  i[3-7]86-*-linux-gnu*)
-+  i[3-7]86-*-linux-gnu* | i[3-7]86-*-linux-uclibc*)
- 	COREFILE=trad-core.lo
- 	TRAD_HEADER='"hosts/i386linux.h"'
- 	;;
-@@ -5376,7 +5381,7 @@
- 	COREFILE=trad-core.lo
- 	TRAD_HEADER='"hosts/hp300bsd.h"'
- 	;;
--  m68*-*-linux-gnu*)
-+  m68*-*-linux-gnu* | m68*-*-linux-uclibc*)
- 	COREFILE=trad-core.lo
- 	TRAD_HEADER='"hosts/m68klinux.h"'
- 	;;
---- binutils-2.15.90.0.3/bfd/configure.in.conf	2004-04-15 00:26:05.000000000 -0400
-+++ binutils-2.15.90.0.3/bfd/configure.in	2004-04-22 21:58:37.000000000 -0400
-@@ -178,7 +178,7 @@
-   alpha*-*-freebsd* | alpha*-*-kfreebsd*-gnu)
- 	COREFILE=''
- 	;;
--  alpha*-*-linux-gnu*)
-+  alpha*-*-linux-gnu* | alpha*-*-linux-uclibc*)
- 	COREFILE=trad-core.lo
- 	TRAD_HEADER='"hosts/alphalinux.h"'
- 	;;
-@@ -259,7 +259,7 @@
- 	TRAD_HEADER='"hosts/i386mach3.h"'
- 	;;
- changequote(,)dnl
--  i[3-7]86-*-linux-gnu*)
-+  i[3-7]86-*-linux-gnu* | i[3-7]86-*-linux-uclibc*)
- changequote([,])dnl
- 	COREFILE=trad-core.lo
- 	TRAD_HEADER='"hosts/i386linux.h"'
-@@ -300,7 +300,7 @@
- 	COREFILE=trad-core.lo
- 	TRAD_HEADER='"hosts/hp300bsd.h"'
- 	;;
--  m68*-*-linux-gnu*)
-+  m68*-*-linux-gnu* | m68*-*-linux-uclibc*)
- 	COREFILE=trad-core.lo
- 	TRAD_HEADER='"hosts/m68klinux.h"'
- 	;;
---- binutils-2.15.90.0.3/gas/configure.conf	2004-04-12 15:56:34.000000000 -0400
-+++ binutils-2.15.90.0.3/gas/configure	2004-04-22 22:00:28.000000000 -0400
-@@ -3401,6 +3401,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*)
-   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-     lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
-@@ -4226,6 +4231,7 @@
-       alpha*-*-osf*)			fmt=ecoff ;;
-       alpha*-*-linuxecoff*)		fmt=ecoff ;;
-       alpha*-*-linux-gnu*)		fmt=elf em=linux ;;
-+      alpha*-*-linux-uclibc*)		fmt=elf em=linux ;;
-       alpha*-*-netbsd*)			fmt=elf em=nbsd ;;
-       alpha*-*-openbsd*)		fmt=elf em=obsd ;;
- 
-@@ -4242,6 +4248,7 @@
-       arm*-*-conix*)			fmt=elf ;;
-       arm-*-linux*aout*)		fmt=aout em=linux ;;
-       arm*-*-linux-gnu*)		fmt=elf  em=linux ;;
-+      arm*-*-linux-uclibc*)		fmt=elf  em=linux ;;
-       arm*-*-uclinux*)			fmt=elf  em=linux ;;
-       arm-*-netbsdelf*)                 fmt=elf  em=nbsd ;;
-       arm-*-*n*bsd*)			fmt=aout em=nbsd ;;
-@@ -4255,6 +4262,7 @@
-       avr-*-*)				fmt=elf ;;
- 
-       cris-*-linux-gnu*)		fmt=multi bfd_gas=yes em=linux ;;
-+      cris-*-linux-uclibc*)		fmt=multi bfd_gas=yes em=linux ;;
-       cris-*-*)				fmt=multi bfd_gas=yes ;;
- 
-       d10v-*-*)				fmt=elf ;;
-@@ -4311,7 +4319,9 @@
-       i386-*-linux*oldld)		fmt=aout em=linux ;;
-       i386-*-linux*coff*)		fmt=coff em=linux ;;
-       i386-*-linux-gnu*)		fmt=elf em=linux ;;
-+      i386-*-linux-uclibc*)		fmt=elf em=linux ;;
-       x86_64-*-linux-gnu*)		fmt=elf em=linux ;;
-+      x86_64-*-linux-uclibc*)		fmt=elf em=linux ;;
-       i386-*-lynxos*)			fmt=coff em=lynx ;;
-       i386-*-sysv[45]*)			fmt=elf ;;
-       i386-*-solaris*)			fmt=elf ;;
-@@ -4371,6 +4381,7 @@
-       ia64-*-elf*)			fmt=elf ;;
-       ia64-*-aix*)			fmt=elf em=ia64aix ;;
-       ia64-*-linux-gnu*)		fmt=elf em=linux ;;
-+      ia64-*-linux-uclibc*)		fmt=elf em=linux ;;
-       ia64-*-hpux*)			fmt=elf em=hpux ;;
-       ia64-*-netbsd*)			fmt=elf em=nbsd ;;
- 
-@@ -4398,6 +4409,7 @@
-       m68k-*-hpux*)			fmt=hp300 em=hp300 ;;
-       m68k-*-linux*aout*)		fmt=aout em=linux ;;
-       m68k-*-linux-gnu*)		fmt=elf em=linux ;;
-+      m68k-*-linux-uclibc*)		fmt=elf em=linux ;;
-       m68k-*-uclinux*)			fmt=elf ;;
-       m68k-*-gnu*)			fmt=elf ;;
-       m68k-*-lynxos*)			fmt=coff em=lynx ;;
-@@ -4460,7 +4472,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-uclibc* | ppc-*-linux-gnu*)			fmt=elf em=linux
- 	    case "$endian" in
- 		big)  ;;
- 		*)    { { echo "$as_me:$LINENO: error: GNU/Linux must be configured big endian" >&5
-@@ -4487,7 +4499,9 @@
-       ppc-*-kaos*)			fmt=elf ;;
- 
-       s390x-*-linux-gnu*)		fmt=elf em=linux ;;
-+      s390x-*-linux-uclibc*)		fmt=elf em=linux ;;
-       s390-*-linux-gnu*)		fmt=elf em=linux ;;
-+      s390-*-linux-uclibc*)		fmt=elf em=linux ;;
- 
-       sh*-*-linux*)			fmt=elf em=linux
- 	    case ${cpu} in
-@@ -4520,6 +4534,7 @@
-       sparc-*-coff)			fmt=coff ;;
-       sparc-*-linux*aout*)		fmt=aout em=linux ;;
-       sparc-*-linux-gnu*)		fmt=elf em=linux ;;
-+      sparc-*-linux-uclibc*)		fmt=elf em=linux ;;
-       sparc-*-lynxos*)			fmt=coff em=lynx ;;
-       sparc-fujitsu-none)		fmt=aout ;;
-       sparc-*-elf)			fmt=elf ;;
---- binutils-2.15.90.0.3/gas/configure.in.conf	2004-04-12 15:56:34.000000000 -0400
-+++ binutils-2.15.90.0.3/gas/configure.in	2004-04-22 22:00:58.000000000 -0400
-@@ -194,6 +194,7 @@
-       alpha*-*-osf*)			fmt=ecoff ;;
-       alpha*-*-linuxecoff*)		fmt=ecoff ;;
-       alpha*-*-linux-gnu*)		fmt=elf em=linux ;;
-+      alpha*-*-linux-uclibc*)		fmt=elf em=linux ;;
-       alpha*-*-netbsd*)			fmt=elf em=nbsd ;;
-       alpha*-*-openbsd*)		fmt=elf em=obsd ;;
- 
-@@ -210,6 +211,7 @@
-       arm*-*-conix*)			fmt=elf ;;
-       arm-*-linux*aout*)		fmt=aout em=linux ;;
-       arm*-*-linux-gnu*)		fmt=elf  em=linux ;;
-+      arm*-*-linux-uclibc*)		fmt=elf  em=linux ;;
-       arm*-*-uclinux*)			fmt=elf  em=linux ;;
-       arm-*-netbsdelf*)                 fmt=elf  em=nbsd ;;
-       arm-*-*n*bsd*)			fmt=aout em=nbsd ;;
-@@ -223,6 +225,7 @@
-       avr-*-*)				fmt=elf ;;
- 
-       cris-*-linux-gnu*)		fmt=multi bfd_gas=yes em=linux ;;
-+      cris-*-linux-uclibc*)		fmt=multi bfd_gas=yes em=linux ;;
-       cris-*-*)				fmt=multi bfd_gas=yes ;;
- 
-       d10v-*-*)				fmt=elf ;;
-@@ -279,7 +282,9 @@
-       i386-*-linux*oldld)		fmt=aout em=linux ;;
-       i386-*-linux*coff*)		fmt=coff em=linux ;;
-       i386-*-linux-gnu*)		fmt=elf em=linux ;;
-+      i386-*-linux-uclibc*)		fmt=elf em=linux ;;
-       x86_64-*-linux-gnu*)		fmt=elf em=linux ;;
-+      x86_64-*-linux-uclibc*)		fmt=elf em=linux ;;
-       i386-*-lynxos*)			fmt=coff em=lynx ;;
- changequote(,)dnl
-       i386-*-sysv[45]*)			fmt=elf ;;
-@@ -332,6 +337,7 @@
-       ia64-*-elf*)			fmt=elf ;;
-       ia64-*-aix*)			fmt=elf em=ia64aix ;;
-       ia64-*-linux-gnu*)		fmt=elf em=linux ;;
-+      ia64-*-linux-uclibc*)		fmt=elf em=linux ;;
-       ia64-*-hpux*)			fmt=elf em=hpux ;;
-       ia64-*-netbsd*)			fmt=elf em=nbsd ;;
- 
-@@ -359,6 +365,7 @@
-       m68k-*-hpux*)			fmt=hp300 em=hp300 ;;
-       m68k-*-linux*aout*)		fmt=aout em=linux ;;
-       m68k-*-linux-gnu*)		fmt=elf em=linux ;;
-+      m68k-*-linux-uclibc*)		fmt=elf em=linux ;;
-       m68k-*-uclinux*)			fmt=elf ;;
-       m68k-*-gnu*)			fmt=elf ;;
-       m68k-*-lynxos*)			fmt=coff em=lynx ;;
-@@ -418,7 +425,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-uclibc* | ppc-*-linux-gnu*)			fmt=elf em=linux
- 	    case "$endian" in
- 		big)  ;;
- 		*)    AC_MSG_ERROR(GNU/Linux must be configured big endian) ;;
-@@ -438,7 +445,9 @@
-       ppc-*-kaos*)			fmt=elf ;;
- 
-       s390x-*-linux-gnu*)		fmt=elf em=linux ;;
-+      s390x-*-linux-uclibc*)		fmt=elf em=linux ;;
-       s390-*-linux-gnu*)		fmt=elf em=linux ;;
-+      s390-*-linux-uclibc*)		fmt=elf em=linux ;;
- 
-       sh*-*-linux*)			fmt=elf em=linux
- 	    case ${cpu} in
-@@ -471,6 +480,7 @@
-       sparc-*-coff)			fmt=coff ;;
-       sparc-*-linux*aout*)		fmt=aout em=linux ;;
-       sparc-*-linux-gnu*)		fmt=elf em=linux ;;
-+      sparc-*-linux-uclibc*)		fmt=elf em=linux ;;
-       sparc-*-lynxos*)			fmt=coff em=lynx ;;
-       sparc-fujitsu-none)		fmt=aout ;;
-       sparc-*-elf)			fmt=elf ;;
---- binutils-2.15.90.0.3/ld/configure.conf	2003-05-05 17:46:49.000000000 -0400
-+++ binutils-2.15.90.0.3/ld/configure	2004-04-22 21:58:37.000000000 -0400
-@@ -1578,6 +1578,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*)
-   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-     lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
---- binutils-2.15.90.0.3/ld/configure.tgt.conf	2004-04-12 15:56:35.000000000 -0400
-+++ binutils-2.15.90.0.3/ld/configure.tgt	2004-04-22 22:03:52.000000000 -0400
-@@ -31,6 +31,7 @@
- 			targ_extra_emuls="criself crislinux"
- 			targ_extra_libpath=$targ_extra_emuls ;;
- cris-*-linux-gnu*)	targ_emul=crislinux ;;
-+cris-*-linux-uclibc*)	targ_emul=crislinux ;;
- cris-*-*)		targ_emul=criself
- 			targ_extra_emuls="crisaout crislinux"
- 			targ_extra_libpath=$targ_extra_emuls ;;
-@@ -60,14 +61,16 @@
- 			tdir_elf32_sparc=`echo ${targ_alias} | sed -e 's/aout//'`
- 			tdir_sun4=sparc-sun-sunos4
- 			;;
--sparc64-*-linux-gnu*)	targ_emul=elf64_sparc
-+sparc64-*-linux-gnu* | sparc64-*-linux-uclibc*)	 \
-+			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-gnu* | sparc*-*-linux-uclibc*) \
-+			targ_emul=elf32_sparc
- 			targ_extra_emuls="sparclinux elf64_sparc sun4"
- 			targ_extra_libpath=elf64_sparc
- 			tdir_sparclinux=${targ_alias}aout
-@@ -129,7 +132,7 @@
- m68*-ericsson-ose)	targ_emul=sun3 ;;
- m68*-apple-aux*)	targ_emul=m68kaux ;;
- *-tandem-none)		targ_emul=st2000 ;;
--i370-*-elf* | i370-*-linux-gnu*) targ_emul=elf32i370 ;;
-+i370-*-elf* | i370-*-linux-gnu* | i370-*-linux-uclibc*) 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 ;;
-@@ -153,14 +156,16 @@
- 			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-gnu* | i[3-7]86-*-linux-uclibc*) \
-+			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-gnu* | x86_64-*-linux-uclibc*) \
-+			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/'`
-@@ -260,10 +265,13 @@
- arm9e-*-elf)		targ_emul=armelf ;;
- arm-*-oabi)		targ_emul=armelf_oabi ;;
- arm*b-*-linux-gnu*)	targ_emul=armelfb_linux; targ_extra_emuls=armelfb ;;
-+arm*b-*-linux-uclibc*)	targ_emul=armelfb_linux; targ_extra_emuls=armelfb ;;
- arm*-*-linux-gnu*)	targ_emul=armelf_linux; targ_extra_emuls=armelf ;;
-+arm*-*-linux-uclibc*)	targ_emul=armelf_linux; targ_extra_emuls=armelf ;;
- arm*-*-uclinux*)	targ_emul=armelf_linux; targ_extra_emuls=armelf ;;
- arm*-*-conix*)		targ_emul=armelf ;;
--thumb-*-linux-gnu* | thumb-*-uclinux*)	targ_emul=armelf_linux; targ_extra_emuls=armelf ;;
-+thumb-*-linux-gnu* | thumb-*-linux-uclibc* | 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 ;;
-@@ -365,7 +373,8 @@
- 			targ_extra_emuls=m68kelf
- 			tdir_m68kelf=`echo ${targ_alias} | sed -e 's/aout//'`
- 			;;
--m68k-*-linux-gnu*)	targ_emul=m68kelf
-+m68k-*-linux-gnu* | m68k-*-linux-uclibc*) \
-+			targ_emul=m68kelf
- 			targ_extra_emuls=m68klinux
- 			tdir_m68klinux=`echo ${targ_alias} | sed -e 's/linux/linuxaout/'`
- 			;;
-@@ -382,9 +391,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-gnu* | hppa*64*-*-linux-uclibc*)  targ_emul=hppa64linux ;;
- hppa*64*-*)		targ_emul=elf64hppa ;;
--hppa*-*-linux-gnu*)	targ_emul=hppalinux ;;
-+hppa*-*-linux-gnu* | hppa*-*-linux-uclibc*)	targ_emul=hppalinux ;;
- hppa*-*-*elf*)		targ_emul=hppaelf ;;
- hppa*-*-lites*)		targ_emul=hppaelf ;;
- hp