From 6de88b1f40e43b1714ae2431d8f157f7a84953ee Mon Sep 17 00:00:00 2001
From: Shahzad Malik Muzaffar <Shahzad.Malik.Muzaffar@cern.ch>
Date: Tue, 27 Feb 2018 22:46:32 +0100
Subject: [PATCH] enable new CXX11 ABI for 10.1.X; drop -fno-crossjumping flag

---
 gcc-toolfile.spec | 1 -
 gcc.spec          | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/gcc-toolfile.spec b/gcc-toolfile.spec
index e8f8681492e..492e9c922e2 100644
--- a/gcc-toolfile.spec
+++ b/gcc-toolfile.spec
@@ -149,7 +149,6 @@ COMPILER_CXXFLAGS="$COMPILER_CXXFLAGS -Werror=array-bounds -Werror=format-contai
 COMPILER_CXXFLAGS="$COMPILER_CXXFLAGS -fvisibility-inlines-hidden"
 COMPILER_CXXFLAGS="$COMPILER_CXXFLAGS -fno-math-errno --param vect-max-version-for-alias-checks=50"
 COMPILER_CXXFLAGS="$COMPILER_CXXFLAGS -Xassembler --compress-debug-sections"
-COMPILER_CXXFLAGS="$COMPILER_CXXFLAGS -fno-crossjumping"
 
 case %{cmsplatf} in
    *_amd64_*)
diff --git a/gcc.spec b/gcc.spec
index 6d7b1fa77ed..e79ab8e7818 100644
--- a/gcc.spec
+++ b/gcc.spec
@@ -289,7 +289,7 @@ export LD_LIBRARY_PATH=%{i}/lib64:%{i}/lib:$LD_LIBRARY_PATH
              --enable-__cxa_atexit --disable-libunwind-exceptions --enable-gnu-unique-object \
              --enable-plugin --with-linker-hash-style=gnu --enable-linker-build-id \
              $CONF_GCC_OS_SPEC $CONF_GCC_WITH_LTO --with-gmp=%{i} --with-mpfr=%{i} --enable-bootstrap \
-             --with-mpc=%{i} --with-isl=%{i} --with-default-libstdcxx-abi=gcc4-compatible --enable-checking=release \
+             --with-mpc=%{i} --with-isl=%{i} --enable-checking=release \
              --build=%{_build} --host=%{_host} --enable-libstdcxx-time=rt $CONF_GCC_ARCH_SPEC \
              --enable-shared --disable-libgcj CC="$CC" CXX="$CXX" CPP="$CPP" CXXCPP="$CXXCPP" \
              CFLAGS="-I%{i}/tmp/sw/include" CXXFLAGS="-I%{i}/tmp/sw/include" LDFLAGS="-L%{i}/tmp/sw/lib"