b25b081
diff -rup binutils.orig/configure binutils-2.30/configure
b25b081
--- binutils.orig/configure	2018-09-24 17:50:06.967172922 +0100
b25b081
+++ binutils-2.30/configure	2018-09-24 17:51:16.648624865 +0100
b25b081
@@ -4996,49 +4996,6 @@ if test -z "$LD"; then
b25b081
   fi
b25b081
 fi
b25b081
 
b25b081
-# Check whether -static-libstdc++ -static-libgcc is supported.
b25b081
-have_static_libs=no
b25b081
-if test "$GCC" = yes; then
b25b081
-  saved_LDFLAGS="$LDFLAGS"
b25b081
-
b25b081
-  LDFLAGS="$LDFLAGS -static-libstdc++ -static-libgcc"
b25b081
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether g++ accepts -static-libstdc++ -static-libgcc" >&5
b25b081
-$as_echo_n "checking whether g++ accepts -static-libstdc++ -static-libgcc... " >&6; }
b25b081
-  ac_ext=cpp
b25b081
-ac_cpp='$CXXCPP $CPPFLAGS'
b25b081
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
b25b081
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
b25b081
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
b25b081
-
b25b081
-
b25b081
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
b25b081
-/* end confdefs.h.  */
b25b081
-
b25b081
-#if (__GNUC__ < 4) || (__GNUC__ == 4 && __GNUC_MINOR__ < 5)
b25b081
-#error -static-libstdc++ not implemented
b25b081
-#endif
b25b081
-int main() {}
b25b081
-_ACEOF
b25b081
-if ac_fn_cxx_try_link "$LINENO"; then :
b25b081
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
b25b081
-$as_echo "yes" >&6; }; have_static_libs=yes
b25b081
-else
b25b081
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
b25b081
-$as_echo "no" >&6; }
b25b081
-fi
b25b081
-rm -f core conftest.err conftest.$ac_objext \
b25b081
-    conftest$ac_exeext conftest.$ac_ext
b25b081
-  ac_ext=c
b25b081
-ac_cpp='$CPP $CPPFLAGS'
b25b081
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
b25b081
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
b25b081
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
b25b081
-
b25b081
-
b25b081
-  LDFLAGS="$saved_LDFLAGS"
b25b081
-fi
b25b081
-
b25b081
-
b25b081
 
b25b081
 
b25b081
 if test -n "$ac_tool_prefix"; then
b25b081
diff -rup binutils.orig/configure.ac binutils-2.30/configure.ac
b25b081
--- binutils.orig/configure.ac	2018-09-24 17:50:07.241170767 +0100
b25b081
+++ binutils-2.30/configure.ac	2018-09-24 17:50:29.908992486 +0100
b25b081
@@ -1288,26 +1288,6 @@ if test -z "$LD"; then
b25b081
   fi
b25b081
 fi
b25b081
 
b25b081
-# Check whether -static-libstdc++ -static-libgcc is supported.
b25b081
-have_static_libs=no
b25b081
-if test "$GCC" = yes; then
b25b081
-  saved_LDFLAGS="$LDFLAGS"
b25b081
-
b25b081
-  LDFLAGS="$LDFLAGS -static-libstdc++ -static-libgcc"
b25b081
-  AC_MSG_CHECKING([whether g++ accepts -static-libstdc++ -static-libgcc])
b25b081
-  AC_LANG_PUSH(C++)
b25b081
-  AC_LINK_IFELSE([AC_LANG_SOURCE([
b25b081
-#if (__GNUC__ < 4) || (__GNUC__ == 4 && __GNUC_MINOR__ < 5)
b25b081
-#error -static-libstdc++ not implemented
b25b081
-#endif
b25b081
-int main() {}])],
b25b081
-    [AC_MSG_RESULT([yes]); have_static_libs=yes],
b25b081
-    [AC_MSG_RESULT([no])])
b25b081
-  AC_LANG_POP(C++)
b25b081
-
b25b081
-  LDFLAGS="$saved_LDFLAGS"
b25b081
-fi
b25b081
-
b25b081
 ACX_PROG_GNAT
b25b081
 ACX_PROG_CMP_IGNORE_INITIAL
b25b081