summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2009-06-22 22:19:16 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2009-06-22 22:19:16 +0200
commita01131d813946a99aa5206633a524855c3b6f58c (patch)
treecb5ec95bac08a9f1c3831365498377a9484b3309 /package
parentf18f19d6a59974f5a92a4f52c0539c2ec3da4f96 (diff)
fix make allmodconfig on mips (rb532)
Diffstat (limited to 'package')
-rw-r--r--package/axtls/Makefile2
-rw-r--r--package/binutils/Makefile1
-rw-r--r--package/cbtt/Makefile1
-rw-r--r--package/cxxtools/Makefile2
-rw-r--r--package/gpg/patches/patch-mpi_longlong_h67
-rw-r--r--package/gsm/Makefile2
-rw-r--r--package/id3lib/Config.in1
-rw-r--r--package/id3lib/Makefile1
-rw-r--r--package/ipset/Makefile4
-rw-r--r--package/libiconv/Makefile1
-rw-r--r--package/libmad/Makefile9
-rw-r--r--package/libupnp/Makefile1
-rw-r--r--package/monit/patches/patch-Makefile_in11
-rw-r--r--package/mplayer/Config.in7
-rw-r--r--package/mplayer/Makefile1
-rw-r--r--package/mrd6/patches/patch-src_linux_mrd_components_cpp14
-rw-r--r--package/opensips/Makefile2
-rw-r--r--package/oprofile/Makefile2
-rw-r--r--package/portmap/Makefile1
-rw-r--r--package/rrs/Makefile4
-rw-r--r--package/sane-backends/patches/patch-configure_in11
-rw-r--r--package/squid/patches/patch-src_HttpHeaderTools_cc (renamed from package/squid/patch-src_HttpHeaderTools_cc)0
-rw-r--r--package/uclibc++/files/config8
-rw-r--r--package/uclibc++/files/config.mips57
-rw-r--r--package/uclibc++/files/config.x8657
25 files changed, 132 insertions, 135 deletions
diff --git a/package/axtls/Makefile b/package/axtls/Makefile
index df231bc19..9b01f12ba 100644
--- a/package/axtls/Makefile
+++ b/package/axtls/Makefile
@@ -27,7 +27,7 @@ $(eval $(call PKG_template,LIBAXTLS,libaxtls,${PKG_VERSION}-${PKG_RELEASE},,${PK
BUILD_STYLE= auto
XAKE_FLAGS+= STRIP='' \
CC='${TARGET_CC}' \
- OPT_CFLAGS='${TARGET_CFLAGS}' \
+ OPT_CFLAGS='${TARGET_CFLAGS} -fPIC' \
OPT_LDFLAGS=""
do-configure:
diff --git a/package/binutils/Makefile b/package/binutils/Makefile
index 65b5d872e..c130804de 100644
--- a/package/binutils/Makefile
+++ b/package/binutils/Makefile
@@ -11,6 +11,7 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,BINUTILS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+TCFLAGS+= -fPIC
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --disable-werror
BUILD_STYLE= auto
diff --git a/package/cbtt/Makefile b/package/cbtt/Makefile
index 75ed1ea60..913b2d8e6 100644
--- a/package/cbtt/Makefile
+++ b/package/cbtt/Makefile
@@ -40,6 +40,7 @@ TLDFLAGS+= -nodefaultlibs -lz -lpthread \
-luClibc++ -lc -lm -lgcc
TCFLAGS+= -fno-builtin -nostdinc++
endif
+TCFLAGS+= -fPIC
do-install:
${INSTALL_DIR} ${IDIR_CBTT}/usr/bin
diff --git a/package/cxxtools/Makefile b/package/cxxtools/Makefile
index dab8121eb..f3a270aa8 100644
--- a/package/cxxtools/Makefile
+++ b/package/cxxtools/Makefile
@@ -30,6 +30,8 @@ else
TLDFLAGS+= -liconv -shared
endif
+TCFLAGS+= -fPIC
+TCXXFLAGS+= -fPIC
CONFIGURE_STYLE:= gnu
CONFIGURE_ENV+= ac_cv_lib_nsl_setsockopt=no
CONFIGURE_ARGS+= --with-libiconv-prefix='${STAGING_DIR}/usr'
diff --git a/package/gpg/patches/patch-mpi_longlong_h b/package/gpg/patches/patch-mpi_longlong_h
new file mode 100644
index 000000000..85fc65552
--- /dev/null
+++ b/package/gpg/patches/patch-mpi_longlong_h
@@ -0,0 +1,67 @@
+--- gnupg-1.4.9.orig/mpi/longlong.h 2007-10-23 11:15:14.000000000 +0200
++++ gnupg-1.4.9/mpi/longlong.h 2009-06-19 19:16:25.000000000 +0200
+@@ -706,18 +706,35 @@ extern USItype __udiv_qrnnd ();
+ #endif /* __m88110__ */
+ #endif /* __m88000__ */
+
++/* Test for gcc >= maj.min, as per __GNUC_PREREQ in glibc */
++#if defined (__GNUC__) && defined (__GNUC_MINOR__)
++#define __GNUC_PREREQ(maj, min) \
++ ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
++#else
++#define __GNUC_PREREQ(maj, min) 0
++#endif
++
+ /***************************************
+ ************** MIPS *****************
+ ***************************************/
+ #if defined (__mips__) && W_TYPE_SIZE == 32
+-#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7
++#if __GNUC_PREREQ (4,4)
++#define umul_ppmm(w1, w0, u, v) \
++ do { \
++ UDItype __ll = (UDItype)(u) * (v); \
++ w1 = __ll >> 32; \
++ w0 = __ll; \
++ } while (0)
++#endif
++#if !defined (umul_ppmm) && __GNUC_PREREQ (2,7)
+ #define umul_ppmm(w1, w0, u, v) \
+ __asm__ ("multu %2,%3" \
+ : "=l" ((USItype)(w0)), \
+ "=h" ((USItype)(w1)) \
+ : "d" ((USItype)(u)), \
+ "d" ((USItype)(v)))
+-#else
++#endif
++#if !defined (umul_ppmm)
+ #define umul_ppmm(w1, w0, u, v) \
+ __asm__ ("multu %2,%3 \n" \
+ "mflo %0 \n" \
+@@ -735,14 +752,24 @@ extern USItype __udiv_qrnnd ();
+ ************** MIPS/64 **************
+ ***************************************/
+ #if (defined (__mips) && __mips >= 3) && W_TYPE_SIZE == 64
+-#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7
++#if __GNUC_PREREQ (4,4)
++#define umul_ppmm(w1, w0, u, v) \
++ do { \
++ typedef unsigned int __ll_UTItype __attribute__((mode(TI))); \
++ __ll_UTItype __ll = (__ll_UTItype)(u) * (v); \
++ w1 = __ll >> 64; \
++ w0 = __ll; \
++ } while (0)
++#endif
++#if !defined (umul_ppmm) && __GNUC_PREREQ (2,7)
+ #define umul_ppmm(w1, w0, u, v) \
+ __asm__ ("dmultu %2,%3" \
+ : "=l" ((UDItype)(w0)), \
+ "=h" ((UDItype)(w1)) \
+ : "d" ((UDItype)(u)), \
+ "d" ((UDItype)(v)))
+-#else
++#endif
++#if !defined (umul_ppmm)
+ #define umul_ppmm(w1, w0, u, v) \
+ __asm__ ("dmultu %2,%3 \n" \
+ "mflo %0 \n" \
diff --git a/package/gsm/Makefile b/package/gsm/Makefile
index be9654bfa..dfa0cbb5c 100644
--- a/package/gsm/Makefile
+++ b/package/gsm/Makefile
@@ -22,7 +22,7 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBGSM,libgsm,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
$(eval $(call PKG_template,GSM_UTILS,gsm-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_1},${PKG_DESCR_1},${PKG_SECTION}))
-XAKE_FLAGS+= COPTS="${TARGET_CFLAGS}" \
+XAKE_FLAGS+= COPTS="${TARGET_CFLAGS} -fPIC" \
INSTALL_ROOT="${WRKINST}"
BUILD_STYLE= auto
INSTALL_STYLE= auto
diff --git a/package/id3lib/Config.in b/package/id3lib/Config.in
index 302b8148d..973fbe453 100644
--- a/package/id3lib/Config.in
+++ b/package/id3lib/Config.in
@@ -4,6 +4,7 @@ config ADK_PACKAGE_ID3LIB
default n
depends on ADK_CXX
select ADK_PACKAGE_ZLIB
+ select ADK_PACKAGE_LIBICONV
help
An ID3v1/ID3v2 tagging library.
diff --git a/package/id3lib/Makefile b/package/id3lib/Makefile
index 545a27e91..f7c7976a4 100644
--- a/package/id3lib/Makefile
+++ b/package/id3lib/Makefile
@@ -23,6 +23,7 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,ID3LIB,id3lib,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+TCFLAGS+= -fPIC
CONFIGURE_STYLE:= gnu
CONFIGURE_ARGS+= --enable-cxx-warnings=no
BUILD_STYLE:= auto
diff --git a/package/ipset/Makefile b/package/ipset/Makefile
index 66b2c2014..da706009c 100644
--- a/package/ipset/Makefile
+++ b/package/ipset/Makefile
@@ -19,8 +19,8 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,IPSET,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
XAKE_FLAGS+= V=1 ARCH=${ARCH} KERNEL_DIR=${LINUX_DIR} \
- PREFIX=/usr LD=$(TARGET_CROSS)ld \
- CROSS_COMPILE="${TARGET_CROSS}"
+ PREFIX=/usr CROSS_COMPILE="${TARGET_CROSS}" \
+ LD=$(TARGET_CROSS)gcc
BUILD_STYLE= auto
INSTALL_STYLE= auto
INSTALL_TARGET= binaries_install
diff --git a/package/libiconv/Makefile b/package/libiconv/Makefile
index d4b092ba5..4f3063aad 100644
--- a/package/libiconv/Makefile
+++ b/package/libiconv/Makefile
@@ -16,6 +16,7 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBICONV,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+TCFLAGS+= -fPIC
CONFIGURE_STYLE= gnu
BUILD_STYLE= auto
INSTALL_STYLE= auto confprog
diff --git a/package/libmad/Makefile b/package/libmad/Makefile
index 3b6d14be2..045bd6d8e 100644
--- a/package/libmad/Makefile
+++ b/package/libmad/Makefile
@@ -21,16 +21,17 @@ FPM:=default
ifeq (${ARCH},i386)
FPM:=intel
endif
-ifeq (${ARCH},mips)
-FPM:=mips
-endif
+# MIPS optimization is broken for gcc 4.4 (removed h constraint)
+#ifeq (${ARCH},mips)
+#FPM:=mips
+#endif
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --enable-fpm=${FPM} \
--disable-debugging \
--enable-speed
BUILD_STYLE= auto
-INSTALL_STYLE= auto confprog
+INSTALL_STYLE= auto
pre-install:
${INSTALL_DIR} ${WRKINST}/usr/lib/pkgconfig
diff --git a/package/libupnp/Makefile b/package/libupnp/Makefile
index 31f2cd6e9..248c73709 100644
--- a/package/libupnp/Makefile
+++ b/package/libupnp/Makefile
@@ -19,6 +19,7 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBUPNP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+TCFLAGS+= -fPIC
CONFIGURE_STYLE:= autotool gnu
CONFIGURE_ARGS+= --disable-samples
BUILD_STYLE:= auto
diff --git a/package/monit/patches/patch-Makefile_in b/package/monit/patches/patch-Makefile_in
new file mode 100644
index 000000000..fd01136fd
--- /dev/null
+++ b/package/monit/patches/patch-Makefile_in
@@ -0,0 +1,11 @@
+--- monit-5.0.3.orig/Makefile.in 2009-05-25 21:02:56.000000000 +0200
++++ monit-5.0.3/Makefile.in 2009-06-19 21:30:29.000000000 +0200
+@@ -36,7 +36,7 @@ MODE_CONF = 600
+ MODE_DIRS = 755
+
+ INSTALL = @INSTALL@
+-INSTALL_PROG = $(INSTALL) -m $(MODE_PROGS) -s
++INSTALL_PROG = $(INSTALL) -m $(MODE_PROGS)
+ INSTALL_FILE = $(INSTALL) -m $(MODE_FILES)
+ INSTALL_DIR = $(INSTALL) -m $(MODE_DIRS) -d
+
diff --git a/package/mplayer/Config.in b/package/mplayer/Config.in
index 7255dfbbd..963e2c0ba 100644
--- a/package/mplayer/Config.in
+++ b/package/mplayer/Config.in
@@ -2,16 +2,17 @@ config ADK_PACKAGE_MPLAYER
prompt "mplayer........................... popular movie player"
tristate
default n
+ select ADK_PACKAGE_ALSA_LIB
select ADK_PACKAGE_LIBJPEG
select ADK_PACKAGE_LIBPNG
select ADK_PACKAGE_LIBPTHREAD
select ADK_PACKAGE_LIBOGG
- select ADK_PACKAGE_LIBVORBIS
select ADK_PACKAGE_LIBMAD
- select ADK_PACKAGE_ALSA_LIB
- select ADK_PACKAGE_ZLIB
select ADK_PACKAGE_LIBNCURSES
select ADK_PACKAGE_LIBFAAD2
+ select ADK_PACKAGE_LIBVORBIS
+ select ADK_PACKAGE_ZLIB
+ depends on ADK_LINUX_X86_ALIX1C
help
http://www.mplayerhq.hu
diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile
index 5d5812646..0c330a792 100644
--- a/package/mplayer/Makefile
+++ b/package/mplayer/Makefile
@@ -55,7 +55,6 @@ pre-configure:
--prefix=/usr \
--confdir=/etc \
--enable-cross-compile \
- --enable-runtime-cpudetection \
--target=$(REAL_GNU_TARGET_NAME) \
--cc=$(TARGET_CC) \
--host-cc=$(HOSTCC) \
diff --git a/package/mrd6/patches/patch-src_linux_mrd_components_cpp b/package/mrd6/patches/patch-src_linux_mrd_components_cpp
new file mode 100644
index 000000000..e604a63dd
--- /dev/null
+++ b/package/mrd6/patches/patch-src_linux_mrd_components_cpp
@@ -0,0 +1,14 @@
+--- mrd6-0.9.6.orig/src/linux/mrd_components.cpp 2007-01-07 03:11:27.000000000 +0100
++++ mrd6-0.9.6/src/linux/mrd_components.cpp 2009-06-19 21:49:44.000000000 +0200
+@@ -90,10 +90,8 @@ char *mrd::obtain_frame_description(void
+
+ void *mrd::posix_uctx::get_current_frame() const {
+ #if defined(__GLIBC__)
+-#if defined(__i386__)
++#if defined(__i386__)
+ return (void *)base->uc_mcontext.gregs[REG_EIP];
+-#elif defined(__mips__)
+- return (void *)base->uc_mcontext.gpregs[CTX_EPC];
+ #endif
+ #endif
+ return 0;
diff --git a/package/opensips/Makefile b/package/opensips/Makefile
index ca8d995b4..142570f14 100644
--- a/package/opensips/Makefile
+++ b/package/opensips/Makefile
@@ -92,7 +92,7 @@ do-build:
CC="$(TARGET_CC)" \
OS="linux" \
ARCH="$(ARCH)" \
- CFLAGS="$(TARGET_CFLAGS)" \
+ CFLAGS="$(TARGET_CFLAGS) -fPIC" \
LOCALBASE="$(STAGING_DIR)/usr" \
SYSBASE="$(STAGING_DIR)/usr" \
all modules
diff --git a/package/oprofile/Makefile b/package/oprofile/Makefile
index 6b8b720a4..0e680b4ea 100644
--- a/package/oprofile/Makefile
+++ b/package/oprofile/Makefile
@@ -18,6 +18,8 @@ include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,OPROFILE,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
TLDFLAGS+= -shared
+TCFLAGS+= -fPIC
+TCXXFLAGS+= -fPIC
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --with-kernel-support --with-linux=${LINUX_DIR}
BUILD_STYLE= auto
diff --git a/package/portmap/Makefile b/package/portmap/Makefile
index a1864a135..d6ffd9404 100644
--- a/package/portmap/Makefile
+++ b/package/portmap/Makefile
@@ -29,6 +29,7 @@ else
MAKE_FLAGS+= NO_TCP_WRAPPER=1
endif
TCPPFLAGS+= -DDAEMON_UID=20 -DDAEMON_GID=20
+TCFLAGS+= -fPIC
BUILD_STYLE:= auto
MAKE_FLAGS+= ${TARGET_CONFIGURE_OPTS} \
CFLAGS='${TCFLAGS}'
diff --git a/package/rrs/Makefile b/package/rrs/Makefile
index b4c0df6db..fe16bdd2c 100644
--- a/package/rrs/Makefile
+++ b/package/rrs/Makefile
@@ -29,10 +29,10 @@ $(eval $(call PKG_template,RRS,rrs,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},
$(eval $(call PKG_template,RRS_NOSSL,rrs-nossl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_NOSSL},${PKG_DESCR},${PKG_SECTION}))
ifeq ($(ADK_COMPILE_RRS_WITH_UCLIBCXX),y)
-PKG_CFLAGS=-fno-builtin -fno-rtti -nostdinc++
+PKG_FLAGS=-fno-builtin -fno-rtti -nostdinc++ -fPIC
PKG_LDFLAGS=-nodefaultlibs -luClibc++ -lc -lm
else
-PKG_CFLAGS=
+PKG_FLAGS=-fPIC
PKG_LDFLAGS=-shared
endif
diff --git a/package/sane-backends/patches/patch-configure_in b/package/sane-backends/patches/patch-configure_in
new file mode 100644
index 000000000..48e14d989
--- /dev/null
+++ b/package/sane-backends/patches/patch-configure_in
@@ -0,0 +1,11 @@
+--- sane-backends-1.0.20.orig/configure.in 2009-05-03 03:25:23.000000000 +0200
++++ sane-backends-1.0.20/configure.in 2009-06-19 23:27:39.000000000 +0200
+@@ -513,7 +513,7 @@ ALL_BACKENDS="abaton agfafocus apple art
+ hp5590 hpsj5s hpljm1005 hs2p ibm leo lexmark ma1509 \
+ matsushita microtek microtek2 mustek mustek_pp \
+ mustek_usb mustek_usb2 nec net niash pie pint \
+- pixma plustek plustek_pp qcam ricoh rts8891 s9036 \
++ pixma plustek plustek_pp ricoh rts8891 s9036 \
+ sceptre sharp sm3600 sm3840 snapscan sp15c st400 \
+ stv680 tamarack teco1 teco2 teco3 test u12 umax
+ umax_pp umax1220u v4l xerox_mfp"
diff --git a/package/squid/patch-src_HttpHeaderTools_cc b/package/squid/patches/patch-src_HttpHeaderTools_cc
index 3b456ebf5..3b456ebf5 100644
--- a/package/squid/patch-src_HttpHeaderTools_cc
+++ b/package/squid/patches/patch-src_HttpHeaderTools_cc
diff --git a/package/uclibc++/files/config b/package/uclibc++/files/config
index f6ef07573..2831ccc8e 100644
--- a/package/uclibc++/files/config
+++ b/package/uclibc++/files/config
@@ -15,7 +15,7 @@ HAVE_DOT_CONFIG=y
#
# String and I/O Stream Support
#
-UCLIBCXX_HAS_WCHAR=y
+# UCLIBCXX_HAS_WCHAR is not set
UCLIBCXX_IOSTREAM_BUFSIZE=32
UCLIBCXX_HAS_LFS=y
UCLIBCXX_SUPPORT_CDIR=y
@@ -23,10 +23,6 @@ UCLIBCXX_SUPPORT_CIN=y
UCLIBCXX_SUPPORT_COUT=y
UCLIBCXX_SUPPORT_CERR=y
# UCLIBCXX_SUPPORT_CLOG is not set
-# UCLIBCXX_SUPPORT_WCIN is not set
-# UCLIBCXX_SUPPORT_WCOUT is not set
-# UCLIBCXX_SUPPORT_WCERR is not set
-# UCLIBCXX_SUPPORT_WCLOG is not set
#
# STL and Code Expansion
@@ -51,7 +47,7 @@ UCLIBCXX_RUNTIME_INCLUDE_SUBDIR="/include"
UCLIBCXX_RUNTIME_LIB_SUBDIR="/lib"
UCLIBCXX_RUNTIME_BIN_SUBDIR="/bin"
UCLIBCXX_EXCEPTION_SUPPORT=y
-IMPORT_LIBSUP=y
+# IMPORT_LIBSUP is not set
# IMPORT_LIBGCC_EH is not set
# BUILD_STATIC_LIB is not set
# DODEBUG is not set
diff --git a/package/uclibc++/files/config.mips b/package/uclibc++/files/config.mips
deleted file mode 100644
index f6ef07573..000000000
--- a/package/uclibc++/files/config.mips
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# Automatically generated make config: don't edit
-#
-
-#
-# Target Features and Options
-#
-UCLIBCXX_HAS_FLOATS=y
-# UCLIBCXX_HAS_LONG_DOUBLE is not set
-# UCLIBCXX_HAS_TLS is not set
-WARNINGS="-Wall"
-BUILD_EXTRA_LIBRARIES=""
-HAVE_DOT_CONFIG=y
-
-#
-# String and I/O Stream Support
-#
-UCLIBCXX_HAS_WCHAR=y
-UCLIBCXX_IOSTREAM_BUFSIZE=32
-UCLIBCXX_HAS_LFS=y
-UCLIBCXX_SUPPORT_CDIR=y
-UCLIBCXX_SUPPORT_CIN=y
-UCLIBCXX_SUPPORT_COUT=y
-UCLIBCXX_SUPPORT_CERR=y
-# UCLIBCXX_SUPPORT_CLOG is not set
-# UCLIBCXX_SUPPORT_WCIN is not set
-# UCLIBCXX_SUPPORT_WCOUT is not set
-# UCLIBCXX_SUPPORT_WCERR is not set
-# UCLIBCXX_SUPPORT_WCLOG is not set
-
-#
-# STL and Code Expansion
-#
-UCLIBCXX_STL_BUFFER_SIZE=32
-UCLIBCXX_CODE_EXPANSION=y
-# UCLIBCXX_EXPAND_CONSTRUCTORS_DESTRUCTORS is not set
-UCLIBCXX_EXPAND_STRING_CHAR=y
-UCLIBCXX_EXPAND_VECTOR_BASIC=y
-# UCLIBCXX_EXPAND_IOS_CHAR is not set
-# UCLIBCXX_EXPAND_STREAMBUF_CHAR is not set
-UCLIBCXX_EXPAND_ISTREAM_CHAR=y
-UCLIBCXX_EXPAND_OSTREAM_CHAR=y
-UCLIBCXX_EXPAND_FSTREAM_CHAR=y
-# UCLIBCXX_EXPAND_SSTREAM_CHAR is not set
-
-#
-# Library Installation Options
-#
-UCLIBCXX_RUNTIME_PREFIX=""
-UCLIBCXX_RUNTIME_INCLUDE_SUBDIR="/include"
-UCLIBCXX_RUNTIME_LIB_SUBDIR="/lib"
-UCLIBCXX_RUNTIME_BIN_SUBDIR="/bin"
-UCLIBCXX_EXCEPTION_SUPPORT=y
-IMPORT_LIBSUP=y
-# IMPORT_LIBGCC_EH is not set
-# BUILD_STATIC_LIB is not set
-# DODEBUG is not set
diff --git a/package/uclibc++/files/config.x86 b/package/uclibc++/files/config.x86
deleted file mode 100644
index f6ef07573..000000000
--- a/package/uclibc++/files/config.x86
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# Automatically generated make config: don't edit
-#
-
-#
-# Target Features and Options
-#
-UCLIBCXX_HAS_FLOATS=y
-# UCLIBCXX_HAS_LONG_DOUBLE is not set
-# UCLIBCXX_HAS_TLS is not set
-WARNINGS="-Wall"
-BUILD_EXTRA_LIBRARIES=""
-HAVE_DOT_CONFIG=y
-
-#
-# String and I/O Stream Support
-#
-UCLIBCXX_HAS_WCHAR=y
-UCLIBCXX_IOSTREAM_BUFSIZE=32
-UCLIBCXX_HAS_LFS=y
-UCLIBCXX_SUPPORT_CDIR=y
-UCLIBCXX_SUPPORT_CIN=y
-UCLIBCXX_SUPPORT_COUT=y
-UCLIBCXX_SUPPORT_CERR=y
-# UCLIBCXX_SUPPORT_CLOG is not set
-# UCLIBCXX_SUPPORT_WCIN is not set
-# UCLIBCXX_SUPPORT_WCOUT is not set
-# UCLIBCXX_SUPPORT_WCERR is not set
-# UCLIBCXX_SUPPORT_WCLOG is not set
-
-#
-# STL and Code Expansion
-#
-UCLIBCXX_STL_BUFFER_SIZE=32
-UCLIBCXX_CODE_EXPANSION=y
-# UCLIBCXX_EXPAND_CONSTRUCTORS_DESTRUCTORS is not set
-UCLIBCXX_EXPAND_STRING_CHAR=y
-UCLIBCXX_EXPAND_VECTOR_BASIC=y
-# UCLIBCXX_EXPAND_IOS_CHAR is not set
-# UCLIBCXX_EXPAND_STREAMBUF_CHAR is not set
-UCLIBCXX_EXPAND_ISTREAM_CHAR=y
-UCLIBCXX_EXPAND_OSTREAM_CHAR=y
-UCLIBCXX_EXPAND_FSTREAM_CHAR=y
-# UCLIBCXX_EXPAND_SSTREAM_CHAR is not set
-
-#
-# Library Installation Options
-#
-UCLIBCXX_RUNTIME_PREFIX=""
-UCLIBCXX_RUNTIME_INCLUDE_SUBDIR="/include"
-UCLIBCXX_RUNTIME_LIB_SUBDIR="/lib"
-UCLIBCXX_RUNTIME_BIN_SUBDIR="/bin"
-UCLIBCXX_EXCEPTION_SUPPORT=y
-IMPORT_LIBSUP=y
-# IMPORT_LIBGCC_EH is not set
-# BUILD_STATIC_LIB is not set
-# DODEBUG is not set