From a24a71cc6496db1e245b9cb55cbe7f5d8d2fe2e3 Mon Sep 17 00:00:00 2001
From: nathan <nathan@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Mon, 14 Dec 2009 08:58:06 +0000
Subject: [PATCH] 	* configure.ac (--with-specs): New option. 	*
 configure: Regenerated. 	* gcc.c (driver_self_specs): Include
 CONFIGURE_SPECS. 	* Makefile.in (DRIVER_DEFINES): Add -DCONFIGURE_SPECS.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@155208 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/Makefile.in  |  3 ++-
 gcc/configure    | 18 ++++++++++++++++--
 gcc/configure.ac |  8 ++++++++
 gcc/gcc.c        |  2 +-
 4 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 9379a206304..21be2daef98 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -2100,7 +2100,8 @@ DRIVER_DEFINES = \
   -DTOOLDIR_BASE_PREFIX=\"$(libsubdir_to_prefix)$(prefix_to_exec_prefix)\" \
   @TARGET_SYSTEM_ROOT_DEFINE@ \
   $(VALGRIND_DRIVER_DEFINES) \
-  `test "X$${SHLIB_LINK}" = "X" || test "@enable_shared@" != "yes" || echo "-DENABLE_SHARED_LIBGCC"`
+  `test "X$${SHLIB_LINK}" = "X" || test "@enable_shared@" != "yes" || echo "-DENABLE_SHARED_LIBGCC"` \
+  -DCONFIGURE_SPECS="\"@CONFIGURE_SPECS@\""
 
 gcc.o: gcc.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) intl.h multilib.h \
     Makefile $(lang_specs_files) specs.h prefix.h $(GCC_H) $(FLAGS_H) \
diff --git a/gcc/configure b/gcc/configure
index 8c72a938e6e..ac223471a6e 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -757,6 +757,7 @@ REPORT_BUGS_TEXI
 REPORT_BUGS_TO
 PKGVERSION
 onestep
+CONFIGURE_SPECS
 CROSS_SYSTEM_HEADER_DIR
 TARGET_SYSTEM_ROOT_DEFINE
 TARGET_SYSTEM_ROOT
@@ -880,6 +881,7 @@ with_dwarf2
 enable_shared
 with_build_sysroot
 with_sysroot
+with_specs
 enable_intermodule
 with_pkgversion
 with_bugurl
@@ -1632,6 +1634,7 @@ Optional Packages:
   --with-build-sysroot=sysroot
                           use sysroot as the system root during the build
   --with-sysroot=DIR Search for usr/lib, usr/include, et al, within DIR.
+  --with-specs=SPECS      add SPECS to driver command-line processing
   --with-pkgversion=PKG   Use PKG in the version string in place of "GCC"
   --with-bugurl=URL       Direct users to URL to report a bug
   --with-multilib-list    Select multilibs (SH only)
@@ -6853,6 +6856,17 @@ fi
 
 
 
+
+# Check whether --with-specs was given.
+if test "${with_specs+set}" = set; then :
+  withval=$with_specs; CONFIGURE_SPECS=$withval
+else
+  CONFIGURE_SPECS=
+
+fi
+
+
+
 # Build with intermodule optimisations
 # Check whether --enable-intermodule was given.
 if test "${enable_intermodule+set}" = set; then :
@@ -17023,7 +17037,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 17026 "configure"
+#line 17040 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -17129,7 +17143,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 17132 "configure"
+#line 17146 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
diff --git a/gcc/configure.ac b/gcc/configure.ac
index 6ea6d7a8668..9622c23fd36 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -785,6 +785,14 @@ AC_SUBST(TARGET_SYSTEM_ROOT)
 AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE)
 AC_SUBST(CROSS_SYSTEM_HEADER_DIR)
 
+AC_ARG_WITH(specs,
+  [AS_HELP_STRING([--with-specs=SPECS],
+                  [add SPECS to driver command-line processing])],
+  [CONFIGURE_SPECS=$withval],
+  [CONFIGURE_SPECS=]
+)
+AC_SUBST(CONFIGURE_SPECS)
+
 # Build with intermodule optimisations
 AC_ARG_ENABLE(intermodule,
 [  --enable-intermodule    build the compiler in one step],
diff --git a/gcc/gcc.c b/gcc/gcc.c
index 543cb5a74b3..ad69de7bd22 100644
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -955,7 +955,7 @@ static const char *const multilib_defaults_raw[] = MULTILIB_DEFAULTS;
 
 static const char *const driver_self_specs[] = {
   "%{fdump-final-insns:-fdump-final-insns=.} %<fdump-final-insns",
-  DRIVER_SELF_SPECS, GOMP_SELF_SPECS
+  DRIVER_SELF_SPECS, CONFIGURE_SPECS, GOMP_SELF_SPECS
 };
 
 #ifndef OPTION_DEFAULT_SPECS
-- 
2.11.4.GIT