add support for alternative C libraries (currently only glibc/eglibc) other (related) changes: - kernel headers are now installed using "make headers_install" on 2.6 - target names now contain an openwrt "vendor" tag (e.g. mips-openwrt-linux-gnu) - build directory names now contain gcc/libc name/version - default cpu for x86 is now i486 (required to build glibc/eglibc)

SVN-Revision: 13931

29 files changed, 144 insertions, 4 deletions

diff --git a/include/package.mk b/include/package.mk
index 0f3d21ee9e..4e31258305 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -31,7 +31,7 @@ include $(INCLUDE_DIR)/package-bin.mk
 include $(INCLUDE_DIR)/autotools.mk
 
 override MAKEFLAGS=
-CONFIG_SITE:=$(INCLUDE_DIR)/site/$(patsubst %gnueabi,%,$(REAL_GNU_TARGET_NAME))
+CONFIG_SITE:=$(INCLUDE_DIR)/site/$(REAL_GNU_TARGET_NAME)
 ifneq ($(CONFIG_LINUX_2_4),)
   CONFIG_SITE:=$(subst linux-,linux2.4-,$(CONFIG_SITE))
 endif
diff --git a/include/site/arm-openwrt-linux-gnu b/include/site/arm-openwrt-linux-gnu
new file mode 100644
index 0000000000..efb72453ae
--- /dev/null
+++ b/include/site/arm-openwrt-linux-gnu
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+. $TOPDIR/include/site/arm-linux
+. $TOPDIR/include/site/linux-gnu
+
diff --git a/include/site/arm-openwrt-linux-gnueabi b/include/site/arm-openwrt-linux-gnueabi
new file mode 100644
index 0000000000..efb72453ae
--- /dev/null
+++ b/include/site/arm-openwrt-linux-gnueabi
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+. $TOPDIR/include/site/arm-linux
+. $TOPDIR/include/site/linux-gnu
+
diff --git a/include/site/arm-linux-uclibc b/include/site/arm-openwrt-linux-uclibc
index f17d96abcd..f17d96abcd 100644
--- a/include/site/arm-linux-uclibc
+++ b/include/site/arm-openwrt-linux-uclibc
diff --git a/include/site/i386-linux-uclibc b/include/site/arm-openwrt-linux-uclibc-gnueabi
index 5cccb2461a..f17d96abcd 100644
--- a/include/site/i386-linux-uclibc
+++ b/include/site/arm-openwrt-linux-uclibc-gnueabi
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-. $TOPDIR/include/site/i386-linux
+. $TOPDIR/include/site/arm-linux
 . $TOPDIR/include/site/linux-uclibc
 
diff --git a/include/site/armeb-openwrt-linux-gnu b/include/site/armeb-openwrt-linux-gnu
new file mode 100644
index 0000000000..41129b071f
--- /dev/null
+++ b/include/site/armeb-openwrt-linux-gnu
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+. $TOPDIR/include/site/armeb-linux
+. $TOPDIR/include/site/linux-gnu
+
diff --git a/include/site/armeb-openwrt-linux-gnueabi b/include/site/armeb-openwrt-linux-gnueabi
new file mode 100644
index 0000000000..41129b071f
--- /dev/null
+++ b/include/site/armeb-openwrt-linux-gnueabi
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+. $TOPDIR/include/site/armeb-linux
+. $TOPDIR/include/site/linux-gnu
+
diff --git a/include/site/armeb-linux-uclibc b/include/site/armeb-openwrt-linux-uclibc
index dd64a9c532..dd64a9c532 100644
--- a/include/site/armeb-linux-uclibc
+++ b/include/site/armeb-openwrt-linux-uclibc
diff --git a/include/site/armeb-openwrt-linux-uclibc-gnueabi b/include/site/armeb-openwrt-linux-uclibc-gnueabi
new file mode 100644
index 0000000000..dd64a9c532
--- /dev/null
+++ b/include/site/armeb-openwrt-linux-uclibc-gnueabi
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+. $TOPDIR/include/site/armeb-linux
+. $TOPDIR/include/site/linux-uclibc
+
diff --git a/include/site/avr32-openwrt-linux-gnu b/include/site/avr32-openwrt-linux-gnu
new file mode 100644
index 0000000000..87cfe7d9c0
--- /dev/null
+++ b/include/site/avr32-openwrt-linux-gnu
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+. $TOPDIR/include/site/avr32-linux
+. $TOPDIR/include/site/linux-gnu
+
diff --git a/include/site/avr32-linux-uclibc b/include/site/avr32-openwrt-linux-uclibc
index 9fe045fa0c..9fe045fa0c 100644
--- a/include/site/avr32-linux-uclibc
+++ b/include/site/avr32-openwrt-linux-uclibc
diff --git a/include/site/cris-openwrt-linux-gnu b/include/site/cris-openwrt-linux-gnu
new file mode 100644
index 0000000000..c35ddcda65
--- /dev/null
+++ b/include/site/cris-openwrt-linux-gnu
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+. $TOPDIR/include/site/cris-linux
+. $TOPDIR/include/site/linux-gnu
+
diff --git a/include/site/cris-linux-uclibc b/include/site/cris-openwrt-linux-uclibc
index 87346ee6da..87346ee6da 100644
--- a/include/site/cris-linux-uclibc
+++ b/include/site/cris-openwrt-linux-uclibc
diff --git a/include/site/i386-linux b/include/site/i486-linux
index 7c5773de5d..d22ec20858 100644
--- a/include/site/i386-linux
+++ b/include/site/i486-linux
@@ -23,6 +23,5 @@ ac_cv_sizeof_uint32_t=4
 ac_cv_sizeof_uint64_t=8
 ac_cv_sizeof_unsigned_int=4
 ac_cv_sizeof_unsigned_long=4
-ac_cv_sizeof_unsigned_long_long=8
 ac_cv_sizeof_unsigned_short=2
 ac_cv_sizeof_void_p=4
diff --git a/include/site/i486-openwrt-linux-gnu b/include/site/i486-openwrt-linux-gnu
new file mode 100644
index 0000000000..77bbe2412a
--- /dev/null
+++ b/include/site/i486-openwrt-linux-gnu
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+. $TOPDIR/include/site/i486-linux
+. $TOPDIR/include/site/linux-gnu
+
diff --git a/include/site/i486-openwrt-linux-uclibc b/include/site/i486-openwrt-linux-uclibc
new file mode 100644
index 0000000000..4d796d6834
--- /dev/null
+++ b/include/site/i486-openwrt-linux-uclibc
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+. $TOPDIR/include/site/i486-linux
+. $TOPDIR/include/site/linux-uclibc
+
diff --git a/include/site/i686-openwrt-linux-gnu b/include/site/i686-openwrt-linux-gnu
new file mode 100644
index 0000000000..6c9c929ce8
--- /dev/null
+++ b/include/site/i686-openwrt-linux-gnu
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+. $TOPDIR/include/site/i686-linux
+. $TOPDIR/include/site/linux-gnu
+
diff --git a/include/site/i686-linux-uclibc b/include/site/i686-openwrt-linux-uclibc
index ef073da320..ef073da320 100644
--- a/include/site/i686-linux-uclibc
+++ b/include/site/i686-openwrt-linux-uclibc
diff --git a/include/site/linux-gnu b/include/site/linux-gnu
new file mode 100644
index 0000000000..5640e2a7f8
--- /dev/null
+++ b/include/site/linux-gnu
@@ -0,0 +1,71 @@
+ac_atomic_add=yes
+ac_atomic_sub=yes
+ac_cv_c_gettext_without_libintl=yes
+ac_cv_c_long_double=no
+ac_cv_conv_longlong_to_float=yes
+ac_cv_file__dev_zero=yes
+ac_cv_func___va_copy=no
+ac_cv_func__exit=yes
+ac_cv_func_bcopy=yes
+ac_cv_func_bzero=yes
+ac_cv_func_bcmp=yes
+ac_cv_func_fchmod=yes
+ac_cv_func_getaddrinfo=yes
+ac_cv_func_getcwd=yes
+ac_cv_func_getdomainname=yes
+ac_cv_func_getpgrp_void=yes
+ac_cv_func_getpwuid_r=yes
+ac_cv_func_index=yes
+ac_cv_func_lstat_dereferences_slashed_symlink=yes
+ac_cv_func_lstat_empty_string_bug=no
+ac_cv_func_lstat=yes
+ac_cv_func_malloc_0_nonnull=yes
+ac_cv_func_malloc_works=yes
+ac_cv_func_memcmp_clean=yes
+ac_cv_func_memcmp_working=yes
+ac_cv_func_posix_getgrgid_r=yes
+ac_cv_func_posix_getpwuid_r=yes
+ac_cv_func_pthread_key_delete=yes
+ac_cv_func_realloc_0_nonnull=yes
+ac_cv_func_realloc_works=yes
+ac_cv_func_rename=yes
+ac_cv_func_rindex=yes
+ac_cv_func_setlocale=yes
+ac_cv_func_setpgrp_void=yes
+ac_cv_func_setresuid=no
+ac_cv_func_setvbuf_reversed=no
+ac_cv_func_stat_empty_string_bug=no
+ac_cv_func_stat_ignores_trailing_slash=no
+ac_cv_func_strerror=yes
+ac_cv_func_strftime=yes
+ac_cv_func_utimes=yes
+ac_cv_func___adjtimex=yes
+ac_cv_func_va_copy=no
+ac_cv_func_vsnprintf=yes
+ac_cv_have_accrights_in_msghdr=no
+ac_cv_have_broken_snprintf=no
+ac_cv_have_control_in_msghdr=yes
+ac_cv_have_decl_sys_siglist=no
+ac_cv_have_openpty_ctty_bug=yes
+ac_cv_have_space_d_name_in_struct_dirent=yes
+ac_cv_header_netinet_sctp_h=no
+ac_cv_header_netinet_sctp_uio_h=no
+ac_cv_int64_t=yes
+ac_cv_lbl_unaligned_fail=no
+ac_cv_linux_kernel_pppoe=yes
+ac_cv_linux_vers=2
+ac_cv_pack_bitfields_reversed=yes
+ac_cv_path_LDCONFIG=
+ac_cv_regexec_segfault_emptystr=no
+ac_cv_sctp=no
+ac_cv_sys_restartable_syscalls=yes
+ac_cv_time_r_type=POSIX
+ac_cv_type_suseconds_t=yes
+ac_cv_uchar=no
+ac_cv_uint=yes
+ac_cv_uint64_t=yes
+ac_cv_ulong=yes
+ac_cv_ushort=yes
+ac_cv_va_copy=C99
+ac_cv_va_val_copy=yes
+as_cv_unaligned_access=yes
diff --git a/include/site/mips-openwrt-linux-gnu b/include/site/mips-openwrt-linux-gnu
new file mode 100644
index 0000000000..a70e9a71f7
--- /dev/null
+++ b/include/site/mips-openwrt-linux-gnu
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+. $TOPDIR/include/site/mips-linux
+. $TOPDIR/include/site/linux-gnu
+
diff --git a/include/site/mips-linux-uclibc b/include/site/mips-openwrt-linux-uclibc
index 76a1b28317..76a1b28317 100644
--- a/include/site/mips-linux-uclibc
+++ b/include/site/mips-openwrt-linux-uclibc
diff --git a/include/site/mipsel-openwrt-linux-gnu b/include/site/mipsel-openwrt-linux-gnu
new file mode 100644
index 0000000000..fa33e56fad
--- /dev/null
+++ b/include/site/mipsel-openwrt-linux-gnu
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+. $TOPDIR/include/site/mipsel-linux
+. $TOPDIR/include/site/linux-gnu
+
diff --git a/include/site/mipsel-linux-uclibc b/include/site/mipsel-openwrt-linux-uclibc
index b53d4d4844..b53d4d4844 100644
--- a/include/site/mipsel-linux-uclibc
+++ b/include/site/mipsel-openwrt-linux-uclibc
diff --git a/include/site/mipsel-linux2.4-uclibc b/include/site/mipsel-openwrt-linux2.4-uclibc
index 3412411cb4..3412411cb4 100644
--- a/include/site/mipsel-linux2.4-uclibc
+++ b/include/site/mipsel-openwrt-linux2.4-uclibc
diff --git a/include/site/powerpc-openwrt-linux-gnu b/include/site/powerpc-openwrt-linux-gnu
new file mode 100644
index 0000000000..bafb5df36d
--- /dev/null
+++ b/include/site/powerpc-openwrt-linux-gnu
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+. $TOPDIR/include/site/powerpc-linux
+. $TOPDIR/include/site/linux-gnu
+
diff --git a/include/site/powerpc-linux-uclibc b/include/site/powerpc-openwrt-linux-uclibc
index bb48ee234f..bb48ee234f 100644
--- a/include/site/powerpc-linux-uclibc
+++ b/include/site/powerpc-openwrt-linux-uclibc
diff --git a/include/site/x86_64-openwrt-linux-gnu b/include/site/x86_64-openwrt-linux-gnu
new file mode 100644
index 0000000000..602258408c
--- /dev/null
+++ b/include/site/x86_64-openwrt-linux-gnu
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+. $TOPDIR/include/site/x86_64-linux
+. $TOPDIR/include/site/linux-gnu
+
diff --git a/include/site/x86_64-linux-uclibc b/include/site/x86_64-openwrt-linux-uclibc
index cc351dfef8..cc351dfef8 100644
--- a/include/site/x86_64-linux-uclibc
+++ b/include/site/x86_64-openwrt-linux-uclibc
diff --git a/include/target.mk b/include/target.mk
index db022014e6..7351794dce 100644
--- a/include/target.mk
+++ b/include/target.mk
@@ -12,7 +12,7 @@ __target_inc=1
 DEVICE_TYPE?=router
 
 # Default packages - the really basic set
-DEFAULT_PACKAGES:=base-files libgcc uclibc busybox dropbear mtd uci opkg
+DEFAULT_PACKAGES:=base-files libc libgcc busybox dropbear mtd uci opkg
 # For router targets
 DEFAULT_PACKAGES.router:=dnsmasq iptables ppp ppp-mod-pppoe kmod-ipt-nathelper firewall