From 7b3821450a0921799b86880921ee91802e80fbf9 Mon Sep 17 00:00:00 2001
From: Alexey Neyman <stilor@att.net>
Date: Fri, 2 Oct 2015 14:23:33 -0700
Subject: Fix powerpc-e500v2-linux-gnuspe.

Options were renamed. However, matching current option names result
in a compile error for strfmon_l.o in glibc: GCC 4.6 detects an
unitialized variable in its own va_arg() implementation. Likely,
an older GLIBC was used when this sample was submitted - which did
not provide -Werror in CFLAGS.

Thus, use most recent GCC (5.2.0) and revert GLIBC_FORCE_UNWIND to
its default value, 'y' (as forced unwind is required with this version).

diff --git a/samples/powerpc-e500v2-linux-gnuspe/crosstool.config b/samples/powerpc-e500v2-linux-gnuspe/crosstool.config
index b611548..1507fab 100644
--- a/samples/powerpc-e500v2-linux-gnuspe/crosstool.config
+++ b/samples/powerpc-e500v2-linux-gnuspe/crosstool.config
@@ -2,7 +2,6 @@ CT_LOCAL_TARBALLS_DIR="${HOME}/src"
 CT_SAVE_TARBALLS=y
 CT_LOG_EXTRA=y
 CT_ARCH_CPU="8548"
-CT_ARCH_TUNE="8548"
 CT_ARCH_FLOAT_SW=y
 CT_TARGET_CFLAGS="-mfloat-gprs=double -Wa,-me500x2"
 CT_ARCH_powerpc=y
@@ -10,13 +9,10 @@ CT_ARCH_powerpc_ABI_SPE=y
 CT_TARGET_VENDOR="e500v2"
 CT_KERNEL_linux=y
 CT_BINUTILS_EXTRA_CONFIG_ARRAY="--enable-spe=yes --enable-e500x2 --with-e500x2"
-CT_LIBC_glibc=y
-# CT_LIBC_GLIBC_FORCE_UNWIND is not set
 CT_CC_GCC_SHOW_LINARO=y
-CT_CC_V_4_6_4=y
-CT_CC_LANG_CXX=y
-CT_CC_CORE_EXTRA_CONFIG_ARRAY="--with-long-double-128 --enable-e500_double"
-CT_CC_EXTRA_CONFIG_ARRAY="--with-long-double-128 --enable-e500_double"
+CT_CC_GCC_CORE_EXTRA_CONFIG_ARRAY="--with-long-double-128 --enable-e500_double"
+CT_CC_GCC_EXTRA_CONFIG_ARRAY="--with-long-double-128 --enable-e500_double"
 # CT_CC_GCC_ENABLE_TARGET_OPTSPACE is not set
+CT_CC_LANG_CXX=y
 CT_DEBUG_gdb=y
 # CT_GDB_CROSS_PYTHON is not set
-- 
cgit v0.10.2-6-g49f6