public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/releng:master commit in: tools-uclibc/portage.mips32r2.hardened/savedconfig/sys-libs/, ...
@ 2016-09-13 19:39 Anthony G. Basile
  0 siblings, 0 replies; only message in thread
From: Anthony G. Basile @ 2016-09-13 19:39 UTC (permalink / raw
  To: gentoo-commits

commit:     28274e06eaee32f27ef3f36681e0ac31624d223b
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 13 19:39:52 2016 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Sep 13 19:39:52 2016 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=28274e06

tools-uclibc: switch to uclibc-ng

 .../portage.amd64.hardened/env/net-misc_iputils_0  |   1 +
 tools-uclibc/portage.amd64.hardened/package.env    |   1 +
 tools-uclibc/portage.amd64.hardened/package.mask   |   1 +
 tools-uclibc/portage.amd64.hardened/package.unmask |   1 +
 .../portage.amd64.hardened/package.use/uclibc      |   1 -
 .../portage.amd64.hardened/package.use/uclibc-ng   |   1 +
 .../savedconfig/sys-libs/{uclibc => uclibc-ng}     |  43 ++--
 .../portage.amd64.vanilla/env/net-misc_iputils_0   |   1 +
 .../portage.amd64.vanilla/package.accept_keywords  |   1 +
 tools-uclibc/portage.amd64.vanilla/package.env     |   1 +
 tools-uclibc/portage.amd64.vanilla/package.mask    |   1 +
 tools-uclibc/portage.amd64.vanilla/package.unmask  |   1 +
 .../portage.amd64.vanilla/package.use/uclibc       |   1 -
 .../portage.amd64.vanilla/package.use/uclibc-ng    |   1 +
 .../savedconfig/sys-libs/{uclibc => uclibc-ng}     |  43 ++--
 .../env/{perl.conf => dev-lang_perl_0}             |   0
 .../portage.armv7a.hardened/env/net-misc_iputils_0 |   1 +
 tools-uclibc/portage.armv7a.hardened/package.env   |   3 +-
 tools-uclibc/portage.armv7a.hardened/package.mask  |   1 +
 .../portage.armv7a.hardened/package.unmask         |   1 +
 .../portage.armv7a.hardened/package.use/uclibc     |   1 -
 .../portage.armv7a.hardened/package.use/uclibc-ng  |   1 +
 .../savedconfig/sys-libs/{uclibc => uclibc-ng}     |  47 ++--
 .../env/{perl.conf => dev-lang_perl_0}             |   0
 .../portage.armv7a.vanilla/env/net-misc_iputils_0  |   1 +
 .../portage.armv7a.vanilla/package.accept_keywords |   1 +
 tools-uclibc/portage.armv7a.vanilla/package.env    |   3 +-
 tools-uclibc/portage.armv7a.vanilla/package.mask   |   1 +
 tools-uclibc/portage.armv7a.vanilla/package.unmask |   1 +
 .../portage.armv7a.vanilla/package.use/uclibc      |   1 -
 .../portage.armv7a.vanilla/package.use/uclibc-ng   |   1 +
 .../savedconfig/sys-libs/{uclibc => uclibc-ng}     |  49 ++--
 .../env/{perl.conf => dev-lang_perl_0}             |   0
 .../portage.i686.hardened/env/net-misc_iputils_0   |   1 +
 tools-uclibc/portage.i686.hardened/package.env     |   3 +-
 tools-uclibc/portage.i686.hardened/package.mask    |   1 +
 tools-uclibc/portage.i686.hardened/package.unmask  |   1 +
 .../portage.i686.hardened/package.use/uclibc       |   1 -
 .../portage.i686.hardened/package.use/uclibc-ng    |   1 +
 .../savedconfig/sys-libs/uclibc                    | 271 ---------------------
 .../savedconfig/sys-libs/uclibc-ng}                |  56 +++--
 .../portage.i686.vanilla/env/net-misc_iputils_0    |   1 +
 .../portage.i686.vanilla/package.accept_keywords   |   1 +
 tools-uclibc/portage.i686.vanilla/package.env      |   1 +
 tools-uclibc/portage.i686.vanilla/package.mask     |   1 +
 tools-uclibc/portage.i686.vanilla/package.unmask   |   1 +
 .../portage.i686.vanilla/package.use/uclibc        |   1 -
 .../portage.i686.vanilla/package.use/uclibc-ng     |   1 +
 .../savedconfig/sys-libs/uclibc                    | 271 ---------------------
 .../savedconfig/sys-libs/uclibc-ng}                |  56 +++--
 .../env/net-misc_iputils_0                         |   1 +
 tools-uclibc/portage.mips32r2.hardened/package.env |   1 +
 .../portage.mips32r2.hardened/package.mask         |   1 +
 .../portage.mips32r2.hardened/package.unmask       |   1 +
 .../portage.mips32r2.hardened/package.use/uclibc   |   1 -
 .../package.use/uclibc-ng                          |   1 +
 .../savedconfig/sys-libs/{uclibc => uclibc-ng}     |  53 ++--
 .../env/net-misc_iputils_0                         |   1 +
 tools-uclibc/portage.mips32r2.vanilla/package.env  |   1 +
 tools-uclibc/portage.mips32r2.vanilla/package.mask |   1 +
 .../portage.mips32r2.vanilla/package.unmask        |   1 +
 .../portage.mips32r2.vanilla/package.use/uclibc    |   1 -
 .../portage.mips32r2.vanilla/package.use/uclibc-ng |   1 +
 .../savedconfig/sys-libs/{uclibc => uclibc-ng}     |  53 ++--
 .../env/net-misc_iputils_0                         |   1 +
 tools-uclibc/portage.mipsel3.hardened/package.env  |   1 +
 tools-uclibc/portage.mipsel3.hardened/package.mask |   1 +
 .../portage.mipsel3.hardened/package.unmask        |   1 +
 .../portage.mipsel3.hardened/package.use/uclibc    |   1 -
 .../portage.mipsel3.hardened/package.use/uclibc-ng |   1 +
 .../savedconfig/sys-libs/{uclibc => uclibc-ng}     |  52 ++--
 .../portage.mipsel3.vanilla/env/net-misc_iputils_0 |   1 +
 tools-uclibc/portage.mipsel3.vanilla/package.env   |   1 +
 tools-uclibc/portage.mipsel3.vanilla/package.mask  |   1 +
 .../portage.mipsel3.vanilla/package.unmask         |   1 +
 .../portage.mipsel3.vanilla/package.use/uclibc     |   1 -
 .../portage.mipsel3.vanilla/package.use/uclibc-ng  |   1 +
 .../savedconfig/sys-libs/{uclibc => uclibc-ng}     |  52 ++--
 .../portage.ppc.hardened/env/net-misc_iputils_0    |   1 +
 tools-uclibc/portage.ppc.hardened/package.env      |   1 +
 tools-uclibc/portage.ppc.hardened/package.mask     |   1 +
 tools-uclibc/portage.ppc.hardened/package.unmask   |   1 +
 .../portage.ppc.hardened/package.use/uclibc        |   1 -
 .../portage.ppc.hardened/package.use/uclibc-ng     |   1 +
 .../savedconfig/sys-libs/{uclibc => uclibc-ng}     |  54 ++--
 .../portage.ppc.vanilla/env/net-misc_iputils_0     |   1 +
 .../portage.ppc.vanilla/package.accept_keywords    |   1 +
 tools-uclibc/portage.ppc.vanilla/package.env       |   1 +
 tools-uclibc/portage.ppc.vanilla/package.mask      |   1 +
 tools-uclibc/portage.ppc.vanilla/package.unmask    |   1 +
 .../portage.ppc.vanilla/package.use/uclibc         |   1 -
 .../portage.ppc.vanilla/package.use/uclibc-ng      |   1 +
 .../savedconfig/sys-libs/{uclibc => uclibc-ng}     |  54 ++--
 93 files changed, 370 insertions(+), 866 deletions(-)

diff --git a/tools-uclibc/portage.amd64.hardened/env/net-misc_iputils_0 b/tools-uclibc/portage.amd64.hardened/env/net-misc_iputils_0
new file mode 100644
index 0000000..1e8c846
--- /dev/null
+++ b/tools-uclibc/portage.amd64.hardened/env/net-misc_iputils_0
@@ -0,0 +1 @@
+LDFLAGS=-lm

diff --git a/tools-uclibc/portage.amd64.hardened/package.env b/tools-uclibc/portage.amd64.hardened/package.env
new file mode 100644
index 0000000..dd59e5f
--- /dev/null
+++ b/tools-uclibc/portage.amd64.hardened/package.env
@@ -0,0 +1 @@
+net-misc/iputils net-misc_iputils_0

diff --git a/tools-uclibc/portage.amd64.hardened/package.mask b/tools-uclibc/portage.amd64.hardened/package.mask
new file mode 100644
index 0000000..5eceab2
--- /dev/null
+++ b/tools-uclibc/portage.amd64.hardened/package.mask
@@ -0,0 +1 @@
+sys-libs/uclibc

diff --git a/tools-uclibc/portage.amd64.hardened/package.unmask b/tools-uclibc/portage.amd64.hardened/package.unmask
new file mode 100644
index 0000000..4ee0e51
--- /dev/null
+++ b/tools-uclibc/portage.amd64.hardened/package.unmask
@@ -0,0 +1 @@
+>sys-devel/binutils-config-4-r2

diff --git a/tools-uclibc/portage.amd64.hardened/package.use/uclibc b/tools-uclibc/portage.amd64.hardened/package.use/uclibc
deleted file mode 100644
index 0715d0b..0000000
--- a/tools-uclibc/portage.amd64.hardened/package.use/uclibc
+++ /dev/null
@@ -1 +0,0 @@
-sys-libs/uclibc -* savedconfig

diff --git a/tools-uclibc/portage.amd64.hardened/package.use/uclibc-ng b/tools-uclibc/portage.amd64.hardened/package.use/uclibc-ng
new file mode 100644
index 0000000..7d19d50
--- /dev/null
+++ b/tools-uclibc/portage.amd64.hardened/package.use/uclibc-ng
@@ -0,0 +1 @@
+sys-libs/uclibc-ng -* savedconfig

diff --git a/tools-uclibc/portage.amd64.hardened/savedconfig/sys-libs/uclibc b/tools-uclibc/portage.amd64.hardened/savedconfig/sys-libs/uclibc-ng
similarity index 89%
copy from tools-uclibc/portage.amd64.hardened/savedconfig/sys-libs/uclibc
copy to tools-uclibc/portage.amd64.hardened/savedconfig/sys-libs/uclibc-ng
index bf8d8e8..bd2494a 100644
--- a/tools-uclibc/portage.amd64.hardened/savedconfig/sys-libs/uclibc
+++ b/tools-uclibc/portage.amd64.hardened/savedconfig/sys-libs/uclibc-ng
@@ -1,32 +1,30 @@
 #
-# Automatically generated make config: don't edit
-# Version: 0.9.33.2
-# Tue Oct 16 14:29:56 2012
+# Automatically generated file; DO NOT EDIT.
+# uClibc-ng 0.1.0.16 C Library Configuration
 #
 # TARGET_alpha is not set
+# TARGET_arc is not set
 # TARGET_arm is not set
 # TARGET_avr32 is not set
 # TARGET_bfin is not set
 # TARGET_c6x is not set
 # TARGET_cris is not set
-# TARGET_e1 is not set
 # TARGET_frv is not set
 # TARGET_h8300 is not set
 # TARGET_hppa is not set
 # TARGET_i386 is not set
-# TARGET_i960 is not set
 # TARGET_ia64 is not set
+# TARGET_lm32 is not set
 # TARGET_m68k is not set
+# TARGET_metag is not set
 # TARGET_microblaze is not set
 # TARGET_mips is not set
-# TARGET_nios is not set
+# TARGET_nds32 is not set
 # TARGET_nios2 is not set
+# TARGET_or1k 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_vax is not set
 TARGET_x86_64=y
 # TARGET_xtensa is not set
 
@@ -40,6 +38,7 @@ TARGET_SUBARCH=""
 #
 # Using ELF file format
 #
+ARCH_HAS_DEPRECATED_SYSCALLS=y
 ARCH_LITTLE_ENDIAN=y
 
 #
@@ -60,6 +59,7 @@ HAVE_DOT_CONFIG=y
 # General Library Settings
 #
 DOPIC=y
+ARCH_HAS_UCONTEXT=y
 HAVE_SHARED=y
 FORCE_SHAREABLE_TEXT_SEGMENTS=y
 LDSO_LDD_SUPPORT=y
@@ -71,14 +71,14 @@ LDSO_STANDALONE_SUPPORT=y
 LDSO_PRELINK_SUPPORT=y
 UCLIBC_STATIC_LDCONFIG=y
 LDSO_RUNPATH=y
+LDSO_RUNPATH_OF_EXECUTABLE=y
+LDSO_SAFE_RUNPATH=y
 LDSO_SEARCH_INTERP_PATH=y
 LDSO_LD_LIBRARY_PATH=y
 # LDSO_NO_CLEANUP is not set
 UCLIBC_CTOR_DTOR=y
 LDSO_GNU_HASH_SUPPORT=y
 # HAS_NO_THREADS is not set
-# LINUXTHREADS_OLD is not set
-# LINUXTHREADS_NEW is not set
 UCLIBC_HAS_THREADS_NATIVE=y
 UCLIBC_HAS_THREADS=y
 UCLIBC_HAS_TLS=y
@@ -89,9 +89,14 @@ UCLIBC_HAS_LFS=y
 # MALLOC_SIMPLE is not set
 MALLOC_STANDARD=y
 MALLOC_GLIBC_COMPAT=y
+UCLIBC_HAS_OBSTACK=y
 UCLIBC_DYNAMIC_ATEXIT=y
 COMPAT_ATEXIT=y
+UCLIBC_HAS_UTMPX=y
+UCLIBC_HAS_UTMP=y
+UCLIBC_SUSV2_LEGACY=y
 UCLIBC_SUSV3_LEGACY=y
+UCLIBC_HAS_CONTEXT_FUNCS=y
 UCLIBC_SUSV3_LEGACY_MACROS=y
 UCLIBC_SUSV4_LEGACY=y
 # UCLIBC_STRICT_HEADERS is not set
@@ -126,7 +131,7 @@ UCLIBC_LINUX_SPECIFIC=y
 UCLIBC_HAS_GNU_ERROR=y
 UCLIBC_BSD_SPECIFIC=y
 UCLIBC_HAS_BSD_ERR=y
-# UCLIBC_HAS_OBSOLETE_BSD_SIGNAL is not set
+UCLIBC_HAS_OBSOLETE_BSD_SIGNAL=y
 # UCLIBC_HAS_OBSOLETE_SYSV_SIGNAL is not set
 UCLIBC_NTP_LEGACY=y
 # UCLIBC_SV4_DEPRECATED is not set
@@ -134,7 +139,7 @@ UCLIBC_HAS_REALTIME=y
 UCLIBC_HAS_ADVANCED_REALTIME=y
 UCLIBC_HAS_EPOLL=y
 UCLIBC_HAS_XATTR=y
-# UCLIBC_HAS_PROFILING is not set
+UCLIBC_HAS_PROFILING=y
 UCLIBC_HAS_CRYPT_IMPL=y
 UCLIBC_HAS_SHA256_CRYPT_IMPL=y
 UCLIBC_HAS_SHA512_CRYPT_IMPL=y
@@ -160,6 +165,7 @@ UCLIBC_HAS_LIBNSL_STUB=y
 #
 UCLIBC_HAS_STRING_GENERIC_OPT=y
 UCLIBC_HAS_STRING_ARCH_OPT=y
+UCLIBC_HAS_STDIO_FUTEXES=y
 UCLIBC_HAS_CTYPE_TABLES=y
 UCLIBC_HAS_CTYPE_SIGNED=y
 # UCLIBC_HAS_CTYPE_UNSAFE is not set
@@ -170,8 +176,6 @@ UCLIBC_HAS_WCHAR=y
 UCLIBC_HAS_HEXADECIMAL_FLOATS=y
 UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
 UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
-UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y
-# 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
@@ -195,8 +199,9 @@ UCLIBC_HAS_SYS_ERRLIST=y
 UCLIBC_HAS_SIGNUM_MESSAGES=y
 UCLIBC_HAS_SYS_SIGLIST=y
 UCLIBC_HAS_GNU_GETOPT=y
-UCLIBC_HAS_STDIO_FUTEXES=y
+UCLIBC_HAS_GETOPT_LONG=y
 UCLIBC_HAS_GNU_GETSUBOPT=y
+# UCLIBC_HAS_ARGP is not set
 
 #
 # Big and Tall
@@ -211,7 +216,6 @@ UCLIBC_HAS_FTW=y
 UCLIBC_HAS_FTS=y
 UCLIBC_HAS_GLOB=y
 UCLIBC_HAS_GNU_GLOB=y
-UCLIBC_HAS_UTMPX=y
 
 #
 # Library Installation Options
@@ -225,11 +229,9 @@ HARDWIRED_ABSPATH=y
 # Security options
 #
 UCLIBC_HAS_ARC4RANDOM=y
+# ARC4RANDOM_USES_NODEV is not set
 UCLIBC_HAS_SSP=y
-# UCLIBC_HAS_SSP_COMPAT is not set
 # SSP_QUICK_CANARY is not set
-# PROPOLICE_BLOCK_ABRT is not set
-PROPOLICE_BLOCK_SEGV=y
 UCLIBC_BUILD_SSP=y
 UCLIBC_BUILD_RELRO=y
 UCLIBC_BUILD_NOW=y
@@ -250,4 +252,3 @@ UCLIBC_HAS_BACKTRACE=y
 WARNINGS="-Wall"
 # EXTRA_WARNINGS is not set
 # DOMULTI is not set
-# UCLIBC_MJN3_ONLY is not set

diff --git a/tools-uclibc/portage.amd64.vanilla/env/net-misc_iputils_0 b/tools-uclibc/portage.amd64.vanilla/env/net-misc_iputils_0
new file mode 100644
index 0000000..1e8c846
--- /dev/null
+++ b/tools-uclibc/portage.amd64.vanilla/env/net-misc_iputils_0
@@ -0,0 +1 @@
+LDFLAGS=-lm

diff --git a/tools-uclibc/portage.amd64.vanilla/package.accept_keywords b/tools-uclibc/portage.amd64.vanilla/package.accept_keywords
new file mode 100644
index 0000000..6a81608
--- /dev/null
+++ b/tools-uclibc/portage.amd64.vanilla/package.accept_keywords
@@ -0,0 +1 @@
+=sys-devel/gcc-config-1.8-r1 ~amd64

diff --git a/tools-uclibc/portage.amd64.vanilla/package.env b/tools-uclibc/portage.amd64.vanilla/package.env
new file mode 100644
index 0000000..dd59e5f
--- /dev/null
+++ b/tools-uclibc/portage.amd64.vanilla/package.env
@@ -0,0 +1 @@
+net-misc/iputils net-misc_iputils_0

diff --git a/tools-uclibc/portage.amd64.vanilla/package.mask b/tools-uclibc/portage.amd64.vanilla/package.mask
new file mode 100644
index 0000000..5eceab2
--- /dev/null
+++ b/tools-uclibc/portage.amd64.vanilla/package.mask
@@ -0,0 +1 @@
+sys-libs/uclibc

diff --git a/tools-uclibc/portage.amd64.vanilla/package.unmask b/tools-uclibc/portage.amd64.vanilla/package.unmask
new file mode 100644
index 0000000..4ee0e51
--- /dev/null
+++ b/tools-uclibc/portage.amd64.vanilla/package.unmask
@@ -0,0 +1 @@
+>sys-devel/binutils-config-4-r2

diff --git a/tools-uclibc/portage.amd64.vanilla/package.use/uclibc b/tools-uclibc/portage.amd64.vanilla/package.use/uclibc
deleted file mode 100644
index 0715d0b..0000000
--- a/tools-uclibc/portage.amd64.vanilla/package.use/uclibc
+++ /dev/null
@@ -1 +0,0 @@
-sys-libs/uclibc -* savedconfig

diff --git a/tools-uclibc/portage.amd64.vanilla/package.use/uclibc-ng b/tools-uclibc/portage.amd64.vanilla/package.use/uclibc-ng
new file mode 100644
index 0000000..7d19d50
--- /dev/null
+++ b/tools-uclibc/portage.amd64.vanilla/package.use/uclibc-ng
@@ -0,0 +1 @@
+sys-libs/uclibc-ng -* savedconfig

diff --git a/tools-uclibc/portage.amd64.vanilla/savedconfig/sys-libs/uclibc b/tools-uclibc/portage.amd64.vanilla/savedconfig/sys-libs/uclibc-ng
similarity index 89%
rename from tools-uclibc/portage.amd64.vanilla/savedconfig/sys-libs/uclibc
rename to tools-uclibc/portage.amd64.vanilla/savedconfig/sys-libs/uclibc-ng
index bf8d8e8..bd2494a 100644
--- a/tools-uclibc/portage.amd64.vanilla/savedconfig/sys-libs/uclibc
+++ b/tools-uclibc/portage.amd64.vanilla/savedconfig/sys-libs/uclibc-ng
@@ -1,32 +1,30 @@
 #
-# Automatically generated make config: don't edit
-# Version: 0.9.33.2
-# Tue Oct 16 14:29:56 2012
+# Automatically generated file; DO NOT EDIT.
+# uClibc-ng 0.1.0.16 C Library Configuration
 #
 # TARGET_alpha is not set
+# TARGET_arc is not set
 # TARGET_arm is not set
 # TARGET_avr32 is not set
 # TARGET_bfin is not set
 # TARGET_c6x is not set
 # TARGET_cris is not set
-# TARGET_e1 is not set
 # TARGET_frv is not set
 # TARGET_h8300 is not set
 # TARGET_hppa is not set
 # TARGET_i386 is not set
-# TARGET_i960 is not set
 # TARGET_ia64 is not set
+# TARGET_lm32 is not set
 # TARGET_m68k is not set
+# TARGET_metag is not set
 # TARGET_microblaze is not set
 # TARGET_mips is not set
-# TARGET_nios is not set
+# TARGET_nds32 is not set
 # TARGET_nios2 is not set
+# TARGET_or1k 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_vax is not set
 TARGET_x86_64=y
 # TARGET_xtensa is not set
 
@@ -40,6 +38,7 @@ TARGET_SUBARCH=""
 #
 # Using ELF file format
 #
+ARCH_HAS_DEPRECATED_SYSCALLS=y
 ARCH_LITTLE_ENDIAN=y
 
 #
@@ -60,6 +59,7 @@ HAVE_DOT_CONFIG=y
 # General Library Settings
 #
 DOPIC=y
+ARCH_HAS_UCONTEXT=y
 HAVE_SHARED=y
 FORCE_SHAREABLE_TEXT_SEGMENTS=y
 LDSO_LDD_SUPPORT=y
@@ -71,14 +71,14 @@ LDSO_STANDALONE_SUPPORT=y
 LDSO_PRELINK_SUPPORT=y
 UCLIBC_STATIC_LDCONFIG=y
 LDSO_RUNPATH=y
+LDSO_RUNPATH_OF_EXECUTABLE=y
+LDSO_SAFE_RUNPATH=y
 LDSO_SEARCH_INTERP_PATH=y
 LDSO_LD_LIBRARY_PATH=y
 # LDSO_NO_CLEANUP is not set
 UCLIBC_CTOR_DTOR=y
 LDSO_GNU_HASH_SUPPORT=y
 # HAS_NO_THREADS is not set
-# LINUXTHREADS_OLD is not set
-# LINUXTHREADS_NEW is not set
 UCLIBC_HAS_THREADS_NATIVE=y
 UCLIBC_HAS_THREADS=y
 UCLIBC_HAS_TLS=y
@@ -89,9 +89,14 @@ UCLIBC_HAS_LFS=y
 # MALLOC_SIMPLE is not set
 MALLOC_STANDARD=y
 MALLOC_GLIBC_COMPAT=y
+UCLIBC_HAS_OBSTACK=y
 UCLIBC_DYNAMIC_ATEXIT=y
 COMPAT_ATEXIT=y
+UCLIBC_HAS_UTMPX=y
+UCLIBC_HAS_UTMP=y
+UCLIBC_SUSV2_LEGACY=y
 UCLIBC_SUSV3_LEGACY=y
+UCLIBC_HAS_CONTEXT_FUNCS=y
 UCLIBC_SUSV3_LEGACY_MACROS=y
 UCLIBC_SUSV4_LEGACY=y
 # UCLIBC_STRICT_HEADERS is not set
@@ -126,7 +131,7 @@ UCLIBC_LINUX_SPECIFIC=y
 UCLIBC_HAS_GNU_ERROR=y
 UCLIBC_BSD_SPECIFIC=y
 UCLIBC_HAS_BSD_ERR=y
-# UCLIBC_HAS_OBSOLETE_BSD_SIGNAL is not set
+UCLIBC_HAS_OBSOLETE_BSD_SIGNAL=y
 # UCLIBC_HAS_OBSOLETE_SYSV_SIGNAL is not set
 UCLIBC_NTP_LEGACY=y
 # UCLIBC_SV4_DEPRECATED is not set
@@ -134,7 +139,7 @@ UCLIBC_HAS_REALTIME=y
 UCLIBC_HAS_ADVANCED_REALTIME=y
 UCLIBC_HAS_EPOLL=y
 UCLIBC_HAS_XATTR=y
-# UCLIBC_HAS_PROFILING is not set
+UCLIBC_HAS_PROFILING=y
 UCLIBC_HAS_CRYPT_IMPL=y
 UCLIBC_HAS_SHA256_CRYPT_IMPL=y
 UCLIBC_HAS_SHA512_CRYPT_IMPL=y
@@ -160,6 +165,7 @@ UCLIBC_HAS_LIBNSL_STUB=y
 #
 UCLIBC_HAS_STRING_GENERIC_OPT=y
 UCLIBC_HAS_STRING_ARCH_OPT=y
+UCLIBC_HAS_STDIO_FUTEXES=y
 UCLIBC_HAS_CTYPE_TABLES=y
 UCLIBC_HAS_CTYPE_SIGNED=y
 # UCLIBC_HAS_CTYPE_UNSAFE is not set
@@ -170,8 +176,6 @@ UCLIBC_HAS_WCHAR=y
 UCLIBC_HAS_HEXADECIMAL_FLOATS=y
 UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
 UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
-UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y
-# 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
@@ -195,8 +199,9 @@ UCLIBC_HAS_SYS_ERRLIST=y
 UCLIBC_HAS_SIGNUM_MESSAGES=y
 UCLIBC_HAS_SYS_SIGLIST=y
 UCLIBC_HAS_GNU_GETOPT=y
-UCLIBC_HAS_STDIO_FUTEXES=y
+UCLIBC_HAS_GETOPT_LONG=y
 UCLIBC_HAS_GNU_GETSUBOPT=y
+# UCLIBC_HAS_ARGP is not set
 
 #
 # Big and Tall
@@ -211,7 +216,6 @@ UCLIBC_HAS_FTW=y
 UCLIBC_HAS_FTS=y
 UCLIBC_HAS_GLOB=y
 UCLIBC_HAS_GNU_GLOB=y
-UCLIBC_HAS_UTMPX=y
 
 #
 # Library Installation Options
@@ -225,11 +229,9 @@ HARDWIRED_ABSPATH=y
 # Security options
 #
 UCLIBC_HAS_ARC4RANDOM=y
+# ARC4RANDOM_USES_NODEV is not set
 UCLIBC_HAS_SSP=y
-# UCLIBC_HAS_SSP_COMPAT is not set
 # SSP_QUICK_CANARY is not set
-# PROPOLICE_BLOCK_ABRT is not set
-PROPOLICE_BLOCK_SEGV=y
 UCLIBC_BUILD_SSP=y
 UCLIBC_BUILD_RELRO=y
 UCLIBC_BUILD_NOW=y
@@ -250,4 +252,3 @@ UCLIBC_HAS_BACKTRACE=y
 WARNINGS="-Wall"
 # EXTRA_WARNINGS is not set
 # DOMULTI is not set
-# UCLIBC_MJN3_ONLY is not set

diff --git a/tools-uclibc/portage.armv7a.hardened/env/perl.conf b/tools-uclibc/portage.armv7a.hardened/env/dev-lang_perl_0
similarity index 100%
rename from tools-uclibc/portage.armv7a.hardened/env/perl.conf
rename to tools-uclibc/portage.armv7a.hardened/env/dev-lang_perl_0

diff --git a/tools-uclibc/portage.armv7a.hardened/env/net-misc_iputils_0 b/tools-uclibc/portage.armv7a.hardened/env/net-misc_iputils_0
new file mode 100644
index 0000000..1e8c846
--- /dev/null
+++ b/tools-uclibc/portage.armv7a.hardened/env/net-misc_iputils_0
@@ -0,0 +1 @@
+LDFLAGS=-lm

diff --git a/tools-uclibc/portage.armv7a.hardened/package.env b/tools-uclibc/portage.armv7a.hardened/package.env
index 0fc1e42..1dfa69a 100644
--- a/tools-uclibc/portage.armv7a.hardened/package.env
+++ b/tools-uclibc/portage.armv7a.hardened/package.env
@@ -1 +1,2 @@
-dev-lang/perl perl.conf
+dev-lang/perl dev-lang_perl_0
+net-misc/iputils net-misc_iputils_0

diff --git a/tools-uclibc/portage.armv7a.hardened/package.mask b/tools-uclibc/portage.armv7a.hardened/package.mask
new file mode 100644
index 0000000..5eceab2
--- /dev/null
+++ b/tools-uclibc/portage.armv7a.hardened/package.mask
@@ -0,0 +1 @@
+sys-libs/uclibc

diff --git a/tools-uclibc/portage.armv7a.hardened/package.unmask b/tools-uclibc/portage.armv7a.hardened/package.unmask
new file mode 100644
index 0000000..4ee0e51
--- /dev/null
+++ b/tools-uclibc/portage.armv7a.hardened/package.unmask
@@ -0,0 +1 @@
+>sys-devel/binutils-config-4-r2

diff --git a/tools-uclibc/portage.armv7a.hardened/package.use/uclibc b/tools-uclibc/portage.armv7a.hardened/package.use/uclibc
deleted file mode 100644
index 0715d0b..0000000
--- a/tools-uclibc/portage.armv7a.hardened/package.use/uclibc
+++ /dev/null
@@ -1 +0,0 @@
-sys-libs/uclibc -* savedconfig

diff --git a/tools-uclibc/portage.armv7a.hardened/package.use/uclibc-ng b/tools-uclibc/portage.armv7a.hardened/package.use/uclibc-ng
new file mode 100644
index 0000000..7d19d50
--- /dev/null
+++ b/tools-uclibc/portage.armv7a.hardened/package.use/uclibc-ng
@@ -0,0 +1 @@
+sys-libs/uclibc-ng -* savedconfig

diff --git a/tools-uclibc/portage.armv7a.hardened/savedconfig/sys-libs/uclibc b/tools-uclibc/portage.armv7a.hardened/savedconfig/sys-libs/uclibc-ng
similarity index 88%
rename from tools-uclibc/portage.armv7a.hardened/savedconfig/sys-libs/uclibc
rename to tools-uclibc/portage.armv7a.hardened/savedconfig/sys-libs/uclibc-ng
index e2a5ff7..f88db57 100644
--- a/tools-uclibc/portage.armv7a.hardened/savedconfig/sys-libs/uclibc
+++ b/tools-uclibc/portage.armv7a.hardened/savedconfig/sys-libs/uclibc-ng
@@ -1,32 +1,30 @@
 #
-# Automatically generated make config: don't edit
-# Version: 0.9.33.2
-# Sat Jul 21 01:03:46 2012
+# Automatically generated file; DO NOT EDIT.
+# uClibc-ng 0.1.0.16 C Library Configuration
 #
 # TARGET_alpha is not set
+# TARGET_arc is not set
 TARGET_arm=y
 # TARGET_avr32 is not set
 # TARGET_bfin is not set
 # TARGET_c6x is not set
 # TARGET_cris is not set
-# TARGET_e1 is not set
 # TARGET_frv is not set
 # TARGET_h8300 is not set
 # TARGET_hppa is not set
 # TARGET_i386 is not set
-# TARGET_i960 is not set
 # TARGET_ia64 is not set
+# TARGET_lm32 is not set
 # TARGET_m68k is not set
+# TARGET_metag is not set
 # TARGET_microblaze is not set
 # TARGET_mips is not set
-# TARGET_nios is not set
+# TARGET_nds32 is not set
 # TARGET_nios2 is not set
+# TARGET_or1k 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_vax is not set
 # TARGET_x86_64 is not set
 # TARGET_xtensa is not set
 
@@ -36,13 +34,12 @@ TARGET_arm=y
 TARGET_ARCH="arm"
 FORCE_OPTIONS_FOR_ARCH=y
 CONFIG_ARM_EABI=y
-# COMPILE_IN_THUMB_MODE is not set
-# USE_BX is not set
 TARGET_SUBARCH=""
 
 #
 # Using ELF file format
 #
+ARCH_HAS_DEPRECATED_SYSCALLS=y
 ARCH_ANY_ENDIAN=y
 ARCH_LITTLE_ENDIAN=y
 # ARCH_WANTS_BIG_ENDIAN is not set
@@ -61,6 +58,7 @@ HAVE_DOT_CONFIG=y
 # General Library Settings
 #
 DOPIC=y
+ARCH_HAS_UCONTEXT=y
 HAVE_SHARED=y
 FORCE_SHAREABLE_TEXT_SEGMENTS=y
 LDSO_LDD_SUPPORT=y
@@ -72,14 +70,14 @@ LDSO_STANDALONE_SUPPORT=y
 LDSO_PRELINK_SUPPORT=y
 UCLIBC_STATIC_LDCONFIG=y
 LDSO_RUNPATH=y
+LDSO_RUNPATH_OF_EXECUTABLE=y
+LDSO_SAFE_RUNPATH=y
 LDSO_SEARCH_INTERP_PATH=y
 LDSO_LD_LIBRARY_PATH=y
 # LDSO_NO_CLEANUP is not set
 UCLIBC_CTOR_DTOR=y
-# LDSO_GNU_HASH_SUPPORT is not set
+LDSO_GNU_HASH_SUPPORT=y
 # HAS_NO_THREADS is not set
-# LINUXTHREADS_OLD is not set
-# LINUXTHREADS_NEW is not set
 UCLIBC_HAS_THREADS_NATIVE=y
 UCLIBC_HAS_THREADS=y
 UCLIBC_HAS_TLS=y
@@ -90,9 +88,14 @@ UCLIBC_HAS_LFS=y
 # MALLOC_SIMPLE is not set
 MALLOC_STANDARD=y
 MALLOC_GLIBC_COMPAT=y
+UCLIBC_HAS_OBSTACK=y
 UCLIBC_DYNAMIC_ATEXIT=y
 COMPAT_ATEXIT=y
+UCLIBC_HAS_UTMPX=y
+UCLIBC_HAS_UTMP=y
+UCLIBC_SUSV2_LEGACY=y
 UCLIBC_SUSV3_LEGACY=y
+UCLIBC_HAS_CONTEXT_FUNCS=y
 UCLIBC_SUSV3_LEGACY_MACROS=y
 UCLIBC_SUSV4_LEGACY=y
 # UCLIBC_STRICT_HEADERS is not set
@@ -127,7 +130,7 @@ UCLIBC_LINUX_SPECIFIC=y
 UCLIBC_HAS_GNU_ERROR=y
 UCLIBC_BSD_SPECIFIC=y
 UCLIBC_HAS_BSD_ERR=y
-# UCLIBC_HAS_OBSOLETE_BSD_SIGNAL is not set
+UCLIBC_HAS_OBSOLETE_BSD_SIGNAL=y
 # UCLIBC_HAS_OBSOLETE_SYSV_SIGNAL is not set
 UCLIBC_NTP_LEGACY=y
 # UCLIBC_SV4_DEPRECATED is not set
@@ -135,7 +138,7 @@ UCLIBC_HAS_REALTIME=y
 UCLIBC_HAS_ADVANCED_REALTIME=y
 UCLIBC_HAS_EPOLL=y
 UCLIBC_HAS_XATTR=y
-# UCLIBC_HAS_PROFILING is not set
+UCLIBC_HAS_PROFILING=y
 UCLIBC_HAS_CRYPT_IMPL=y
 UCLIBC_HAS_SHA256_CRYPT_IMPL=y
 UCLIBC_HAS_SHA512_CRYPT_IMPL=y
@@ -161,6 +164,7 @@ UCLIBC_HAS_LIBNSL_STUB=y
 #
 UCLIBC_HAS_STRING_GENERIC_OPT=y
 UCLIBC_HAS_STRING_ARCH_OPT=y
+UCLIBC_HAS_STDIO_FUTEXES=y
 UCLIBC_HAS_CTYPE_TABLES=y
 UCLIBC_HAS_CTYPE_SIGNED=y
 # UCLIBC_HAS_CTYPE_UNSAFE is not set
@@ -171,8 +175,6 @@ UCLIBC_HAS_WCHAR=y
 UCLIBC_HAS_HEXADECIMAL_FLOATS=y
 UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
 UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
-UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y
-# 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
@@ -196,8 +198,9 @@ UCLIBC_HAS_SYS_ERRLIST=y
 UCLIBC_HAS_SIGNUM_MESSAGES=y
 UCLIBC_HAS_SYS_SIGLIST=y
 UCLIBC_HAS_GNU_GETOPT=y
-UCLIBC_HAS_STDIO_FUTEXES=y
+UCLIBC_HAS_GETOPT_LONG=y
 UCLIBC_HAS_GNU_GETSUBOPT=y
+# UCLIBC_HAS_ARGP is not set
 
 #
 # Big and Tall
@@ -212,7 +215,6 @@ UCLIBC_HAS_FTW=y
 UCLIBC_HAS_FTS=y
 UCLIBC_HAS_GLOB=y
 UCLIBC_HAS_GNU_GLOB=y
-UCLIBC_HAS_UTMPX=y
 
 #
 # Library Installation Options
@@ -227,11 +229,9 @@ HARDWIRED_ABSPATH=y
 #
 UCLIBC_BUILD_PIE=y
 UCLIBC_HAS_ARC4RANDOM=y
+# ARC4RANDOM_USES_NODEV is not set
 UCLIBC_HAS_SSP=y
-# UCLIBC_HAS_SSP_COMPAT is not set
 # SSP_QUICK_CANARY is not set
-# PROPOLICE_BLOCK_ABRT is not set
-PROPOLICE_BLOCK_SEGV=y
 UCLIBC_BUILD_SSP=y
 UCLIBC_BUILD_RELRO=y
 UCLIBC_BUILD_NOW=y
@@ -252,4 +252,3 @@ UCLIBC_HAS_BACKTRACE=y
 WARNINGS="-Wall"
 # EXTRA_WARNINGS is not set
 # DOMULTI is not set
-# UCLIBC_MJN3_ONLY is not set

diff --git a/tools-uclibc/portage.armv7a.vanilla/env/perl.conf b/tools-uclibc/portage.armv7a.vanilla/env/dev-lang_perl_0
similarity index 100%
rename from tools-uclibc/portage.armv7a.vanilla/env/perl.conf
rename to tools-uclibc/portage.armv7a.vanilla/env/dev-lang_perl_0

diff --git a/tools-uclibc/portage.armv7a.vanilla/env/net-misc_iputils_0 b/tools-uclibc/portage.armv7a.vanilla/env/net-misc_iputils_0
new file mode 100644
index 0000000..1e8c846
--- /dev/null
+++ b/tools-uclibc/portage.armv7a.vanilla/env/net-misc_iputils_0
@@ -0,0 +1 @@
+LDFLAGS=-lm

diff --git a/tools-uclibc/portage.armv7a.vanilla/package.accept_keywords b/tools-uclibc/portage.armv7a.vanilla/package.accept_keywords
new file mode 100644
index 0000000..f2838f2
--- /dev/null
+++ b/tools-uclibc/portage.armv7a.vanilla/package.accept_keywords
@@ -0,0 +1 @@
+=sys-devel/gcc-config-1.8-r1 ~arm

diff --git a/tools-uclibc/portage.armv7a.vanilla/package.env b/tools-uclibc/portage.armv7a.vanilla/package.env
index 0fc1e42..1dfa69a 100644
--- a/tools-uclibc/portage.armv7a.vanilla/package.env
+++ b/tools-uclibc/portage.armv7a.vanilla/package.env
@@ -1 +1,2 @@
-dev-lang/perl perl.conf
+dev-lang/perl dev-lang_perl_0
+net-misc/iputils net-misc_iputils_0

diff --git a/tools-uclibc/portage.armv7a.vanilla/package.mask b/tools-uclibc/portage.armv7a.vanilla/package.mask
new file mode 100644
index 0000000..5eceab2
--- /dev/null
+++ b/tools-uclibc/portage.armv7a.vanilla/package.mask
@@ -0,0 +1 @@
+sys-libs/uclibc

diff --git a/tools-uclibc/portage.armv7a.vanilla/package.unmask b/tools-uclibc/portage.armv7a.vanilla/package.unmask
new file mode 100644
index 0000000..4ee0e51
--- /dev/null
+++ b/tools-uclibc/portage.armv7a.vanilla/package.unmask
@@ -0,0 +1 @@
+>sys-devel/binutils-config-4-r2

diff --git a/tools-uclibc/portage.armv7a.vanilla/package.use/uclibc b/tools-uclibc/portage.armv7a.vanilla/package.use/uclibc
deleted file mode 100644
index 0715d0b..0000000
--- a/tools-uclibc/portage.armv7a.vanilla/package.use/uclibc
+++ /dev/null
@@ -1 +0,0 @@
-sys-libs/uclibc -* savedconfig

diff --git a/tools-uclibc/portage.armv7a.vanilla/package.use/uclibc-ng b/tools-uclibc/portage.armv7a.vanilla/package.use/uclibc-ng
new file mode 100644
index 0000000..7d19d50
--- /dev/null
+++ b/tools-uclibc/portage.armv7a.vanilla/package.use/uclibc-ng
@@ -0,0 +1 @@
+sys-libs/uclibc-ng -* savedconfig

diff --git a/tools-uclibc/portage.armv7a.vanilla/savedconfig/sys-libs/uclibc b/tools-uclibc/portage.armv7a.vanilla/savedconfig/sys-libs/uclibc-ng
similarity index 88%
rename from tools-uclibc/portage.armv7a.vanilla/savedconfig/sys-libs/uclibc
rename to tools-uclibc/portage.armv7a.vanilla/savedconfig/sys-libs/uclibc-ng
index ff8e3e7..f88db57 100644
--- a/tools-uclibc/portage.armv7a.vanilla/savedconfig/sys-libs/uclibc
+++ b/tools-uclibc/portage.armv7a.vanilla/savedconfig/sys-libs/uclibc-ng
@@ -1,32 +1,30 @@
 #
-# Automatically generated make config: don't edit
-# Version: 0.9.33.2
-# Sat Jul 21 01:03:46 2012
+# Automatically generated file; DO NOT EDIT.
+# uClibc-ng 0.1.0.16 C Library Configuration
 #
 # TARGET_alpha is not set
+# TARGET_arc is not set
 TARGET_arm=y
 # TARGET_avr32 is not set
 # TARGET_bfin is not set
 # TARGET_c6x is not set
 # TARGET_cris is not set
-# TARGET_e1 is not set
 # TARGET_frv is not set
 # TARGET_h8300 is not set
 # TARGET_hppa is not set
 # TARGET_i386 is not set
-# TARGET_i960 is not set
 # TARGET_ia64 is not set
+# TARGET_lm32 is not set
 # TARGET_m68k is not set
+# TARGET_metag is not set
 # TARGET_microblaze is not set
 # TARGET_mips is not set
-# TARGET_nios is not set
+# TARGET_nds32 is not set
 # TARGET_nios2 is not set
+# TARGET_or1k 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_vax is not set
 # TARGET_x86_64 is not set
 # TARGET_xtensa is not set
 
@@ -36,13 +34,12 @@ TARGET_arm=y
 TARGET_ARCH="arm"
 FORCE_OPTIONS_FOR_ARCH=y
 CONFIG_ARM_EABI=y
-# COMPILE_IN_THUMB_MODE is not set
-# USE_BX is not set
 TARGET_SUBARCH=""
 
 #
 # Using ELF file format
 #
+ARCH_HAS_DEPRECATED_SYSCALLS=y
 ARCH_ANY_ENDIAN=y
 ARCH_LITTLE_ENDIAN=y
 # ARCH_WANTS_BIG_ENDIAN is not set
@@ -61,6 +58,7 @@ HAVE_DOT_CONFIG=y
 # General Library Settings
 #
 DOPIC=y
+ARCH_HAS_UCONTEXT=y
 HAVE_SHARED=y
 FORCE_SHAREABLE_TEXT_SEGMENTS=y
 LDSO_LDD_SUPPORT=y
@@ -72,14 +70,14 @@ LDSO_STANDALONE_SUPPORT=y
 LDSO_PRELINK_SUPPORT=y
 UCLIBC_STATIC_LDCONFIG=y
 LDSO_RUNPATH=y
+LDSO_RUNPATH_OF_EXECUTABLE=y
+LDSO_SAFE_RUNPATH=y
 LDSO_SEARCH_INTERP_PATH=y
 LDSO_LD_LIBRARY_PATH=y
 # LDSO_NO_CLEANUP is not set
 UCLIBC_CTOR_DTOR=y
-# LDSO_GNU_HASH_SUPPORT is not set
+LDSO_GNU_HASH_SUPPORT=y
 # HAS_NO_THREADS is not set
-# LINUXTHREADS_OLD is not set
-# LINUXTHREADS_NEW is not set
 UCLIBC_HAS_THREADS_NATIVE=y
 UCLIBC_HAS_THREADS=y
 UCLIBC_HAS_TLS=y
@@ -90,9 +88,14 @@ UCLIBC_HAS_LFS=y
 # MALLOC_SIMPLE is not set
 MALLOC_STANDARD=y
 MALLOC_GLIBC_COMPAT=y
+UCLIBC_HAS_OBSTACK=y
 UCLIBC_DYNAMIC_ATEXIT=y
 COMPAT_ATEXIT=y
+UCLIBC_HAS_UTMPX=y
+UCLIBC_HAS_UTMP=y
+UCLIBC_SUSV2_LEGACY=y
 UCLIBC_SUSV3_LEGACY=y
+UCLIBC_HAS_CONTEXT_FUNCS=y
 UCLIBC_SUSV3_LEGACY_MACROS=y
 UCLIBC_SUSV4_LEGACY=y
 # UCLIBC_STRICT_HEADERS is not set
@@ -127,7 +130,7 @@ UCLIBC_LINUX_SPECIFIC=y
 UCLIBC_HAS_GNU_ERROR=y
 UCLIBC_BSD_SPECIFIC=y
 UCLIBC_HAS_BSD_ERR=y
-# UCLIBC_HAS_OBSOLETE_BSD_SIGNAL is not set
+UCLIBC_HAS_OBSOLETE_BSD_SIGNAL=y
 # UCLIBC_HAS_OBSOLETE_SYSV_SIGNAL is not set
 UCLIBC_NTP_LEGACY=y
 # UCLIBC_SV4_DEPRECATED is not set
@@ -135,7 +138,7 @@ UCLIBC_HAS_REALTIME=y
 UCLIBC_HAS_ADVANCED_REALTIME=y
 UCLIBC_HAS_EPOLL=y
 UCLIBC_HAS_XATTR=y
-# UCLIBC_HAS_PROFILING is not set
+UCLIBC_HAS_PROFILING=y
 UCLIBC_HAS_CRYPT_IMPL=y
 UCLIBC_HAS_SHA256_CRYPT_IMPL=y
 UCLIBC_HAS_SHA512_CRYPT_IMPL=y
@@ -161,6 +164,7 @@ UCLIBC_HAS_LIBNSL_STUB=y
 #
 UCLIBC_HAS_STRING_GENERIC_OPT=y
 UCLIBC_HAS_STRING_ARCH_OPT=y
+UCLIBC_HAS_STDIO_FUTEXES=y
 UCLIBC_HAS_CTYPE_TABLES=y
 UCLIBC_HAS_CTYPE_SIGNED=y
 # UCLIBC_HAS_CTYPE_UNSAFE is not set
@@ -171,8 +175,6 @@ UCLIBC_HAS_WCHAR=y
 UCLIBC_HAS_HEXADECIMAL_FLOATS=y
 UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
 UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
-UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y
-# 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
@@ -196,8 +198,9 @@ UCLIBC_HAS_SYS_ERRLIST=y
 UCLIBC_HAS_SIGNUM_MESSAGES=y
 UCLIBC_HAS_SYS_SIGLIST=y
 UCLIBC_HAS_GNU_GETOPT=y
-UCLIBC_HAS_STDIO_FUTEXES=y
+UCLIBC_HAS_GETOPT_LONG=y
 UCLIBC_HAS_GNU_GETSUBOPT=y
+# UCLIBC_HAS_ARGP is not set
 
 #
 # Big and Tall
@@ -212,7 +215,6 @@ UCLIBC_HAS_FTW=y
 UCLIBC_HAS_FTS=y
 UCLIBC_HAS_GLOB=y
 UCLIBC_HAS_GNU_GLOB=y
-UCLIBC_HAS_UTMPX=y
 
 #
 # Library Installation Options
@@ -227,11 +229,9 @@ HARDWIRED_ABSPATH=y
 #
 UCLIBC_BUILD_PIE=y
 UCLIBC_HAS_ARC4RANDOM=y
+# ARC4RANDOM_USES_NODEV is not set
 UCLIBC_HAS_SSP=y
-# UCLIBC_HAS_SSP_COMPAT is not set
 # SSP_QUICK_CANARY is not set
-# PROPOLICE_BLOCK_ABRT is not set
-PROPOLICE_BLOCK_SEGV=y
 UCLIBC_BUILD_SSP=y
 UCLIBC_BUILD_RELRO=y
 UCLIBC_BUILD_NOW=y
@@ -241,7 +241,7 @@ UCLIBC_BUILD_NOEXECSTACK=y
 # Development/debugging options
 #
 CROSS_COMPILER_PREFIX=""
-UCLIBC_EXTRA_CFLAGS=""
+UCLIBC_EXTRA_CFLAGS="-fno-stack-check"
 # DODEBUG is not set
 DOSTRIP=y
 # DOASSERTS is not set
@@ -252,4 +252,3 @@ UCLIBC_HAS_BACKTRACE=y
 WARNINGS="-Wall"
 # EXTRA_WARNINGS is not set
 # DOMULTI is not set
-# UCLIBC_MJN3_ONLY is not set

diff --git a/tools-uclibc/portage.i686.hardened/env/perl.conf b/tools-uclibc/portage.i686.hardened/env/dev-lang_perl_0
similarity index 100%
rename from tools-uclibc/portage.i686.hardened/env/perl.conf
rename to tools-uclibc/portage.i686.hardened/env/dev-lang_perl_0

diff --git a/tools-uclibc/portage.i686.hardened/env/net-misc_iputils_0 b/tools-uclibc/portage.i686.hardened/env/net-misc_iputils_0
new file mode 100644
index 0000000..1e8c846
--- /dev/null
+++ b/tools-uclibc/portage.i686.hardened/env/net-misc_iputils_0
@@ -0,0 +1 @@
+LDFLAGS=-lm

diff --git a/tools-uclibc/portage.i686.hardened/package.env b/tools-uclibc/portage.i686.hardened/package.env
index 0fc1e42..1dfa69a 100644
--- a/tools-uclibc/portage.i686.hardened/package.env
+++ b/tools-uclibc/portage.i686.hardened/package.env
@@ -1 +1,2 @@
-dev-lang/perl perl.conf
+dev-lang/perl dev-lang_perl_0
+net-misc/iputils net-misc_iputils_0

diff --git a/tools-uclibc/portage.i686.hardened/package.mask b/tools-uclibc/portage.i686.hardened/package.mask
new file mode 100644
index 0000000..5eceab2
--- /dev/null
+++ b/tools-uclibc/portage.i686.hardened/package.mask
@@ -0,0 +1 @@
+sys-libs/uclibc

diff --git a/tools-uclibc/portage.i686.hardened/package.unmask b/tools-uclibc/portage.i686.hardened/package.unmask
new file mode 100644
index 0000000..4ee0e51
--- /dev/null
+++ b/tools-uclibc/portage.i686.hardened/package.unmask
@@ -0,0 +1 @@
+>sys-devel/binutils-config-4-r2

diff --git a/tools-uclibc/portage.i686.hardened/package.use/uclibc b/tools-uclibc/portage.i686.hardened/package.use/uclibc
deleted file mode 100644
index 0715d0b..0000000
--- a/tools-uclibc/portage.i686.hardened/package.use/uclibc
+++ /dev/null
@@ -1 +0,0 @@
-sys-libs/uclibc -* savedconfig

diff --git a/tools-uclibc/portage.i686.hardened/package.use/uclibc-ng b/tools-uclibc/portage.i686.hardened/package.use/uclibc-ng
new file mode 100644
index 0000000..7d19d50
--- /dev/null
+++ b/tools-uclibc/portage.i686.hardened/package.use/uclibc-ng
@@ -0,0 +1 @@
+sys-libs/uclibc-ng -* savedconfig

diff --git a/tools-uclibc/portage.i686.hardened/savedconfig/sys-libs/uclibc b/tools-uclibc/portage.i686.hardened/savedconfig/sys-libs/uclibc
deleted file mode 100644
index dfc0831..0000000
--- a/tools-uclibc/portage.i686.hardened/savedconfig/sys-libs/uclibc
+++ /dev/null
@@ -1,271 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Version: 0.9.33
-# Sun Jun 10 08:56:18 2012
-#
-# TARGET_alpha is not set
-# TARGET_arm is not set
-# TARGET_avr32 is not set
-# TARGET_bfin is not set
-# TARGET_c6x is not set
-# TARGET_cris is not set
-# TARGET_e1 is not set
-# TARGET_frv is not set
-# TARGET_h8300 is not set
-# TARGET_hppa is not set
-TARGET_i386=y
-# TARGET_i960 is not set
-# TARGET_ia64 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_vax is not set
-# TARGET_x86_64 is not set
-# TARGET_xtensa is not set
-
-#
-# Target Architecture Features and Options
-#
-TARGET_ARCH="i386"
-FORCE_OPTIONS_FOR_ARCH=y
-# CONFIG_GENERIC_386 is not set
-# CONFIG_386 is not set
-# CONFIG_486 is not set
-# CONFIG_586 is not set
-# CONFIG_586MMX is not set
-CONFIG_686=y
-# 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
-TARGET_SUBARCH="i686"
-
-#
-# Using ELF file format
-#
-ARCH_LITTLE_ENDIAN=y
-
-#
-# Using Little Endian
-#
-ARCH_HAS_MMU=y
-ARCH_USE_MMU=y
-UCLIBC_HAS_FLOATS=y
-UCLIBC_HAS_FPU=y
-DO_C99_MATH=y
-DO_XSI_MATH=y
-UCLIBC_HAS_FENV=y
-UCLIBC_HAS_LONG_DOUBLE_MATH=y
-KERNEL_HEADERS="/usr/include"
-HAVE_DOT_CONFIG=y
-
-#
-# General Library Settings
-#
-DOPIC=y
-HAVE_SHARED=y
-FORCE_SHAREABLE_TEXT_SEGMENTS=y
-LDSO_LDD_SUPPORT=y
-LDSO_CACHE_SUPPORT=y
-LDSO_PRELOAD_ENV_SUPPORT=y
-LDSO_PRELOAD_FILE_SUPPORT=y
-LDSO_BASE_FILENAME="ld.so"
-LDSO_STANDALONE_SUPPORT=y
-LDSO_PRELINK_SUPPORT=y
-UCLIBC_STATIC_LDCONFIG=y
-LDSO_RUNPATH=y
-LDSO_SEARCH_INTERP_PATH=y
-LDSO_LD_LIBRARY_PATH=y
-# LDSO_NO_CLEANUP is not set
-UCLIBC_CTOR_DTOR=y
-LDSO_GNU_HASH_SUPPORT=y
-# HAS_NO_THREADS is not set
-# LINUXTHREADS_OLD is not set
-# LINUXTHREADS_NEW is not set
-UCLIBC_HAS_THREADS_NATIVE=y
-UCLIBC_HAS_THREADS=y
-UCLIBC_HAS_TLS=y
-PTHREADS_DEBUG_SUPPORT=y
-UCLIBC_HAS_SYSLOG=y
-UCLIBC_HAS_LFS=y
-# MALLOC is not set
-# MALLOC_SIMPLE is not set
-MALLOC_STANDARD=y
-MALLOC_GLIBC_COMPAT=y
-UCLIBC_DYNAMIC_ATEXIT=y
-COMPAT_ATEXIT=y
-UCLIBC_SUSV3_LEGACY=y
-UCLIBC_SUSV3_LEGACY_MACROS=y
-UCLIBC_SUSV4_LEGACY=y
-# UCLIBC_STRICT_HEADERS is not set
-UCLIBC_HAS_STUBS=y
-UCLIBC_HAS_SHADOW=y
-UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y
-UCLIBC_HAS___PROGNAME=y
-UCLIBC_HAS_PTY=y
-ASSUME_DEVPTS=y
-UNIX98PTY_ONLY=y
-UCLIBC_HAS_GETPT=y
-UCLIBC_HAS_LIBUTIL=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"
-UCLIBC_FALLBACK_TO_ETC_LOCALTIME=y
-
-#
-# Advanced Library Settings
-#
-UCLIBC_PWD_BUFFER_SIZE=256
-UCLIBC_GRP_BUFFER_SIZE=256
-
-#
-# Support various families of functions
-#
-UCLIBC_LINUX_MODULE_26=y
-# UCLIBC_LINUX_MODULE_24 is not set
-UCLIBC_LINUX_SPECIFIC=y
-UCLIBC_HAS_GNU_ERROR=y
-UCLIBC_BSD_SPECIFIC=y
-UCLIBC_HAS_BSD_ERR=y
-# UCLIBC_HAS_OBSOLETE_BSD_SIGNAL is not set
-# UCLIBC_HAS_OBSOLETE_SYSV_SIGNAL is not set
-UCLIBC_NTP_LEGACY=y
-# UCLIBC_SV4_DEPRECATED is not set
-UCLIBC_HAS_REALTIME=y
-UCLIBC_HAS_ADVANCED_REALTIME=y
-UCLIBC_HAS_EPOLL=y
-UCLIBC_HAS_XATTR=y
-# UCLIBC_HAS_PROFILING is not set
-UCLIBC_HAS_CRYPT_IMPL=y
-UCLIBC_HAS_SHA256_CRYPT_IMPL=y
-UCLIBC_HAS_SHA512_CRYPT_IMPL=y
-UCLIBC_HAS_CRYPT=y
-UCLIBC_HAS_NETWORK_SUPPORT=y
-UCLIBC_HAS_SOCKET=y
-UCLIBC_HAS_IPV4=y
-UCLIBC_HAS_IPV6=y
-UCLIBC_HAS_RPC=y
-UCLIBC_HAS_FULL_RPC=y
-UCLIBC_HAS_REENTRANT_RPC=y
-UCLIBC_USE_NETLINK=y
-UCLIBC_SUPPORT_AI_ADDRCONFIG=y
-UCLIBC_HAS_BSD_RES_CLOSE=y
-UCLIBC_HAS_COMPAT_RES_STATE=y
-UCLIBC_HAS_EXTRA_COMPAT_RES_STATE=y
-UCLIBC_HAS_RESOLVER_SUPPORT=y
-UCLIBC_HAS_LIBRESOLV_STUB=y
-UCLIBC_HAS_LIBNSL_STUB=y
-
-#
-# 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 is not set
-UCLIBC_HAS_CTYPE_CHECKED=y
-# UCLIBC_HAS_CTYPE_ENFORCED is not set
-UCLIBC_HAS_WCHAR=y
-# UCLIBC_HAS_LOCALE is not set
-UCLIBC_HAS_HEXADECIMAL_FLOATS=y
-UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
-UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
-UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y
-# 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=y
-UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y
-UCLIBC_HAS_FOPEN_CLOSEEXEC_MODE=y
-UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y
-UCLIBC_HAS_PRINTF_M_SPEC=y
-UCLIBC_HAS_ERRNO_MESSAGES=y
-UCLIBC_HAS_SYS_ERRLIST=y
-UCLIBC_HAS_SIGNUM_MESSAGES=y
-UCLIBC_HAS_SYS_SIGLIST=y
-UCLIBC_HAS_GNU_GETOPT=y
-UCLIBC_HAS_STDIO_FUTEXES=y
-UCLIBC_HAS_GNU_GETSUBOPT=y
-
-#
-# Big and Tall
-#
-UCLIBC_HAS_REGEX=y
-UCLIBC_HAS_REGEX_OLD=y
-UCLIBC_HAS_FNMATCH=y
-UCLIBC_HAS_FNMATCH_OLD=y
-UCLIBC_HAS_WORDEXP=y
-UCLIBC_HAS_NFTW=y
-UCLIBC_HAS_FTW=y
-UCLIBC_HAS_FTS=y
-UCLIBC_HAS_GLOB=y
-UCLIBC_HAS_GNU_GLOB=y
-UCLIBC_HAS_UTMPX=y
-
-#
-# Library Installation Options
-#
-RUNTIME_PREFIX="/"
-DEVEL_PREFIX="/usr"
-MULTILIB_DIR="lib"
-HARDWIRED_ABSPATH=y
-
-#
-# Security options
-#
-UCLIBC_BUILD_PIE=y
-UCLIBC_HAS_ARC4RANDOM=y
-UCLIBC_HAS_SSP=y
-# UCLIBC_HAS_SSP_COMPAT is not set
-# SSP_QUICK_CANARY is not set
-# PROPOLICE_BLOCK_ABRT is not set
-PROPOLICE_BLOCK_SEGV=y
-UCLIBC_BUILD_SSP=y
-UCLIBC_BUILD_RELRO=y
-UCLIBC_BUILD_NOW=y
-UCLIBC_BUILD_NOEXECSTACK=y
-
-#
-# Development/debugging options
-#
-CROSS_COMPILER_PREFIX=""
-UCLIBC_EXTRA_CFLAGS=""
-# DODEBUG is not set
-DOSTRIP=y
-# DOASSERTS is not set
-# SUPPORT_LD_DEBUG is not set
-# SUPPORT_LD_DEBUG_EARLY is not set
-# UCLIBC_MALLOC_DEBUGGING is not set
-UCLIBC_HAS_BACKTRACE=y
-WARNINGS="-Wall"
-# EXTRA_WARNINGS is not set
-# DOMULTI is not set
-# UCLIBC_MJN3_ONLY is not set

diff --git a/tools-uclibc/portage.amd64.hardened/savedconfig/sys-libs/uclibc b/tools-uclibc/portage.i686.hardened/savedconfig/sys-libs/uclibc-ng
similarity index 87%
copy from tools-uclibc/portage.amd64.hardened/savedconfig/sys-libs/uclibc
copy to tools-uclibc/portage.i686.hardened/savedconfig/sys-libs/uclibc-ng
index bf8d8e8..100d234 100644
--- a/tools-uclibc/portage.amd64.hardened/savedconfig/sys-libs/uclibc
+++ b/tools-uclibc/portage.i686.hardened/savedconfig/sys-libs/uclibc-ng
@@ -1,45 +1,48 @@
 #
-# Automatically generated make config: don't edit
-# Version: 0.9.33.2
-# Tue Oct 16 14:29:56 2012
+# Automatically generated file; DO NOT EDIT.
+# uClibc-ng 0.1.0.16 C Library Configuration
 #
 # TARGET_alpha is not set
+# TARGET_arc is not set
 # TARGET_arm is not set
 # TARGET_avr32 is not set
 # TARGET_bfin is not set
 # TARGET_c6x is not set
 # TARGET_cris is not set
-# TARGET_e1 is not set
 # TARGET_frv is not set
 # TARGET_h8300 is not set
 # TARGET_hppa is not set
-# TARGET_i386 is not set
-# TARGET_i960 is not set
+TARGET_i386=y
 # TARGET_ia64 is not set
+# TARGET_lm32 is not set
 # TARGET_m68k is not set
+# TARGET_metag is not set
 # TARGET_microblaze is not set
 # TARGET_mips is not set
-# TARGET_nios is not set
+# TARGET_nds32 is not set
 # TARGET_nios2 is not set
+# TARGET_or1k 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_vax is not set
-TARGET_x86_64=y
+# TARGET_x86_64 is not set
 # TARGET_xtensa is not set
 
 #
 # Target Architecture Features and Options
 #
-TARGET_ARCH="x86_64"
+TARGET_ARCH="i386"
 FORCE_OPTIONS_FOR_ARCH=y
-TARGET_SUBARCH=""
+# CONFIG_386 is not set
+# CONFIG_486 is not set
+# CONFIG_586 is not set
+CONFIG_686=y
+TARGET_SUBARCH="i686"
 
 #
 # Using ELF file format
 #
+ARCH_HAS_DEPRECATED_SYSCALLS=y
 ARCH_LITTLE_ENDIAN=y
 
 #
@@ -60,6 +63,7 @@ HAVE_DOT_CONFIG=y
 # General Library Settings
 #
 DOPIC=y
+ARCH_HAS_UCONTEXT=y
 HAVE_SHARED=y
 FORCE_SHAREABLE_TEXT_SEGMENTS=y
 LDSO_LDD_SUPPORT=y
@@ -71,14 +75,14 @@ LDSO_STANDALONE_SUPPORT=y
 LDSO_PRELINK_SUPPORT=y
 UCLIBC_STATIC_LDCONFIG=y
 LDSO_RUNPATH=y
+LDSO_RUNPATH_OF_EXECUTABLE=y
+LDSO_SAFE_RUNPATH=y
 LDSO_SEARCH_INTERP_PATH=y
 LDSO_LD_LIBRARY_PATH=y
 # LDSO_NO_CLEANUP is not set
 UCLIBC_CTOR_DTOR=y
 LDSO_GNU_HASH_SUPPORT=y
 # HAS_NO_THREADS is not set
-# LINUXTHREADS_OLD is not set
-# LINUXTHREADS_NEW is not set
 UCLIBC_HAS_THREADS_NATIVE=y
 UCLIBC_HAS_THREADS=y
 UCLIBC_HAS_TLS=y
@@ -89,9 +93,14 @@ UCLIBC_HAS_LFS=y
 # MALLOC_SIMPLE is not set
 MALLOC_STANDARD=y
 MALLOC_GLIBC_COMPAT=y
+UCLIBC_HAS_OBSTACK=y
 UCLIBC_DYNAMIC_ATEXIT=y
 COMPAT_ATEXIT=y
+UCLIBC_HAS_UTMPX=y
+UCLIBC_HAS_UTMP=y
+UCLIBC_SUSV2_LEGACY=y
 UCLIBC_SUSV3_LEGACY=y
+UCLIBC_HAS_CONTEXT_FUNCS=y
 UCLIBC_SUSV3_LEGACY_MACROS=y
 UCLIBC_SUSV4_LEGACY=y
 # UCLIBC_STRICT_HEADERS is not set
@@ -126,7 +135,7 @@ UCLIBC_LINUX_SPECIFIC=y
 UCLIBC_HAS_GNU_ERROR=y
 UCLIBC_BSD_SPECIFIC=y
 UCLIBC_HAS_BSD_ERR=y
-# UCLIBC_HAS_OBSOLETE_BSD_SIGNAL is not set
+UCLIBC_HAS_OBSOLETE_BSD_SIGNAL=y
 # UCLIBC_HAS_OBSOLETE_SYSV_SIGNAL is not set
 UCLIBC_NTP_LEGACY=y
 # UCLIBC_SV4_DEPRECATED is not set
@@ -134,7 +143,7 @@ UCLIBC_HAS_REALTIME=y
 UCLIBC_HAS_ADVANCED_REALTIME=y
 UCLIBC_HAS_EPOLL=y
 UCLIBC_HAS_XATTR=y
-# UCLIBC_HAS_PROFILING is not set
+UCLIBC_HAS_PROFILING=y
 UCLIBC_HAS_CRYPT_IMPL=y
 UCLIBC_HAS_SHA256_CRYPT_IMPL=y
 UCLIBC_HAS_SHA512_CRYPT_IMPL=y
@@ -160,6 +169,7 @@ UCLIBC_HAS_LIBNSL_STUB=y
 #
 UCLIBC_HAS_STRING_GENERIC_OPT=y
 UCLIBC_HAS_STRING_ARCH_OPT=y
+UCLIBC_HAS_STDIO_FUTEXES=y
 UCLIBC_HAS_CTYPE_TABLES=y
 UCLIBC_HAS_CTYPE_SIGNED=y
 # UCLIBC_HAS_CTYPE_UNSAFE is not set
@@ -170,8 +180,6 @@ UCLIBC_HAS_WCHAR=y
 UCLIBC_HAS_HEXADECIMAL_FLOATS=y
 UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
 UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
-UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y
-# 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
@@ -195,8 +203,9 @@ UCLIBC_HAS_SYS_ERRLIST=y
 UCLIBC_HAS_SIGNUM_MESSAGES=y
 UCLIBC_HAS_SYS_SIGLIST=y
 UCLIBC_HAS_GNU_GETOPT=y
-UCLIBC_HAS_STDIO_FUTEXES=y
+UCLIBC_HAS_GETOPT_LONG=y
 UCLIBC_HAS_GNU_GETSUBOPT=y
+# UCLIBC_HAS_ARGP is not set
 
 #
 # Big and Tall
@@ -211,7 +220,6 @@ UCLIBC_HAS_FTW=y
 UCLIBC_HAS_FTS=y
 UCLIBC_HAS_GLOB=y
 UCLIBC_HAS_GNU_GLOB=y
-UCLIBC_HAS_UTMPX=y
 
 #
 # Library Installation Options
@@ -224,12 +232,11 @@ HARDWIRED_ABSPATH=y
 #
 # Security options
 #
+UCLIBC_BUILD_PIE=y
 UCLIBC_HAS_ARC4RANDOM=y
+# ARC4RANDOM_USES_NODEV is not set
 UCLIBC_HAS_SSP=y
-# UCLIBC_HAS_SSP_COMPAT is not set
 # SSP_QUICK_CANARY is not set
-# PROPOLICE_BLOCK_ABRT is not set
-PROPOLICE_BLOCK_SEGV=y
 UCLIBC_BUILD_SSP=y
 UCLIBC_BUILD_RELRO=y
 UCLIBC_BUILD_NOW=y
@@ -250,4 +257,3 @@ UCLIBC_HAS_BACKTRACE=y
 WARNINGS="-Wall"
 # EXTRA_WARNINGS is not set
 # DOMULTI is not set
-# UCLIBC_MJN3_ONLY is not set

diff --git a/tools-uclibc/portage.i686.vanilla/env/net-misc_iputils_0 b/tools-uclibc/portage.i686.vanilla/env/net-misc_iputils_0
new file mode 100644
index 0000000..1e8c846
--- /dev/null
+++ b/tools-uclibc/portage.i686.vanilla/env/net-misc_iputils_0
@@ -0,0 +1 @@
+LDFLAGS=-lm

diff --git a/tools-uclibc/portage.i686.vanilla/package.accept_keywords b/tools-uclibc/portage.i686.vanilla/package.accept_keywords
new file mode 100644
index 0000000..e44f7f0
--- /dev/null
+++ b/tools-uclibc/portage.i686.vanilla/package.accept_keywords
@@ -0,0 +1 @@
+=sys-devel/gcc-config-1.8-r1 ~x86

diff --git a/tools-uclibc/portage.i686.vanilla/package.env b/tools-uclibc/portage.i686.vanilla/package.env
new file mode 100644
index 0000000..dd59e5f
--- /dev/null
+++ b/tools-uclibc/portage.i686.vanilla/package.env
@@ -0,0 +1 @@
+net-misc/iputils net-misc_iputils_0

diff --git a/tools-uclibc/portage.i686.vanilla/package.mask b/tools-uclibc/portage.i686.vanilla/package.mask
new file mode 100644
index 0000000..5eceab2
--- /dev/null
+++ b/tools-uclibc/portage.i686.vanilla/package.mask
@@ -0,0 +1 @@
+sys-libs/uclibc

diff --git a/tools-uclibc/portage.i686.vanilla/package.unmask b/tools-uclibc/portage.i686.vanilla/package.unmask
new file mode 100644
index 0000000..4ee0e51
--- /dev/null
+++ b/tools-uclibc/portage.i686.vanilla/package.unmask
@@ -0,0 +1 @@
+>sys-devel/binutils-config-4-r2

diff --git a/tools-uclibc/portage.i686.vanilla/package.use/uclibc b/tools-uclibc/portage.i686.vanilla/package.use/uclibc
deleted file mode 100644
index 0715d0b..0000000
--- a/tools-uclibc/portage.i686.vanilla/package.use/uclibc
+++ /dev/null
@@ -1 +0,0 @@
-sys-libs/uclibc -* savedconfig

diff --git a/tools-uclibc/portage.i686.vanilla/package.use/uclibc-ng b/tools-uclibc/portage.i686.vanilla/package.use/uclibc-ng
new file mode 100644
index 0000000..7d19d50
--- /dev/null
+++ b/tools-uclibc/portage.i686.vanilla/package.use/uclibc-ng
@@ -0,0 +1 @@
+sys-libs/uclibc-ng -* savedconfig

diff --git a/tools-uclibc/portage.i686.vanilla/savedconfig/sys-libs/uclibc b/tools-uclibc/portage.i686.vanilla/savedconfig/sys-libs/uclibc
deleted file mode 100644
index dfc0831..0000000
--- a/tools-uclibc/portage.i686.vanilla/savedconfig/sys-libs/uclibc
+++ /dev/null
@@ -1,271 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Version: 0.9.33
-# Sun Jun 10 08:56:18 2012
-#
-# TARGET_alpha is not set
-# TARGET_arm is not set
-# TARGET_avr32 is not set
-# TARGET_bfin is not set
-# TARGET_c6x is not set
-# TARGET_cris is not set
-# TARGET_e1 is not set
-# TARGET_frv is not set
-# TARGET_h8300 is not set
-# TARGET_hppa is not set
-TARGET_i386=y
-# TARGET_i960 is not set
-# TARGET_ia64 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_vax is not set
-# TARGET_x86_64 is not set
-# TARGET_xtensa is not set
-
-#
-# Target Architecture Features and Options
-#
-TARGET_ARCH="i386"
-FORCE_OPTIONS_FOR_ARCH=y
-# CONFIG_GENERIC_386 is not set
-# CONFIG_386 is not set
-# CONFIG_486 is not set
-# CONFIG_586 is not set
-# CONFIG_586MMX is not set
-CONFIG_686=y
-# 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
-TARGET_SUBARCH="i686"
-
-#
-# Using ELF file format
-#
-ARCH_LITTLE_ENDIAN=y
-
-#
-# Using Little Endian
-#
-ARCH_HAS_MMU=y
-ARCH_USE_MMU=y
-UCLIBC_HAS_FLOATS=y
-UCLIBC_HAS_FPU=y
-DO_C99_MATH=y
-DO_XSI_MATH=y
-UCLIBC_HAS_FENV=y
-UCLIBC_HAS_LONG_DOUBLE_MATH=y
-KERNEL_HEADERS="/usr/include"
-HAVE_DOT_CONFIG=y
-
-#
-# General Library Settings
-#
-DOPIC=y
-HAVE_SHARED=y
-FORCE_SHAREABLE_TEXT_SEGMENTS=y
-LDSO_LDD_SUPPORT=y
-LDSO_CACHE_SUPPORT=y
-LDSO_PRELOAD_ENV_SUPPORT=y
-LDSO_PRELOAD_FILE_SUPPORT=y
-LDSO_BASE_FILENAME="ld.so"
-LDSO_STANDALONE_SUPPORT=y
-LDSO_PRELINK_SUPPORT=y
-UCLIBC_STATIC_LDCONFIG=y
-LDSO_RUNPATH=y
-LDSO_SEARCH_INTERP_PATH=y
-LDSO_LD_LIBRARY_PATH=y
-# LDSO_NO_CLEANUP is not set
-UCLIBC_CTOR_DTOR=y
-LDSO_GNU_HASH_SUPPORT=y
-# HAS_NO_THREADS is not set
-# LINUXTHREADS_OLD is not set
-# LINUXTHREADS_NEW is not set
-UCLIBC_HAS_THREADS_NATIVE=y
-UCLIBC_HAS_THREADS=y
-UCLIBC_HAS_TLS=y
-PTHREADS_DEBUG_SUPPORT=y
-UCLIBC_HAS_SYSLOG=y
-UCLIBC_HAS_LFS=y
-# MALLOC is not set
-# MALLOC_SIMPLE is not set
-MALLOC_STANDARD=y
-MALLOC_GLIBC_COMPAT=y
-UCLIBC_DYNAMIC_ATEXIT=y
-COMPAT_ATEXIT=y
-UCLIBC_SUSV3_LEGACY=y
-UCLIBC_SUSV3_LEGACY_MACROS=y
-UCLIBC_SUSV4_LEGACY=y
-# UCLIBC_STRICT_HEADERS is not set
-UCLIBC_HAS_STUBS=y
-UCLIBC_HAS_SHADOW=y
-UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y
-UCLIBC_HAS___PROGNAME=y
-UCLIBC_HAS_PTY=y
-ASSUME_DEVPTS=y
-UNIX98PTY_ONLY=y
-UCLIBC_HAS_GETPT=y
-UCLIBC_HAS_LIBUTIL=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"
-UCLIBC_FALLBACK_TO_ETC_LOCALTIME=y
-
-#
-# Advanced Library Settings
-#
-UCLIBC_PWD_BUFFER_SIZE=256
-UCLIBC_GRP_BUFFER_SIZE=256
-
-#
-# Support various families of functions
-#
-UCLIBC_LINUX_MODULE_26=y
-# UCLIBC_LINUX_MODULE_24 is not set
-UCLIBC_LINUX_SPECIFIC=y
-UCLIBC_HAS_GNU_ERROR=y
-UCLIBC_BSD_SPECIFIC=y
-UCLIBC_HAS_BSD_ERR=y
-# UCLIBC_HAS_OBSOLETE_BSD_SIGNAL is not set
-# UCLIBC_HAS_OBSOLETE_SYSV_SIGNAL is not set
-UCLIBC_NTP_LEGACY=y
-# UCLIBC_SV4_DEPRECATED is not set
-UCLIBC_HAS_REALTIME=y
-UCLIBC_HAS_ADVANCED_REALTIME=y
-UCLIBC_HAS_EPOLL=y
-UCLIBC_HAS_XATTR=y
-# UCLIBC_HAS_PROFILING is not set
-UCLIBC_HAS_CRYPT_IMPL=y
-UCLIBC_HAS_SHA256_CRYPT_IMPL=y
-UCLIBC_HAS_SHA512_CRYPT_IMPL=y
-UCLIBC_HAS_CRYPT=y
-UCLIBC_HAS_NETWORK_SUPPORT=y
-UCLIBC_HAS_SOCKET=y
-UCLIBC_HAS_IPV4=y
-UCLIBC_HAS_IPV6=y
-UCLIBC_HAS_RPC=y
-UCLIBC_HAS_FULL_RPC=y
-UCLIBC_HAS_REENTRANT_RPC=y
-UCLIBC_USE_NETLINK=y
-UCLIBC_SUPPORT_AI_ADDRCONFIG=y
-UCLIBC_HAS_BSD_RES_CLOSE=y
-UCLIBC_HAS_COMPAT_RES_STATE=y
-UCLIBC_HAS_EXTRA_COMPAT_RES_STATE=y
-UCLIBC_HAS_RESOLVER_SUPPORT=y
-UCLIBC_HAS_LIBRESOLV_STUB=y
-UCLIBC_HAS_LIBNSL_STUB=y
-
-#
-# 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 is not set
-UCLIBC_HAS_CTYPE_CHECKED=y
-# UCLIBC_HAS_CTYPE_ENFORCED is not set
-UCLIBC_HAS_WCHAR=y
-# UCLIBC_HAS_LOCALE is not set
-UCLIBC_HAS_HEXADECIMAL_FLOATS=y
-UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
-UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
-UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y
-# 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=y
-UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y
-UCLIBC_HAS_FOPEN_CLOSEEXEC_MODE=y
-UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y
-UCLIBC_HAS_PRINTF_M_SPEC=y
-UCLIBC_HAS_ERRNO_MESSAGES=y
-UCLIBC_HAS_SYS_ERRLIST=y
-UCLIBC_HAS_SIGNUM_MESSAGES=y
-UCLIBC_HAS_SYS_SIGLIST=y
-UCLIBC_HAS_GNU_GETOPT=y
-UCLIBC_HAS_STDIO_FUTEXES=y
-UCLIBC_HAS_GNU_GETSUBOPT=y
-
-#
-# Big and Tall
-#
-UCLIBC_HAS_REGEX=y
-UCLIBC_HAS_REGEX_OLD=y
-UCLIBC_HAS_FNMATCH=y
-UCLIBC_HAS_FNMATCH_OLD=y
-UCLIBC_HAS_WORDEXP=y
-UCLIBC_HAS_NFTW=y
-UCLIBC_HAS_FTW=y
-UCLIBC_HAS_FTS=y
-UCLIBC_HAS_GLOB=y
-UCLIBC_HAS_GNU_GLOB=y
-UCLIBC_HAS_UTMPX=y
-
-#
-# Library Installation Options
-#
-RUNTIME_PREFIX="/"
-DEVEL_PREFIX="/usr"
-MULTILIB_DIR="lib"
-HARDWIRED_ABSPATH=y
-
-#
-# Security options
-#
-UCLIBC_BUILD_PIE=y
-UCLIBC_HAS_ARC4RANDOM=y
-UCLIBC_HAS_SSP=y
-# UCLIBC_HAS_SSP_COMPAT is not set
-# SSP_QUICK_CANARY is not set
-# PROPOLICE_BLOCK_ABRT is not set
-PROPOLICE_BLOCK_SEGV=y
-UCLIBC_BUILD_SSP=y
-UCLIBC_BUILD_RELRO=y
-UCLIBC_BUILD_NOW=y
-UCLIBC_BUILD_NOEXECSTACK=y
-
-#
-# Development/debugging options
-#
-CROSS_COMPILER_PREFIX=""
-UCLIBC_EXTRA_CFLAGS=""
-# DODEBUG is not set
-DOSTRIP=y
-# DOASSERTS is not set
-# SUPPORT_LD_DEBUG is not set
-# SUPPORT_LD_DEBUG_EARLY is not set
-# UCLIBC_MALLOC_DEBUGGING is not set
-UCLIBC_HAS_BACKTRACE=y
-WARNINGS="-Wall"
-# EXTRA_WARNINGS is not set
-# DOMULTI is not set
-# UCLIBC_MJN3_ONLY is not set

diff --git a/tools-uclibc/portage.amd64.hardened/savedconfig/sys-libs/uclibc b/tools-uclibc/portage.i686.vanilla/savedconfig/sys-libs/uclibc-ng
similarity index 87%
rename from tools-uclibc/portage.amd64.hardened/savedconfig/sys-libs/uclibc
rename to tools-uclibc/portage.i686.vanilla/savedconfig/sys-libs/uclibc-ng
index bf8d8e8..100d234 100644
--- a/tools-uclibc/portage.amd64.hardened/savedconfig/sys-libs/uclibc
+++ b/tools-uclibc/portage.i686.vanilla/savedconfig/sys-libs/uclibc-ng
@@ -1,45 +1,48 @@
 #
-# Automatically generated make config: don't edit
-# Version: 0.9.33.2
-# Tue Oct 16 14:29:56 2012
+# Automatically generated file; DO NOT EDIT.
+# uClibc-ng 0.1.0.16 C Library Configuration
 #
 # TARGET_alpha is not set
+# TARGET_arc is not set
 # TARGET_arm is not set
 # TARGET_avr32 is not set
 # TARGET_bfin is not set
 # TARGET_c6x is not set
 # TARGET_cris is not set
-# TARGET_e1 is not set
 # TARGET_frv is not set
 # TARGET_h8300 is not set
 # TARGET_hppa is not set
-# TARGET_i386 is not set
-# TARGET_i960 is not set
+TARGET_i386=y
 # TARGET_ia64 is not set
+# TARGET_lm32 is not set
 # TARGET_m68k is not set
+# TARGET_metag is not set
 # TARGET_microblaze is not set
 # TARGET_mips is not set
-# TARGET_nios is not set
+# TARGET_nds32 is not set
 # TARGET_nios2 is not set
+# TARGET_or1k 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_vax is not set
-TARGET_x86_64=y
+# TARGET_x86_64 is not set
 # TARGET_xtensa is not set
 
 #
 # Target Architecture Features and Options
 #
-TARGET_ARCH="x86_64"
+TARGET_ARCH="i386"
 FORCE_OPTIONS_FOR_ARCH=y
-TARGET_SUBARCH=""
+# CONFIG_386 is not set
+# CONFIG_486 is not set
+# CONFIG_586 is not set
+CONFIG_686=y
+TARGET_SUBARCH="i686"
 
 #
 # Using ELF file format
 #
+ARCH_HAS_DEPRECATED_SYSCALLS=y
 ARCH_LITTLE_ENDIAN=y
 
 #
@@ -60,6 +63,7 @@ HAVE_DOT_CONFIG=y
 # General Library Settings
 #
 DOPIC=y
+ARCH_HAS_UCONTEXT=y
 HAVE_SHARED=y
 FORCE_SHAREABLE_TEXT_SEGMENTS=y
 LDSO_LDD_SUPPORT=y
@@ -71,14 +75,14 @@ LDSO_STANDALONE_SUPPORT=y
 LDSO_PRELINK_SUPPORT=y
 UCLIBC_STATIC_LDCONFIG=y
 LDSO_RUNPATH=y
+LDSO_RUNPATH_OF_EXECUTABLE=y
+LDSO_SAFE_RUNPATH=y
 LDSO_SEARCH_INTERP_PATH=y
 LDSO_LD_LIBRARY_PATH=y
 # LDSO_NO_CLEANUP is not set
 UCLIBC_CTOR_DTOR=y
 LDSO_GNU_HASH_SUPPORT=y
 # HAS_NO_THREADS is not set
-# LINUXTHREADS_OLD is not set
-# LINUXTHREADS_NEW is not set
 UCLIBC_HAS_THREADS_NATIVE=y
 UCLIBC_HAS_THREADS=y
 UCLIBC_HAS_TLS=y
@@ -89,9 +93,14 @@ UCLIBC_HAS_LFS=y
 # MALLOC_SIMPLE is not set
 MALLOC_STANDARD=y
 MALLOC_GLIBC_COMPAT=y
+UCLIBC_HAS_OBSTACK=y
 UCLIBC_DYNAMIC_ATEXIT=y
 COMPAT_ATEXIT=y
+UCLIBC_HAS_UTMPX=y
+UCLIBC_HAS_UTMP=y
+UCLIBC_SUSV2_LEGACY=y
 UCLIBC_SUSV3_LEGACY=y
+UCLIBC_HAS_CONTEXT_FUNCS=y
 UCLIBC_SUSV3_LEGACY_MACROS=y
 UCLIBC_SUSV4_LEGACY=y
 # UCLIBC_STRICT_HEADERS is not set
@@ -126,7 +135,7 @@ UCLIBC_LINUX_SPECIFIC=y
 UCLIBC_HAS_GNU_ERROR=y
 UCLIBC_BSD_SPECIFIC=y
 UCLIBC_HAS_BSD_ERR=y
-# UCLIBC_HAS_OBSOLETE_BSD_SIGNAL is not set
+UCLIBC_HAS_OBSOLETE_BSD_SIGNAL=y
 # UCLIBC_HAS_OBSOLETE_SYSV_SIGNAL is not set
 UCLIBC_NTP_LEGACY=y
 # UCLIBC_SV4_DEPRECATED is not set
@@ -134,7 +143,7 @@ UCLIBC_HAS_REALTIME=y
 UCLIBC_HAS_ADVANCED_REALTIME=y
 UCLIBC_HAS_EPOLL=y
 UCLIBC_HAS_XATTR=y
-# UCLIBC_HAS_PROFILING is not set
+UCLIBC_HAS_PROFILING=y
 UCLIBC_HAS_CRYPT_IMPL=y
 UCLIBC_HAS_SHA256_CRYPT_IMPL=y
 UCLIBC_HAS_SHA512_CRYPT_IMPL=y
@@ -160,6 +169,7 @@ UCLIBC_HAS_LIBNSL_STUB=y
 #
 UCLIBC_HAS_STRING_GENERIC_OPT=y
 UCLIBC_HAS_STRING_ARCH_OPT=y
+UCLIBC_HAS_STDIO_FUTEXES=y
 UCLIBC_HAS_CTYPE_TABLES=y
 UCLIBC_HAS_CTYPE_SIGNED=y
 # UCLIBC_HAS_CTYPE_UNSAFE is not set
@@ -170,8 +180,6 @@ UCLIBC_HAS_WCHAR=y
 UCLIBC_HAS_HEXADECIMAL_FLOATS=y
 UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
 UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
-UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y
-# 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
@@ -195,8 +203,9 @@ UCLIBC_HAS_SYS_ERRLIST=y
 UCLIBC_HAS_SIGNUM_MESSAGES=y
 UCLIBC_HAS_SYS_SIGLIST=y
 UCLIBC_HAS_GNU_GETOPT=y
-UCLIBC_HAS_STDIO_FUTEXES=y
+UCLIBC_HAS_GETOPT_LONG=y
 UCLIBC_HAS_GNU_GETSUBOPT=y
+# UCLIBC_HAS_ARGP is not set
 
 #
 # Big and Tall
@@ -211,7 +220,6 @@ UCLIBC_HAS_FTW=y
 UCLIBC_HAS_FTS=y
 UCLIBC_HAS_GLOB=y
 UCLIBC_HAS_GNU_GLOB=y
-UCLIBC_HAS_UTMPX=y
 
 #
 # Library Installation Options
@@ -224,12 +232,11 @@ HARDWIRED_ABSPATH=y
 #
 # Security options
 #
+UCLIBC_BUILD_PIE=y
 UCLIBC_HAS_ARC4RANDOM=y
+# ARC4RANDOM_USES_NODEV is not set
 UCLIBC_HAS_SSP=y
-# UCLIBC_HAS_SSP_COMPAT is not set
 # SSP_QUICK_CANARY is not set
-# PROPOLICE_BLOCK_ABRT is not set
-PROPOLICE_BLOCK_SEGV=y
 UCLIBC_BUILD_SSP=y
 UCLIBC_BUILD_RELRO=y
 UCLIBC_BUILD_NOW=y
@@ -250,4 +257,3 @@ UCLIBC_HAS_BACKTRACE=y
 WARNINGS="-Wall"
 # EXTRA_WARNINGS is not set
 # DOMULTI is not set
-# UCLIBC_MJN3_ONLY is not set

diff --git a/tools-uclibc/portage.mips32r2.hardened/env/net-misc_iputils_0 b/tools-uclibc/portage.mips32r2.hardened/env/net-misc_iputils_0
new file mode 100644
index 0000000..1e8c846
--- /dev/null
+++ b/tools-uclibc/portage.mips32r2.hardened/env/net-misc_iputils_0
@@ -0,0 +1 @@
+LDFLAGS=-lm

diff --git a/tools-uclibc/portage.mips32r2.hardened/package.env b/tools-uclibc/portage.mips32r2.hardened/package.env
new file mode 100644
index 0000000..dd59e5f
--- /dev/null
+++ b/tools-uclibc/portage.mips32r2.hardened/package.env
@@ -0,0 +1 @@
+net-misc/iputils net-misc_iputils_0

diff --git a/tools-uclibc/portage.mips32r2.hardened/package.mask b/tools-uclibc/portage.mips32r2.hardened/package.mask
new file mode 100644
index 0000000..5eceab2
--- /dev/null
+++ b/tools-uclibc/portage.mips32r2.hardened/package.mask
@@ -0,0 +1 @@
+sys-libs/uclibc

diff --git a/tools-uclibc/portage.mips32r2.hardened/package.unmask b/tools-uclibc/portage.mips32r2.hardened/package.unmask
new file mode 100644
index 0000000..4ee0e51
--- /dev/null
+++ b/tools-uclibc/portage.mips32r2.hardened/package.unmask
@@ -0,0 +1 @@
+>sys-devel/binutils-config-4-r2

diff --git a/tools-uclibc/portage.mips32r2.hardened/package.use/uclibc b/tools-uclibc/portage.mips32r2.hardened/package.use/uclibc
deleted file mode 100644
index 0715d0b..0000000
--- a/tools-uclibc/portage.mips32r2.hardened/package.use/uclibc
+++ /dev/null
@@ -1 +0,0 @@
-sys-libs/uclibc -* savedconfig

diff --git a/tools-uclibc/portage.mips32r2.hardened/package.use/uclibc-ng b/tools-uclibc/portage.mips32r2.hardened/package.use/uclibc-ng
new file mode 100644
index 0000000..7d19d50
--- /dev/null
+++ b/tools-uclibc/portage.mips32r2.hardened/package.use/uclibc-ng
@@ -0,0 +1 @@
+sys-libs/uclibc-ng -* savedconfig

diff --git a/tools-uclibc/portage.mips32r2.hardened/savedconfig/sys-libs/uclibc b/tools-uclibc/portage.mips32r2.hardened/savedconfig/sys-libs/uclibc-ng
similarity index 86%
rename from tools-uclibc/portage.mips32r2.hardened/savedconfig/sys-libs/uclibc
rename to tools-uclibc/portage.mips32r2.hardened/savedconfig/sys-libs/uclibc-ng
index 96682c9..4c3aeaf 100644
--- a/tools-uclibc/portage.mips32r2.hardened/savedconfig/sys-libs/uclibc
+++ b/tools-uclibc/portage.mips32r2.hardened/savedconfig/sys-libs/uclibc-ng
@@ -1,32 +1,30 @@
 #
-# Automatically generated make config: don't edit
-# Version: 0.9.33.2
-# Sun Oct 21 16:56:54 2012
+# Automatically generated file; DO NOT EDIT.
+# uClibc-ng 0.1.0.17 C Library Configuration
 #
 # TARGET_alpha is not set
+# TARGET_arc is not set
 # TARGET_arm is not set
 # TARGET_avr32 is not set
 # TARGET_bfin is not set
 # TARGET_c6x is not set
 # TARGET_cris is not set
-# TARGET_e1 is not set
 # TARGET_frv is not set
 # TARGET_h8300 is not set
 # TARGET_hppa is not set
 # TARGET_i386 is not set
-# TARGET_i960 is not set
 # TARGET_ia64 is not set
+# TARGET_lm32 is not set
 # TARGET_m68k is not set
+# TARGET_metag is not set
 # TARGET_microblaze is not set
 TARGET_mips=y
-# TARGET_nios is not set
+# TARGET_nds32 is not set
 # TARGET_nios2 is not set
+# TARGET_or1k 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_vax is not set
 # TARGET_x86_64 is not set
 # TARGET_xtensa is not set
 
@@ -38,18 +36,13 @@ FORCE_OPTIONS_FOR_ARCH=y
 CONFIG_MIPS_O32_ABI=y
 # CONFIG_MIPS_N32_ABI is not set
 # CONFIG_MIPS_N64_ABI is not set
-# CONFIG_MIPS_ISA_1 is not set
-# CONFIG_MIPS_ISA_2 is not set
-# CONFIG_MIPS_ISA_3 is not set
-# CONFIG_MIPS_ISA_4 is not set
-# CONFIG_MIPS_ISA_MIPS32 is not set
-CONFIG_MIPS_ISA_MIPS32R2=y
-# CONFIG_MIPS_ISA_MIPS64 is not set
+UCLIBC_USE_MIPS_PREFETCH=y
 TARGET_SUBARCH=""
 
 #
 # Using ELF file format
 #
+ARCH_HAS_DEPRECATED_SYSCALLS=y
 ARCH_ANY_ENDIAN=y
 ARCH_BIG_ENDIAN=y
 ARCH_WANTS_BIG_ENDIAN=y
@@ -68,6 +61,7 @@ HAVE_DOT_CONFIG=y
 # General Library Settings
 #
 DOPIC=y
+ARCH_HAS_UCONTEXT=y
 HAVE_SHARED=y
 FORCE_SHAREABLE_TEXT_SEGMENTS=y
 LDSO_LDD_SUPPORT=y
@@ -79,14 +73,14 @@ LDSO_STANDALONE_SUPPORT=y
 LDSO_PRELINK_SUPPORT=y
 UCLIBC_STATIC_LDCONFIG=y
 LDSO_RUNPATH=y
+LDSO_RUNPATH_OF_EXECUTABLE=y
+LDSO_SAFE_RUNPATH=y
 LDSO_SEARCH_INTERP_PATH=y
 LDSO_LD_LIBRARY_PATH=y
 # LDSO_NO_CLEANUP is not set
 UCLIBC_CTOR_DTOR=y
 # LDSO_GNU_HASH_SUPPORT is not set
 # HAS_NO_THREADS is not set
-# LINUXTHREADS_OLD is not set
-# LINUXTHREADS_NEW is not set
 UCLIBC_HAS_THREADS_NATIVE=y
 UCLIBC_HAS_THREADS=y
 UCLIBC_HAS_TLS=y
@@ -97,9 +91,14 @@ UCLIBC_HAS_LFS=y
 # MALLOC_SIMPLE is not set
 MALLOC_STANDARD=y
 MALLOC_GLIBC_COMPAT=y
+UCLIBC_HAS_OBSTACK=y
 UCLIBC_DYNAMIC_ATEXIT=y
 COMPAT_ATEXIT=y
+UCLIBC_HAS_UTMPX=y
+UCLIBC_HAS_UTMP=y
+UCLIBC_SUSV2_LEGACY=y
 UCLIBC_SUSV3_LEGACY=y
+UCLIBC_HAS_CONTEXT_FUNCS=y
 UCLIBC_SUSV3_LEGACY_MACROS=y
 UCLIBC_SUSV4_LEGACY=y
 # UCLIBC_STRICT_HEADERS is not set
@@ -134,7 +133,7 @@ UCLIBC_LINUX_SPECIFIC=y
 UCLIBC_HAS_GNU_ERROR=y
 UCLIBC_BSD_SPECIFIC=y
 UCLIBC_HAS_BSD_ERR=y
-# UCLIBC_HAS_OBSOLETE_BSD_SIGNAL is not set
+UCLIBC_HAS_OBSOLETE_BSD_SIGNAL=y
 # UCLIBC_HAS_OBSOLETE_SYSV_SIGNAL is not set
 UCLIBC_NTP_LEGACY=y
 # UCLIBC_SV4_DEPRECATED is not set
@@ -142,7 +141,7 @@ UCLIBC_HAS_REALTIME=y
 UCLIBC_HAS_ADVANCED_REALTIME=y
 UCLIBC_HAS_EPOLL=y
 UCLIBC_HAS_XATTR=y
-# UCLIBC_HAS_PROFILING is not set
+UCLIBC_HAS_PROFILING=y
 UCLIBC_HAS_CRYPT_IMPL=y
 UCLIBC_HAS_SHA256_CRYPT_IMPL=y
 UCLIBC_HAS_SHA512_CRYPT_IMPL=y
@@ -168,6 +167,7 @@ UCLIBC_HAS_LIBNSL_STUB=y
 #
 UCLIBC_HAS_STRING_GENERIC_OPT=y
 UCLIBC_HAS_STRING_ARCH_OPT=y
+UCLIBC_HAS_STDIO_FUTEXES=y
 UCLIBC_HAS_CTYPE_TABLES=y
 UCLIBC_HAS_CTYPE_SIGNED=y
 # UCLIBC_HAS_CTYPE_UNSAFE is not set
@@ -178,8 +178,6 @@ UCLIBC_HAS_WCHAR=y
 UCLIBC_HAS_HEXADECIMAL_FLOATS=y
 UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
 UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
-UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y
-# 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
@@ -203,8 +201,9 @@ UCLIBC_HAS_SYS_ERRLIST=y
 UCLIBC_HAS_SIGNUM_MESSAGES=y
 UCLIBC_HAS_SYS_SIGLIST=y
 UCLIBC_HAS_GNU_GETOPT=y
-UCLIBC_HAS_STDIO_FUTEXES=y
+UCLIBC_HAS_GETOPT_LONG=y
 UCLIBC_HAS_GNU_GETSUBOPT=y
+# UCLIBC_HAS_ARGP is not set
 
 #
 # Big and Tall
@@ -219,7 +218,6 @@ UCLIBC_HAS_FTW=y
 UCLIBC_HAS_FTS=y
 UCLIBC_HAS_GLOB=y
 UCLIBC_HAS_GNU_GLOB=y
-UCLIBC_HAS_UTMPX=y
 
 #
 # Library Installation Options
@@ -234,11 +232,9 @@ HARDWIRED_ABSPATH=y
 #
 UCLIBC_BUILD_PIE=y
 UCLIBC_HAS_ARC4RANDOM=y
+# ARC4RANDOM_USES_NODEV is not set
 UCLIBC_HAS_SSP=y
-# UCLIBC_HAS_SSP_COMPAT is not set
 # SSP_QUICK_CANARY is not set
-# PROPOLICE_BLOCK_ABRT is not set
-PROPOLICE_BLOCK_SEGV=y
 UCLIBC_BUILD_SSP=y
 UCLIBC_BUILD_RELRO=y
 UCLIBC_BUILD_NOW=y
@@ -248,7 +244,7 @@ UCLIBC_BUILD_NOEXECSTACK=y
 # Development/debugging options
 #
 CROSS_COMPILER_PREFIX=""
-UCLIBC_EXTRA_CFLAGS=""
+UCLIBC_EXTRA_CFLAGS="-fno-stack-check"
 # DODEBUG is not set
 DOSTRIP=y
 # DOASSERTS is not set
@@ -259,4 +255,3 @@ UCLIBC_HAS_BACKTRACE=y
 WARNINGS="-Wall"
 # EXTRA_WARNINGS is not set
 # DOMULTI is not set
-# UCLIBC_MJN3_ONLY is not set

diff --git a/tools-uclibc/portage.mips32r2.vanilla/env/net-misc_iputils_0 b/tools-uclibc/portage.mips32r2.vanilla/env/net-misc_iputils_0
new file mode 100644
index 0000000..1e8c846
--- /dev/null
+++ b/tools-uclibc/portage.mips32r2.vanilla/env/net-misc_iputils_0
@@ -0,0 +1 @@
+LDFLAGS=-lm

diff --git a/tools-uclibc/portage.mips32r2.vanilla/package.env b/tools-uclibc/portage.mips32r2.vanilla/package.env
new file mode 100644
index 0000000..dd59e5f
--- /dev/null
+++ b/tools-uclibc/portage.mips32r2.vanilla/package.env
@@ -0,0 +1 @@
+net-misc/iputils net-misc_iputils_0

diff --git a/tools-uclibc/portage.mips32r2.vanilla/package.mask b/tools-uclibc/portage.mips32r2.vanilla/package.mask
new file mode 100644
index 0000000..5eceab2
--- /dev/null
+++ b/tools-uclibc/portage.mips32r2.vanilla/package.mask
@@ -0,0 +1 @@
+sys-libs/uclibc

diff --git a/tools-uclibc/portage.mips32r2.vanilla/package.unmask b/tools-uclibc/portage.mips32r2.vanilla/package.unmask
new file mode 100644
index 0000000..4ee0e51
--- /dev/null
+++ b/tools-uclibc/portage.mips32r2.vanilla/package.unmask
@@ -0,0 +1 @@
+>sys-devel/binutils-config-4-r2

diff --git a/tools-uclibc/portage.mips32r2.vanilla/package.use/uclibc b/tools-uclibc/portage.mips32r2.vanilla/package.use/uclibc
deleted file mode 100644
index 0715d0b..0000000
--- a/tools-uclibc/portage.mips32r2.vanilla/package.use/uclibc
+++ /dev/null
@@ -1 +0,0 @@
-sys-libs/uclibc -* savedconfig

diff --git a/tools-uclibc/portage.mips32r2.vanilla/package.use/uclibc-ng b/tools-uclibc/portage.mips32r2.vanilla/package.use/uclibc-ng
new file mode 100644
index 0000000..7d19d50
--- /dev/null
+++ b/tools-uclibc/portage.mips32r2.vanilla/package.use/uclibc-ng
@@ -0,0 +1 @@
+sys-libs/uclibc-ng -* savedconfig

diff --git a/tools-uclibc/portage.mips32r2.vanilla/savedconfig/sys-libs/uclibc b/tools-uclibc/portage.mips32r2.vanilla/savedconfig/sys-libs/uclibc-ng
similarity index 86%
rename from tools-uclibc/portage.mips32r2.vanilla/savedconfig/sys-libs/uclibc
rename to tools-uclibc/portage.mips32r2.vanilla/savedconfig/sys-libs/uclibc-ng
index 96682c9..4c3aeaf 100644
--- a/tools-uclibc/portage.mips32r2.vanilla/savedconfig/sys-libs/uclibc
+++ b/tools-uclibc/portage.mips32r2.vanilla/savedconfig/sys-libs/uclibc-ng
@@ -1,32 +1,30 @@
 #
-# Automatically generated make config: don't edit
-# Version: 0.9.33.2
-# Sun Oct 21 16:56:54 2012
+# Automatically generated file; DO NOT EDIT.
+# uClibc-ng 0.1.0.17 C Library Configuration
 #
 # TARGET_alpha is not set
+# TARGET_arc is not set
 # TARGET_arm is not set
 # TARGET_avr32 is not set
 # TARGET_bfin is not set
 # TARGET_c6x is not set
 # TARGET_cris is not set
-# TARGET_e1 is not set
 # TARGET_frv is not set
 # TARGET_h8300 is not set
 # TARGET_hppa is not set
 # TARGET_i386 is not set
-# TARGET_i960 is not set
 # TARGET_ia64 is not set
+# TARGET_lm32 is not set
 # TARGET_m68k is not set
+# TARGET_metag is not set
 # TARGET_microblaze is not set
 TARGET_mips=y
-# TARGET_nios is not set
+# TARGET_nds32 is not set
 # TARGET_nios2 is not set
+# TARGET_or1k 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_vax is not set
 # TARGET_x86_64 is not set
 # TARGET_xtensa is not set
 
@@ -38,18 +36,13 @@ FORCE_OPTIONS_FOR_ARCH=y
 CONFIG_MIPS_O32_ABI=y
 # CONFIG_MIPS_N32_ABI is not set
 # CONFIG_MIPS_N64_ABI is not set
-# CONFIG_MIPS_ISA_1 is not set
-# CONFIG_MIPS_ISA_2 is not set
-# CONFIG_MIPS_ISA_3 is not set
-# CONFIG_MIPS_ISA_4 is not set
-# CONFIG_MIPS_ISA_MIPS32 is not set
-CONFIG_MIPS_ISA_MIPS32R2=y
-# CONFIG_MIPS_ISA_MIPS64 is not set
+UCLIBC_USE_MIPS_PREFETCH=y
 TARGET_SUBARCH=""
 
 #
 # Using ELF file format
 #
+ARCH_HAS_DEPRECATED_SYSCALLS=y
 ARCH_ANY_ENDIAN=y
 ARCH_BIG_ENDIAN=y
 ARCH_WANTS_BIG_ENDIAN=y
@@ -68,6 +61,7 @@ HAVE_DOT_CONFIG=y
 # General Library Settings
 #
 DOPIC=y
+ARCH_HAS_UCONTEXT=y
 HAVE_SHARED=y
 FORCE_SHAREABLE_TEXT_SEGMENTS=y
 LDSO_LDD_SUPPORT=y
@@ -79,14 +73,14 @@ LDSO_STANDALONE_SUPPORT=y
 LDSO_PRELINK_SUPPORT=y
 UCLIBC_STATIC_LDCONFIG=y
 LDSO_RUNPATH=y
+LDSO_RUNPATH_OF_EXECUTABLE=y
+LDSO_SAFE_RUNPATH=y
 LDSO_SEARCH_INTERP_PATH=y
 LDSO_LD_LIBRARY_PATH=y
 # LDSO_NO_CLEANUP is not set
 UCLIBC_CTOR_DTOR=y
 # LDSO_GNU_HASH_SUPPORT is not set
 # HAS_NO_THREADS is not set
-# LINUXTHREADS_OLD is not set
-# LINUXTHREADS_NEW is not set
 UCLIBC_HAS_THREADS_NATIVE=y
 UCLIBC_HAS_THREADS=y
 UCLIBC_HAS_TLS=y
@@ -97,9 +91,14 @@ UCLIBC_HAS_LFS=y
 # MALLOC_SIMPLE is not set
 MALLOC_STANDARD=y
 MALLOC_GLIBC_COMPAT=y
+UCLIBC_HAS_OBSTACK=y
 UCLIBC_DYNAMIC_ATEXIT=y
 COMPAT_ATEXIT=y
+UCLIBC_HAS_UTMPX=y
+UCLIBC_HAS_UTMP=y
+UCLIBC_SUSV2_LEGACY=y
 UCLIBC_SUSV3_LEGACY=y
+UCLIBC_HAS_CONTEXT_FUNCS=y
 UCLIBC_SUSV3_LEGACY_MACROS=y
 UCLIBC_SUSV4_LEGACY=y
 # UCLIBC_STRICT_HEADERS is not set
@@ -134,7 +133,7 @@ UCLIBC_LINUX_SPECIFIC=y
 UCLIBC_HAS_GNU_ERROR=y
 UCLIBC_BSD_SPECIFIC=y
 UCLIBC_HAS_BSD_ERR=y
-# UCLIBC_HAS_OBSOLETE_BSD_SIGNAL is not set
+UCLIBC_HAS_OBSOLETE_BSD_SIGNAL=y
 # UCLIBC_HAS_OBSOLETE_SYSV_SIGNAL is not set
 UCLIBC_NTP_LEGACY=y
 # UCLIBC_SV4_DEPRECATED is not set
@@ -142,7 +141,7 @@ UCLIBC_HAS_REALTIME=y
 UCLIBC_HAS_ADVANCED_REALTIME=y
 UCLIBC_HAS_EPOLL=y
 UCLIBC_HAS_XATTR=y
-# UCLIBC_HAS_PROFILING is not set
+UCLIBC_HAS_PROFILING=y
 UCLIBC_HAS_CRYPT_IMPL=y
 UCLIBC_HAS_SHA256_CRYPT_IMPL=y
 UCLIBC_HAS_SHA512_CRYPT_IMPL=y
@@ -168,6 +167,7 @@ UCLIBC_HAS_LIBNSL_STUB=y
 #
 UCLIBC_HAS_STRING_GENERIC_OPT=y
 UCLIBC_HAS_STRING_ARCH_OPT=y
+UCLIBC_HAS_STDIO_FUTEXES=y
 UCLIBC_HAS_CTYPE_TABLES=y
 UCLIBC_HAS_CTYPE_SIGNED=y
 # UCLIBC_HAS_CTYPE_UNSAFE is not set
@@ -178,8 +178,6 @@ UCLIBC_HAS_WCHAR=y
 UCLIBC_HAS_HEXADECIMAL_FLOATS=y
 UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
 UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
-UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y
-# 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
@@ -203,8 +201,9 @@ UCLIBC_HAS_SYS_ERRLIST=y
 UCLIBC_HAS_SIGNUM_MESSAGES=y
 UCLIBC_HAS_SYS_SIGLIST=y
 UCLIBC_HAS_GNU_GETOPT=y
-UCLIBC_HAS_STDIO_FUTEXES=y
+UCLIBC_HAS_GETOPT_LONG=y
 UCLIBC_HAS_GNU_GETSUBOPT=y
+# UCLIBC_HAS_ARGP is not set
 
 #
 # Big and Tall
@@ -219,7 +218,6 @@ UCLIBC_HAS_FTW=y
 UCLIBC_HAS_FTS=y
 UCLIBC_HAS_GLOB=y
 UCLIBC_HAS_GNU_GLOB=y
-UCLIBC_HAS_UTMPX=y
 
 #
 # Library Installation Options
@@ -234,11 +232,9 @@ HARDWIRED_ABSPATH=y
 #
 UCLIBC_BUILD_PIE=y
 UCLIBC_HAS_ARC4RANDOM=y
+# ARC4RANDOM_USES_NODEV is not set
 UCLIBC_HAS_SSP=y
-# UCLIBC_HAS_SSP_COMPAT is not set
 # SSP_QUICK_CANARY is not set
-# PROPOLICE_BLOCK_ABRT is not set
-PROPOLICE_BLOCK_SEGV=y
 UCLIBC_BUILD_SSP=y
 UCLIBC_BUILD_RELRO=y
 UCLIBC_BUILD_NOW=y
@@ -248,7 +244,7 @@ UCLIBC_BUILD_NOEXECSTACK=y
 # Development/debugging options
 #
 CROSS_COMPILER_PREFIX=""
-UCLIBC_EXTRA_CFLAGS=""
+UCLIBC_EXTRA_CFLAGS="-fno-stack-check"
 # DODEBUG is not set
 DOSTRIP=y
 # DOASSERTS is not set
@@ -259,4 +255,3 @@ UCLIBC_HAS_BACKTRACE=y
 WARNINGS="-Wall"
 # EXTRA_WARNINGS is not set
 # DOMULTI is not set
-# UCLIBC_MJN3_ONLY is not set

diff --git a/tools-uclibc/portage.mipsel3.hardened/env/net-misc_iputils_0 b/tools-uclibc/portage.mipsel3.hardened/env/net-misc_iputils_0
new file mode 100644
index 0000000..1e8c846
--- /dev/null
+++ b/tools-uclibc/portage.mipsel3.hardened/env/net-misc_iputils_0
@@ -0,0 +1 @@
+LDFLAGS=-lm

diff --git a/tools-uclibc/portage.mipsel3.hardened/package.env b/tools-uclibc/portage.mipsel3.hardened/package.env
new file mode 100644
index 0000000..dd59e5f
--- /dev/null
+++ b/tools-uclibc/portage.mipsel3.hardened/package.env
@@ -0,0 +1 @@
+net-misc/iputils net-misc_iputils_0

diff --git a/tools-uclibc/portage.mipsel3.hardened/package.mask b/tools-uclibc/portage.mipsel3.hardened/package.mask
new file mode 100644
index 0000000..5eceab2
--- /dev/null
+++ b/tools-uclibc/portage.mipsel3.hardened/package.mask
@@ -0,0 +1 @@
+sys-libs/uclibc

diff --git a/tools-uclibc/portage.mipsel3.hardened/package.unmask b/tools-uclibc/portage.mipsel3.hardened/package.unmask
new file mode 100644
index 0000000..4ee0e51
--- /dev/null
+++ b/tools-uclibc/portage.mipsel3.hardened/package.unmask
@@ -0,0 +1 @@
+>sys-devel/binutils-config-4-r2

diff --git a/tools-uclibc/portage.mipsel3.hardened/package.use/uclibc b/tools-uclibc/portage.mipsel3.hardened/package.use/uclibc
deleted file mode 100644
index 0715d0b..0000000
--- a/tools-uclibc/portage.mipsel3.hardened/package.use/uclibc
+++ /dev/null
@@ -1 +0,0 @@
-sys-libs/uclibc -* savedconfig

diff --git a/tools-uclibc/portage.mipsel3.hardened/package.use/uclibc-ng b/tools-uclibc/portage.mipsel3.hardened/package.use/uclibc-ng
new file mode 100644
index 0000000..7d19d50
--- /dev/null
+++ b/tools-uclibc/portage.mipsel3.hardened/package.use/uclibc-ng
@@ -0,0 +1 @@
+sys-libs/uclibc-ng -* savedconfig

diff --git a/tools-uclibc/portage.mipsel3.hardened/savedconfig/sys-libs/uclibc b/tools-uclibc/portage.mipsel3.hardened/savedconfig/sys-libs/uclibc-ng
similarity index 86%
rename from tools-uclibc/portage.mipsel3.hardened/savedconfig/sys-libs/uclibc
rename to tools-uclibc/portage.mipsel3.hardened/savedconfig/sys-libs/uclibc-ng
index 3be16aa..ed9f702 100644
--- a/tools-uclibc/portage.mipsel3.hardened/savedconfig/sys-libs/uclibc
+++ b/tools-uclibc/portage.mipsel3.hardened/savedconfig/sys-libs/uclibc-ng
@@ -1,32 +1,30 @@
 #
-# Automatically generated make config: don't edit
-# Version: 0.9.33.2
-# Sun Mar 10 14:57:34 2013
+# Automatically generated file; DO NOT EDIT.
+# uClibc-ng 0.1.0.16 C Library Configuration
 #
 # TARGET_alpha is not set
+# TARGET_arc is not set
 # TARGET_arm is not set
 # TARGET_avr32 is not set
 # TARGET_bfin is not set
 # TARGET_c6x is not set
 # TARGET_cris is not set
-# TARGET_e1 is not set
 # TARGET_frv is not set
 # TARGET_h8300 is not set
 # TARGET_hppa is not set
 # TARGET_i386 is not set
-# TARGET_i960 is not set
 # TARGET_ia64 is not set
+# TARGET_lm32 is not set
 # TARGET_m68k is not set
+# TARGET_metag is not set
 # TARGET_microblaze is not set
 TARGET_mips=y
-# TARGET_nios is not set
+# TARGET_nds32 is not set
 # TARGET_nios2 is not set
+# TARGET_or1k 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_vax is not set
 # TARGET_x86_64 is not set
 # TARGET_xtensa is not set
 
@@ -38,18 +36,13 @@ FORCE_OPTIONS_FOR_ARCH=y
 CONFIG_MIPS_O32_ABI=y
 # CONFIG_MIPS_N32_ABI is not set
 # CONFIG_MIPS_N64_ABI is not set
-# CONFIG_MIPS_ISA_1 is not set
-# CONFIG_MIPS_ISA_2 is not set
-CONFIG_MIPS_ISA_3=y
-# CONFIG_MIPS_ISA_4 is not set
-# CONFIG_MIPS_ISA_MIPS32 is not set
-# CONFIG_MIPS_ISA_MIPS32R2 is not set
-# CONFIG_MIPS_ISA_MIPS64 is not set
+UCLIBC_USE_MIPS_PREFETCH=y
 TARGET_SUBARCH=""
 
 #
 # Using ELF file format
 #
+ARCH_HAS_DEPRECATED_SYSCALLS=y
 ARCH_ANY_ENDIAN=y
 ARCH_LITTLE_ENDIAN=y
 # ARCH_WANTS_BIG_ENDIAN is not set
@@ -68,6 +61,7 @@ HAVE_DOT_CONFIG=y
 # General Library Settings
 #
 DOPIC=y
+ARCH_HAS_UCONTEXT=y
 HAVE_SHARED=y
 FORCE_SHAREABLE_TEXT_SEGMENTS=y
 LDSO_LDD_SUPPORT=y
@@ -79,14 +73,14 @@ LDSO_STANDALONE_SUPPORT=y
 LDSO_PRELINK_SUPPORT=y
 UCLIBC_STATIC_LDCONFIG=y
 LDSO_RUNPATH=y
+LDSO_RUNPATH_OF_EXECUTABLE=y
+LDSO_SAFE_RUNPATH=y
 LDSO_SEARCH_INTERP_PATH=y
 LDSO_LD_LIBRARY_PATH=y
 # LDSO_NO_CLEANUP is not set
 UCLIBC_CTOR_DTOR=y
 # LDSO_GNU_HASH_SUPPORT is not set
 # HAS_NO_THREADS is not set
-# LINUXTHREADS_OLD is not set
-# LINUXTHREADS_NEW is not set
 UCLIBC_HAS_THREADS_NATIVE=y
 UCLIBC_HAS_THREADS=y
 UCLIBC_HAS_TLS=y
@@ -97,9 +91,14 @@ UCLIBC_HAS_LFS=y
 # MALLOC_SIMPLE is not set
 MALLOC_STANDARD=y
 MALLOC_GLIBC_COMPAT=y
+UCLIBC_HAS_OBSTACK=y
 UCLIBC_DYNAMIC_ATEXIT=y
 COMPAT_ATEXIT=y
+UCLIBC_HAS_UTMPX=y
+UCLIBC_HAS_UTMP=y
+UCLIBC_SUSV2_LEGACY=y
 UCLIBC_SUSV3_LEGACY=y
+UCLIBC_HAS_CONTEXT_FUNCS=y
 UCLIBC_SUSV3_LEGACY_MACROS=y
 UCLIBC_SUSV4_LEGACY=y
 # UCLIBC_STRICT_HEADERS is not set
@@ -134,7 +133,7 @@ UCLIBC_LINUX_SPECIFIC=y
 UCLIBC_HAS_GNU_ERROR=y
 UCLIBC_BSD_SPECIFIC=y
 UCLIBC_HAS_BSD_ERR=y
-# UCLIBC_HAS_OBSOLETE_BSD_SIGNAL is not set
+UCLIBC_HAS_OBSOLETE_BSD_SIGNAL=y
 # UCLIBC_HAS_OBSOLETE_SYSV_SIGNAL is not set
 UCLIBC_NTP_LEGACY=y
 # UCLIBC_SV4_DEPRECATED is not set
@@ -142,7 +141,7 @@ UCLIBC_HAS_REALTIME=y
 UCLIBC_HAS_ADVANCED_REALTIME=y
 UCLIBC_HAS_EPOLL=y
 UCLIBC_HAS_XATTR=y
-# UCLIBC_HAS_PROFILING is not set
+UCLIBC_HAS_PROFILING=y
 UCLIBC_HAS_CRYPT_IMPL=y
 UCLIBC_HAS_SHA256_CRYPT_IMPL=y
 UCLIBC_HAS_SHA512_CRYPT_IMPL=y
@@ -168,6 +167,7 @@ UCLIBC_HAS_LIBNSL_STUB=y
 #
 UCLIBC_HAS_STRING_GENERIC_OPT=y
 UCLIBC_HAS_STRING_ARCH_OPT=y
+UCLIBC_HAS_STDIO_FUTEXES=y
 UCLIBC_HAS_CTYPE_TABLES=y
 UCLIBC_HAS_CTYPE_SIGNED=y
 # UCLIBC_HAS_CTYPE_UNSAFE is not set
@@ -178,7 +178,6 @@ UCLIBC_HAS_WCHAR=y
 UCLIBC_HAS_HEXADECIMAL_FLOATS=y
 UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
 UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
-# 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
@@ -202,8 +201,9 @@ UCLIBC_HAS_SYS_ERRLIST=y
 UCLIBC_HAS_SIGNUM_MESSAGES=y
 UCLIBC_HAS_SYS_SIGLIST=y
 UCLIBC_HAS_GNU_GETOPT=y
-UCLIBC_HAS_STDIO_FUTEXES=y
+UCLIBC_HAS_GETOPT_LONG=y
 UCLIBC_HAS_GNU_GETSUBOPT=y
+# UCLIBC_HAS_ARGP is not set
 
 #
 # Big and Tall
@@ -218,7 +218,6 @@ UCLIBC_HAS_FTW=y
 UCLIBC_HAS_FTS=y
 UCLIBC_HAS_GLOB=y
 UCLIBC_HAS_GNU_GLOB=y
-UCLIBC_HAS_UTMPX=y
 
 #
 # Library Installation Options
@@ -233,11 +232,9 @@ HARDWIRED_ABSPATH=y
 #
 UCLIBC_BUILD_PIE=y
 UCLIBC_HAS_ARC4RANDOM=y
+# ARC4RANDOM_USES_NODEV is not set
 UCLIBC_HAS_SSP=y
-# UCLIBC_HAS_SSP_COMPAT is not set
 # SSP_QUICK_CANARY is not set
-# PROPOLICE_BLOCK_ABRT is not set
-PROPOLICE_BLOCK_SEGV=y
 UCLIBC_BUILD_SSP=y
 UCLIBC_BUILD_RELRO=y
 UCLIBC_BUILD_NOW=y
@@ -247,7 +244,7 @@ UCLIBC_BUILD_NOEXECSTACK=y
 # Development/debugging options
 #
 CROSS_COMPILER_PREFIX=""
-UCLIBC_EXTRA_CFLAGS=""
+UCLIBC_EXTRA_CFLAGS="-fno-stack-check"
 # DODEBUG is not set
 DOSTRIP=y
 # DOASSERTS is not set
@@ -258,4 +255,3 @@ UCLIBC_HAS_BACKTRACE=y
 WARNINGS="-Wall"
 # EXTRA_WARNINGS is not set
 # DOMULTI is not set
-# UCLIBC_MJN3_ONLY is not set

diff --git a/tools-uclibc/portage.mipsel3.vanilla/env/net-misc_iputils_0 b/tools-uclibc/portage.mipsel3.vanilla/env/net-misc_iputils_0
new file mode 100644
index 0000000..1e8c846
--- /dev/null
+++ b/tools-uclibc/portage.mipsel3.vanilla/env/net-misc_iputils_0
@@ -0,0 +1 @@
+LDFLAGS=-lm

diff --git a/tools-uclibc/portage.mipsel3.vanilla/package.env b/tools-uclibc/portage.mipsel3.vanilla/package.env
new file mode 100644
index 0000000..dd59e5f
--- /dev/null
+++ b/tools-uclibc/portage.mipsel3.vanilla/package.env
@@ -0,0 +1 @@
+net-misc/iputils net-misc_iputils_0

diff --git a/tools-uclibc/portage.mipsel3.vanilla/package.mask b/tools-uclibc/portage.mipsel3.vanilla/package.mask
new file mode 100644
index 0000000..5eceab2
--- /dev/null
+++ b/tools-uclibc/portage.mipsel3.vanilla/package.mask
@@ -0,0 +1 @@
+sys-libs/uclibc

diff --git a/tools-uclibc/portage.mipsel3.vanilla/package.unmask b/tools-uclibc/portage.mipsel3.vanilla/package.unmask
new file mode 100644
index 0000000..4ee0e51
--- /dev/null
+++ b/tools-uclibc/portage.mipsel3.vanilla/package.unmask
@@ -0,0 +1 @@
+>sys-devel/binutils-config-4-r2

diff --git a/tools-uclibc/portage.mipsel3.vanilla/package.use/uclibc b/tools-uclibc/portage.mipsel3.vanilla/package.use/uclibc
deleted file mode 100644
index 0715d0b..0000000
--- a/tools-uclibc/portage.mipsel3.vanilla/package.use/uclibc
+++ /dev/null
@@ -1 +0,0 @@
-sys-libs/uclibc -* savedconfig

diff --git a/tools-uclibc/portage.mipsel3.vanilla/package.use/uclibc-ng b/tools-uclibc/portage.mipsel3.vanilla/package.use/uclibc-ng
new file mode 100644
index 0000000..7d19d50
--- /dev/null
+++ b/tools-uclibc/portage.mipsel3.vanilla/package.use/uclibc-ng
@@ -0,0 +1 @@
+sys-libs/uclibc-ng -* savedconfig

diff --git a/tools-uclibc/portage.mipsel3.vanilla/savedconfig/sys-libs/uclibc b/tools-uclibc/portage.mipsel3.vanilla/savedconfig/sys-libs/uclibc-ng
similarity index 86%
rename from tools-uclibc/portage.mipsel3.vanilla/savedconfig/sys-libs/uclibc
rename to tools-uclibc/portage.mipsel3.vanilla/savedconfig/sys-libs/uclibc-ng
index 3be16aa..ed9f702 100644
--- a/tools-uclibc/portage.mipsel3.vanilla/savedconfig/sys-libs/uclibc
+++ b/tools-uclibc/portage.mipsel3.vanilla/savedconfig/sys-libs/uclibc-ng
@@ -1,32 +1,30 @@
 #
-# Automatically generated make config: don't edit
-# Version: 0.9.33.2
-# Sun Mar 10 14:57:34 2013
+# Automatically generated file; DO NOT EDIT.
+# uClibc-ng 0.1.0.16 C Library Configuration
 #
 # TARGET_alpha is not set
+# TARGET_arc is not set
 # TARGET_arm is not set
 # TARGET_avr32 is not set
 # TARGET_bfin is not set
 # TARGET_c6x is not set
 # TARGET_cris is not set
-# TARGET_e1 is not set
 # TARGET_frv is not set
 # TARGET_h8300 is not set
 # TARGET_hppa is not set
 # TARGET_i386 is not set
-# TARGET_i960 is not set
 # TARGET_ia64 is not set
+# TARGET_lm32 is not set
 # TARGET_m68k is not set
+# TARGET_metag is not set
 # TARGET_microblaze is not set
 TARGET_mips=y
-# TARGET_nios is not set
+# TARGET_nds32 is not set
 # TARGET_nios2 is not set
+# TARGET_or1k 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_vax is not set
 # TARGET_x86_64 is not set
 # TARGET_xtensa is not set
 
@@ -38,18 +36,13 @@ FORCE_OPTIONS_FOR_ARCH=y
 CONFIG_MIPS_O32_ABI=y
 # CONFIG_MIPS_N32_ABI is not set
 # CONFIG_MIPS_N64_ABI is not set
-# CONFIG_MIPS_ISA_1 is not set
-# CONFIG_MIPS_ISA_2 is not set
-CONFIG_MIPS_ISA_3=y
-# CONFIG_MIPS_ISA_4 is not set
-# CONFIG_MIPS_ISA_MIPS32 is not set
-# CONFIG_MIPS_ISA_MIPS32R2 is not set
-# CONFIG_MIPS_ISA_MIPS64 is not set
+UCLIBC_USE_MIPS_PREFETCH=y
 TARGET_SUBARCH=""
 
 #
 # Using ELF file format
 #
+ARCH_HAS_DEPRECATED_SYSCALLS=y
 ARCH_ANY_ENDIAN=y
 ARCH_LITTLE_ENDIAN=y
 # ARCH_WANTS_BIG_ENDIAN is not set
@@ -68,6 +61,7 @@ HAVE_DOT_CONFIG=y
 # General Library Settings
 #
 DOPIC=y
+ARCH_HAS_UCONTEXT=y
 HAVE_SHARED=y
 FORCE_SHAREABLE_TEXT_SEGMENTS=y
 LDSO_LDD_SUPPORT=y
@@ -79,14 +73,14 @@ LDSO_STANDALONE_SUPPORT=y
 LDSO_PRELINK_SUPPORT=y
 UCLIBC_STATIC_LDCONFIG=y
 LDSO_RUNPATH=y
+LDSO_RUNPATH_OF_EXECUTABLE=y
+LDSO_SAFE_RUNPATH=y
 LDSO_SEARCH_INTERP_PATH=y
 LDSO_LD_LIBRARY_PATH=y
 # LDSO_NO_CLEANUP is not set
 UCLIBC_CTOR_DTOR=y
 # LDSO_GNU_HASH_SUPPORT is not set
 # HAS_NO_THREADS is not set
-# LINUXTHREADS_OLD is not set
-# LINUXTHREADS_NEW is not set
 UCLIBC_HAS_THREADS_NATIVE=y
 UCLIBC_HAS_THREADS=y
 UCLIBC_HAS_TLS=y
@@ -97,9 +91,14 @@ UCLIBC_HAS_LFS=y
 # MALLOC_SIMPLE is not set
 MALLOC_STANDARD=y
 MALLOC_GLIBC_COMPAT=y
+UCLIBC_HAS_OBSTACK=y
 UCLIBC_DYNAMIC_ATEXIT=y
 COMPAT_ATEXIT=y
+UCLIBC_HAS_UTMPX=y
+UCLIBC_HAS_UTMP=y
+UCLIBC_SUSV2_LEGACY=y
 UCLIBC_SUSV3_LEGACY=y
+UCLIBC_HAS_CONTEXT_FUNCS=y
 UCLIBC_SUSV3_LEGACY_MACROS=y
 UCLIBC_SUSV4_LEGACY=y
 # UCLIBC_STRICT_HEADERS is not set
@@ -134,7 +133,7 @@ UCLIBC_LINUX_SPECIFIC=y
 UCLIBC_HAS_GNU_ERROR=y
 UCLIBC_BSD_SPECIFIC=y
 UCLIBC_HAS_BSD_ERR=y
-# UCLIBC_HAS_OBSOLETE_BSD_SIGNAL is not set
+UCLIBC_HAS_OBSOLETE_BSD_SIGNAL=y
 # UCLIBC_HAS_OBSOLETE_SYSV_SIGNAL is not set
 UCLIBC_NTP_LEGACY=y
 # UCLIBC_SV4_DEPRECATED is not set
@@ -142,7 +141,7 @@ UCLIBC_HAS_REALTIME=y
 UCLIBC_HAS_ADVANCED_REALTIME=y
 UCLIBC_HAS_EPOLL=y
 UCLIBC_HAS_XATTR=y
-# UCLIBC_HAS_PROFILING is not set
+UCLIBC_HAS_PROFILING=y
 UCLIBC_HAS_CRYPT_IMPL=y
 UCLIBC_HAS_SHA256_CRYPT_IMPL=y
 UCLIBC_HAS_SHA512_CRYPT_IMPL=y
@@ -168,6 +167,7 @@ UCLIBC_HAS_LIBNSL_STUB=y
 #
 UCLIBC_HAS_STRING_GENERIC_OPT=y
 UCLIBC_HAS_STRING_ARCH_OPT=y
+UCLIBC_HAS_STDIO_FUTEXES=y
 UCLIBC_HAS_CTYPE_TABLES=y
 UCLIBC_HAS_CTYPE_SIGNED=y
 # UCLIBC_HAS_CTYPE_UNSAFE is not set
@@ -178,7 +178,6 @@ UCLIBC_HAS_WCHAR=y
 UCLIBC_HAS_HEXADECIMAL_FLOATS=y
 UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
 UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
-# 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
@@ -202,8 +201,9 @@ UCLIBC_HAS_SYS_ERRLIST=y
 UCLIBC_HAS_SIGNUM_MESSAGES=y
 UCLIBC_HAS_SYS_SIGLIST=y
 UCLIBC_HAS_GNU_GETOPT=y
-UCLIBC_HAS_STDIO_FUTEXES=y
+UCLIBC_HAS_GETOPT_LONG=y
 UCLIBC_HAS_GNU_GETSUBOPT=y
+# UCLIBC_HAS_ARGP is not set
 
 #
 # Big and Tall
@@ -218,7 +218,6 @@ UCLIBC_HAS_FTW=y
 UCLIBC_HAS_FTS=y
 UCLIBC_HAS_GLOB=y
 UCLIBC_HAS_GNU_GLOB=y
-UCLIBC_HAS_UTMPX=y
 
 #
 # Library Installation Options
@@ -233,11 +232,9 @@ HARDWIRED_ABSPATH=y
 #
 UCLIBC_BUILD_PIE=y
 UCLIBC_HAS_ARC4RANDOM=y
+# ARC4RANDOM_USES_NODEV is not set
 UCLIBC_HAS_SSP=y
-# UCLIBC_HAS_SSP_COMPAT is not set
 # SSP_QUICK_CANARY is not set
-# PROPOLICE_BLOCK_ABRT is not set
-PROPOLICE_BLOCK_SEGV=y
 UCLIBC_BUILD_SSP=y
 UCLIBC_BUILD_RELRO=y
 UCLIBC_BUILD_NOW=y
@@ -247,7 +244,7 @@ UCLIBC_BUILD_NOEXECSTACK=y
 # Development/debugging options
 #
 CROSS_COMPILER_PREFIX=""
-UCLIBC_EXTRA_CFLAGS=""
+UCLIBC_EXTRA_CFLAGS="-fno-stack-check"
 # DODEBUG is not set
 DOSTRIP=y
 # DOASSERTS is not set
@@ -258,4 +255,3 @@ UCLIBC_HAS_BACKTRACE=y
 WARNINGS="-Wall"
 # EXTRA_WARNINGS is not set
 # DOMULTI is not set
-# UCLIBC_MJN3_ONLY is not set

diff --git a/tools-uclibc/portage.ppc.hardened/env/net-misc_iputils_0 b/tools-uclibc/portage.ppc.hardened/env/net-misc_iputils_0
new file mode 100644
index 0000000..1e8c846
--- /dev/null
+++ b/tools-uclibc/portage.ppc.hardened/env/net-misc_iputils_0
@@ -0,0 +1 @@
+LDFLAGS=-lm

diff --git a/tools-uclibc/portage.ppc.hardened/package.env b/tools-uclibc/portage.ppc.hardened/package.env
new file mode 100644
index 0000000..dd59e5f
--- /dev/null
+++ b/tools-uclibc/portage.ppc.hardened/package.env
@@ -0,0 +1 @@
+net-misc/iputils net-misc_iputils_0

diff --git a/tools-uclibc/portage.ppc.hardened/package.mask b/tools-uclibc/portage.ppc.hardened/package.mask
new file mode 100644
index 0000000..5eceab2
--- /dev/null
+++ b/tools-uclibc/portage.ppc.hardened/package.mask
@@ -0,0 +1 @@
+sys-libs/uclibc

diff --git a/tools-uclibc/portage.ppc.hardened/package.unmask b/tools-uclibc/portage.ppc.hardened/package.unmask
new file mode 100644
index 0000000..4ee0e51
--- /dev/null
+++ b/tools-uclibc/portage.ppc.hardened/package.unmask
@@ -0,0 +1 @@
+>sys-devel/binutils-config-4-r2

diff --git a/tools-uclibc/portage.ppc.hardened/package.use/uclibc b/tools-uclibc/portage.ppc.hardened/package.use/uclibc
deleted file mode 100644
index 0715d0b..0000000
--- a/tools-uclibc/portage.ppc.hardened/package.use/uclibc
+++ /dev/null
@@ -1 +0,0 @@
-sys-libs/uclibc -* savedconfig

diff --git a/tools-uclibc/portage.ppc.hardened/package.use/uclibc-ng b/tools-uclibc/portage.ppc.hardened/package.use/uclibc-ng
new file mode 100644
index 0000000..7d19d50
--- /dev/null
+++ b/tools-uclibc/portage.ppc.hardened/package.use/uclibc-ng
@@ -0,0 +1 @@
+sys-libs/uclibc-ng -* savedconfig

diff --git a/tools-uclibc/portage.ppc.hardened/savedconfig/sys-libs/uclibc b/tools-uclibc/portage.ppc.hardened/savedconfig/sys-libs/uclibc-ng
similarity index 87%
rename from tools-uclibc/portage.ppc.hardened/savedconfig/sys-libs/uclibc
rename to tools-uclibc/portage.ppc.hardened/savedconfig/sys-libs/uclibc-ng
index f0a76ed..2e8d09a 100644
--- a/tools-uclibc/portage.ppc.hardened/savedconfig/sys-libs/uclibc
+++ b/tools-uclibc/portage.ppc.hardened/savedconfig/sys-libs/uclibc-ng
@@ -1,32 +1,30 @@
 #
-# Automatically generated make config: don't edit
-# Version: 0.9.33.2
-# Tue Jul 15 17:11:45 2014
+# Automatically generated file; DO NOT EDIT.
+# uClibc-ng 0.1.0.17 C Library Configuration
 #
 # TARGET_alpha is not set
+# TARGET_arc is not set
 # TARGET_arm is not set
 # TARGET_avr32 is not set
 # TARGET_bfin is not set
 # TARGET_c6x is not set
 # TARGET_cris is not set
-# TARGET_e1 is not set
 # TARGET_frv is not set
 # TARGET_h8300 is not set
 # TARGET_hppa is not set
 # TARGET_i386 is not set
-# TARGET_i960 is not set
 # TARGET_ia64 is not set
+# TARGET_lm32 is not set
 # TARGET_m68k is not set
+# TARGET_metag is not set
 # TARGET_microblaze is not set
 # TARGET_mips is not set
-# TARGET_nios is not set
+# TARGET_nds32 is not set
 # TARGET_nios2 is not set
+# TARGET_or1k is not set
 TARGET_powerpc=y
 # TARGET_sh is not set
-# TARGET_sh64 is not set
 # TARGET_sparc is not set
-# TARGET_v850 is not set
-# TARGET_vax is not set
 # TARGET_x86_64 is not set
 # TARGET_xtensa is not set
 
@@ -42,6 +40,7 @@ TARGET_SUBARCH="classic"
 #
 # Using ELF file format
 #
+ARCH_HAS_DEPRECATED_SYSCALLS=y
 ARCH_BIG_ENDIAN=y
 
 #
@@ -73,14 +72,14 @@ LDSO_STANDALONE_SUPPORT=y
 LDSO_PRELINK_SUPPORT=y
 UCLIBC_STATIC_LDCONFIG=y
 LDSO_RUNPATH=y
+LDSO_RUNPATH_OF_EXECUTABLE=y
+LDSO_SAFE_RUNPATH=y
 LDSO_SEARCH_INTERP_PATH=y
 LDSO_LD_LIBRARY_PATH=y
 # LDSO_NO_CLEANUP is not set
 UCLIBC_CTOR_DTOR=y
 LDSO_GNU_HASH_SUPPORT=y
 # HAS_NO_THREADS is not set
-# LINUXTHREADS_OLD is not set
-# LINUXTHREADS_NEW is not set
 UCLIBC_HAS_THREADS_NATIVE=y
 UCLIBC_HAS_THREADS=y
 UCLIBC_HAS_TLS=y
@@ -91,8 +90,12 @@ UCLIBC_HAS_LFS=y
 # MALLOC_SIMPLE is not set
 MALLOC_STANDARD=y
 MALLOC_GLIBC_COMPAT=y
+UCLIBC_HAS_OBSTACK=y
 UCLIBC_DYNAMIC_ATEXIT=y
 COMPAT_ATEXIT=y
+UCLIBC_HAS_UTMPX=y
+UCLIBC_HAS_UTMP=y
+UCLIBC_SUSV2_LEGACY=y
 UCLIBC_SUSV3_LEGACY=y
 UCLIBC_SUSV3_LEGACY_MACROS=y
 UCLIBC_SUSV4_LEGACY=y
@@ -128,15 +131,15 @@ UCLIBC_LINUX_SPECIFIC=y
 UCLIBC_HAS_GNU_ERROR=y
 UCLIBC_BSD_SPECIFIC=y
 UCLIBC_HAS_BSD_ERR=y
-# UCLIBC_HAS_OBSOLETE_BSD_SIGNAL is not set
-# UCLIBC_HAS_OBSOLETE_SYSV_SIGNAL is not set
+UCLIBC_HAS_OBSOLETE_BSD_SIGNAL=y
+UCLIBC_HAS_OBSOLETE_SYSV_SIGNAL=y
 UCLIBC_NTP_LEGACY=y
-# UCLIBC_SV4_DEPRECATED is not set
+UCLIBC_SV4_DEPRECATED=y
 UCLIBC_HAS_REALTIME=y
 UCLIBC_HAS_ADVANCED_REALTIME=y
 UCLIBC_HAS_EPOLL=y
 UCLIBC_HAS_XATTR=y
-# UCLIBC_HAS_PROFILING is not set
+UCLIBC_HAS_PROFILING=y
 UCLIBC_HAS_CRYPT_IMPL=y
 UCLIBC_HAS_SHA256_CRYPT_IMPL=y
 UCLIBC_HAS_SHA512_CRYPT_IMPL=y
@@ -162,6 +165,7 @@ UCLIBC_HAS_LIBNSL_STUB=y
 #
 UCLIBC_HAS_STRING_GENERIC_OPT=y
 UCLIBC_HAS_STRING_ARCH_OPT=y
+UCLIBC_HAS_STDIO_FUTEXES=y
 UCLIBC_HAS_CTYPE_TABLES=y
 UCLIBC_HAS_CTYPE_SIGNED=y
 # UCLIBC_HAS_CTYPE_UNSAFE is not set
@@ -172,7 +176,6 @@ UCLIBC_HAS_WCHAR=y
 UCLIBC_HAS_HEXADECIMAL_FLOATS=y
 UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
 UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
-# 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
@@ -196,8 +199,9 @@ UCLIBC_HAS_SYS_ERRLIST=y
 UCLIBC_HAS_SIGNUM_MESSAGES=y
 UCLIBC_HAS_SYS_SIGLIST=y
 UCLIBC_HAS_GNU_GETOPT=y
-UCLIBC_HAS_STDIO_FUTEXES=y
+UCLIBC_HAS_GETOPT_LONG=y
 UCLIBC_HAS_GNU_GETSUBOPT=y
+# UCLIBC_HAS_ARGP is not set
 
 #
 # Big and Tall
@@ -212,7 +216,6 @@ UCLIBC_HAS_FTW=y
 UCLIBC_HAS_FTS=y
 UCLIBC_HAS_GLOB=y
 UCLIBC_HAS_GNU_GLOB=y
-UCLIBC_HAS_UTMPX=y
 
 #
 # Library Installation Options
@@ -225,22 +228,20 @@ HARDWIRED_ABSPATH=y
 #
 # Security options
 #
-UCLIBC_BUILD_PIE=y
+# UCLIBC_BUILD_PIE is not set
 UCLIBC_HAS_ARC4RANDOM=y
+# ARC4RANDOM_USES_NODEV is not set
 UCLIBC_HAS_SSP=y
-# UCLIBC_HAS_SSP_COMPAT is not set
 # SSP_QUICK_CANARY is not set
-# PROPOLICE_BLOCK_ABRT is not set
-PROPOLICE_BLOCK_SEGV=y
 # UCLIBC_BUILD_SSP is not set
-UCLIBC_BUILD_RELRO=y
-UCLIBC_BUILD_NOW=y
-UCLIBC_BUILD_NOEXECSTACK=y
+# UCLIBC_BUILD_RELRO is not set
+# UCLIBC_BUILD_NOW is not set
+# UCLIBC_BUILD_NOEXECSTACK is not set
 
 #
 # Development/debugging options
 #
-CROSS_COMPILER_PREFIX=""
+CROSS_COMPILER_PREFIX="powerpc-gentoo-linux-uclibc-"
 UCLIBC_EXTRA_CFLAGS=""
 # DODEBUG is not set
 DOSTRIP=y
@@ -252,4 +253,3 @@ UCLIBC_HAS_BACKTRACE=y
 WARNINGS="-Wall"
 # EXTRA_WARNINGS is not set
 # DOMULTI is not set
-# UCLIBC_MJN3_ONLY is not set

diff --git a/tools-uclibc/portage.ppc.vanilla/env/net-misc_iputils_0 b/tools-uclibc/portage.ppc.vanilla/env/net-misc_iputils_0
new file mode 100644
index 0000000..1e8c846
--- /dev/null
+++ b/tools-uclibc/portage.ppc.vanilla/env/net-misc_iputils_0
@@ -0,0 +1 @@
+LDFLAGS=-lm

diff --git a/tools-uclibc/portage.ppc.vanilla/package.accept_keywords b/tools-uclibc/portage.ppc.vanilla/package.accept_keywords
new file mode 100644
index 0000000..57ef89d
--- /dev/null
+++ b/tools-uclibc/portage.ppc.vanilla/package.accept_keywords
@@ -0,0 +1 @@
+=sys-devel/gcc-config-1.8-r1 ~ppc

diff --git a/tools-uclibc/portage.ppc.vanilla/package.env b/tools-uclibc/portage.ppc.vanilla/package.env
new file mode 100644
index 0000000..dd59e5f
--- /dev/null
+++ b/tools-uclibc/portage.ppc.vanilla/package.env
@@ -0,0 +1 @@
+net-misc/iputils net-misc_iputils_0

diff --git a/tools-uclibc/portage.ppc.vanilla/package.mask b/tools-uclibc/portage.ppc.vanilla/package.mask
new file mode 100644
index 0000000..5eceab2
--- /dev/null
+++ b/tools-uclibc/portage.ppc.vanilla/package.mask
@@ -0,0 +1 @@
+sys-libs/uclibc

diff --git a/tools-uclibc/portage.ppc.vanilla/package.unmask b/tools-uclibc/portage.ppc.vanilla/package.unmask
new file mode 100644
index 0000000..4ee0e51
--- /dev/null
+++ b/tools-uclibc/portage.ppc.vanilla/package.unmask
@@ -0,0 +1 @@
+>sys-devel/binutils-config-4-r2

diff --git a/tools-uclibc/portage.ppc.vanilla/package.use/uclibc b/tools-uclibc/portage.ppc.vanilla/package.use/uclibc
deleted file mode 100644
index 0715d0b..0000000
--- a/tools-uclibc/portage.ppc.vanilla/package.use/uclibc
+++ /dev/null
@@ -1 +0,0 @@
-sys-libs/uclibc -* savedconfig

diff --git a/tools-uclibc/portage.ppc.vanilla/package.use/uclibc-ng b/tools-uclibc/portage.ppc.vanilla/package.use/uclibc-ng
new file mode 100644
index 0000000..7d19d50
--- /dev/null
+++ b/tools-uclibc/portage.ppc.vanilla/package.use/uclibc-ng
@@ -0,0 +1 @@
+sys-libs/uclibc-ng -* savedconfig

diff --git a/tools-uclibc/portage.ppc.vanilla/savedconfig/sys-libs/uclibc b/tools-uclibc/portage.ppc.vanilla/savedconfig/sys-libs/uclibc-ng
similarity index 87%
rename from tools-uclibc/portage.ppc.vanilla/savedconfig/sys-libs/uclibc
rename to tools-uclibc/portage.ppc.vanilla/savedconfig/sys-libs/uclibc-ng
index f0a76ed..2e8d09a 100644
--- a/tools-uclibc/portage.ppc.vanilla/savedconfig/sys-libs/uclibc
+++ b/tools-uclibc/portage.ppc.vanilla/savedconfig/sys-libs/uclibc-ng
@@ -1,32 +1,30 @@
 #
-# Automatically generated make config: don't edit
-# Version: 0.9.33.2
-# Tue Jul 15 17:11:45 2014
+# Automatically generated file; DO NOT EDIT.
+# uClibc-ng 0.1.0.17 C Library Configuration
 #
 # TARGET_alpha is not set
+# TARGET_arc is not set
 # TARGET_arm is not set
 # TARGET_avr32 is not set
 # TARGET_bfin is not set
 # TARGET_c6x is not set
 # TARGET_cris is not set
-# TARGET_e1 is not set
 # TARGET_frv is not set
 # TARGET_h8300 is not set
 # TARGET_hppa is not set
 # TARGET_i386 is not set
-# TARGET_i960 is not set
 # TARGET_ia64 is not set
+# TARGET_lm32 is not set
 # TARGET_m68k is not set
+# TARGET_metag is not set
 # TARGET_microblaze is not set
 # TARGET_mips is not set
-# TARGET_nios is not set
+# TARGET_nds32 is not set
 # TARGET_nios2 is not set
+# TARGET_or1k is not set
 TARGET_powerpc=y
 # TARGET_sh is not set
-# TARGET_sh64 is not set
 # TARGET_sparc is not set
-# TARGET_v850 is not set
-# TARGET_vax is not set
 # TARGET_x86_64 is not set
 # TARGET_xtensa is not set
 
@@ -42,6 +40,7 @@ TARGET_SUBARCH="classic"
 #
 # Using ELF file format
 #
+ARCH_HAS_DEPRECATED_SYSCALLS=y
 ARCH_BIG_ENDIAN=y
 
 #
@@ -73,14 +72,14 @@ LDSO_STANDALONE_SUPPORT=y
 LDSO_PRELINK_SUPPORT=y
 UCLIBC_STATIC_LDCONFIG=y
 LDSO_RUNPATH=y
+LDSO_RUNPATH_OF_EXECUTABLE=y
+LDSO_SAFE_RUNPATH=y
 LDSO_SEARCH_INTERP_PATH=y
 LDSO_LD_LIBRARY_PATH=y
 # LDSO_NO_CLEANUP is not set
 UCLIBC_CTOR_DTOR=y
 LDSO_GNU_HASH_SUPPORT=y
 # HAS_NO_THREADS is not set
-# LINUXTHREADS_OLD is not set
-# LINUXTHREADS_NEW is not set
 UCLIBC_HAS_THREADS_NATIVE=y
 UCLIBC_HAS_THREADS=y
 UCLIBC_HAS_TLS=y
@@ -91,8 +90,12 @@ UCLIBC_HAS_LFS=y
 # MALLOC_SIMPLE is not set
 MALLOC_STANDARD=y
 MALLOC_GLIBC_COMPAT=y
+UCLIBC_HAS_OBSTACK=y
 UCLIBC_DYNAMIC_ATEXIT=y
 COMPAT_ATEXIT=y
+UCLIBC_HAS_UTMPX=y
+UCLIBC_HAS_UTMP=y
+UCLIBC_SUSV2_LEGACY=y
 UCLIBC_SUSV3_LEGACY=y
 UCLIBC_SUSV3_LEGACY_MACROS=y
 UCLIBC_SUSV4_LEGACY=y
@@ -128,15 +131,15 @@ UCLIBC_LINUX_SPECIFIC=y
 UCLIBC_HAS_GNU_ERROR=y
 UCLIBC_BSD_SPECIFIC=y
 UCLIBC_HAS_BSD_ERR=y
-# UCLIBC_HAS_OBSOLETE_BSD_SIGNAL is not set
-# UCLIBC_HAS_OBSOLETE_SYSV_SIGNAL is not set
+UCLIBC_HAS_OBSOLETE_BSD_SIGNAL=y
+UCLIBC_HAS_OBSOLETE_SYSV_SIGNAL=y
 UCLIBC_NTP_LEGACY=y
-# UCLIBC_SV4_DEPRECATED is not set
+UCLIBC_SV4_DEPRECATED=y
 UCLIBC_HAS_REALTIME=y
 UCLIBC_HAS_ADVANCED_REALTIME=y
 UCLIBC_HAS_EPOLL=y
 UCLIBC_HAS_XATTR=y
-# UCLIBC_HAS_PROFILING is not set
+UCLIBC_HAS_PROFILING=y
 UCLIBC_HAS_CRYPT_IMPL=y
 UCLIBC_HAS_SHA256_CRYPT_IMPL=y
 UCLIBC_HAS_SHA512_CRYPT_IMPL=y
@@ -162,6 +165,7 @@ UCLIBC_HAS_LIBNSL_STUB=y
 #
 UCLIBC_HAS_STRING_GENERIC_OPT=y
 UCLIBC_HAS_STRING_ARCH_OPT=y
+UCLIBC_HAS_STDIO_FUTEXES=y
 UCLIBC_HAS_CTYPE_TABLES=y
 UCLIBC_HAS_CTYPE_SIGNED=y
 # UCLIBC_HAS_CTYPE_UNSAFE is not set
@@ -172,7 +176,6 @@ UCLIBC_HAS_WCHAR=y
 UCLIBC_HAS_HEXADECIMAL_FLOATS=y
 UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
 UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
-# 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
@@ -196,8 +199,9 @@ UCLIBC_HAS_SYS_ERRLIST=y
 UCLIBC_HAS_SIGNUM_MESSAGES=y
 UCLIBC_HAS_SYS_SIGLIST=y
 UCLIBC_HAS_GNU_GETOPT=y
-UCLIBC_HAS_STDIO_FUTEXES=y
+UCLIBC_HAS_GETOPT_LONG=y
 UCLIBC_HAS_GNU_GETSUBOPT=y
+# UCLIBC_HAS_ARGP is not set
 
 #
 # Big and Tall
@@ -212,7 +216,6 @@ UCLIBC_HAS_FTW=y
 UCLIBC_HAS_FTS=y
 UCLIBC_HAS_GLOB=y
 UCLIBC_HAS_GNU_GLOB=y
-UCLIBC_HAS_UTMPX=y
 
 #
 # Library Installation Options
@@ -225,22 +228,20 @@ HARDWIRED_ABSPATH=y
 #
 # Security options
 #
-UCLIBC_BUILD_PIE=y
+# UCLIBC_BUILD_PIE is not set
 UCLIBC_HAS_ARC4RANDOM=y
+# ARC4RANDOM_USES_NODEV is not set
 UCLIBC_HAS_SSP=y
-# UCLIBC_HAS_SSP_COMPAT is not set
 # SSP_QUICK_CANARY is not set
-# PROPOLICE_BLOCK_ABRT is not set
-PROPOLICE_BLOCK_SEGV=y
 # UCLIBC_BUILD_SSP is not set
-UCLIBC_BUILD_RELRO=y
-UCLIBC_BUILD_NOW=y
-UCLIBC_BUILD_NOEXECSTACK=y
+# UCLIBC_BUILD_RELRO is not set
+# UCLIBC_BUILD_NOW is not set
+# UCLIBC_BUILD_NOEXECSTACK is not set
 
 #
 # Development/debugging options
 #
-CROSS_COMPILER_PREFIX=""
+CROSS_COMPILER_PREFIX="powerpc-gentoo-linux-uclibc-"
 UCLIBC_EXTRA_CFLAGS=""
 # DODEBUG is not set
 DOSTRIP=y
@@ -252,4 +253,3 @@ UCLIBC_HAS_BACKTRACE=y
 WARNINGS="-Wall"
 # EXTRA_WARNINGS is not set
 # DOMULTI is not set
-# UCLIBC_MJN3_ONLY is not set


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2016-09-13 19:40 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-09-13 19:39 [gentoo-commits] proj/releng:master commit in: tools-uclibc/portage.mips32r2.hardened/savedconfig/sys-libs/, Anthony G. Basile

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox