Skip to content

Commit

Permalink
Merge pull request #3780 from cms-sw/enable-cxx11-abi
Browse files Browse the repository at this point in the history
enable new CXX11 ABI for 10.1.X; drop -fno-crossjumping flag
  • Loading branch information
smuzaffar committed Feb 27, 2018
2 parents 2641711 + 6de88b1 commit 8460b58
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
1 change: 0 additions & 1 deletion gcc-toolfile.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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_*)
Expand Down
2 changes: 1 addition & 1 deletion gcc.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 8460b58

Please sign in to comment.