configure: Provide the original toplevel configure arguments (including $0) to...

	* configure: Provide the original toplevel configure arguments
	(including $0) to subprocesses in the environment rather than
	through gcc/configargs.h.

gcc:
	* configure.in: Take toplevel configure arguments from the
	environment to create configargs.h and substitute
	gcc_config_arguments, taking account of any existing configargs.h
	if reconfiguring.
	* configure: Regenerate.
	* gccbug.in: Include toplevel configure arguments in gccbug.

From-SVN: r37423

ChangeLog

 2000-11-13  Joseph S. Myers  <jsm28@cam.ac.uk>
 
+	* configure: Provide the original toplevel configure arguments
+	(including $0) to subprocesses in the environment rather than
+	through gcc/configargs.h.
+
+2000-11-13  Joseph S. Myers  <jsm28@cam.ac.uk>
+
 	* MAINTAINERS: Remove references to cccp. Change C9X reference to
 	C99.  Alphabetise "Write After Approval" list.
 

configure

@@ -89,7 +89,7 @@ subdirs=
 target_alias=NOTARGET
 target_makefile_frag=
 undefs=NOUNDEFS
-version="$Revision: 1.30 $"
+version="$Revision: 1.31 $"
 x11=default
 bindir='${exec_prefix}/bin'
 sbindir='${exec_prefix}/sbin'
@@ -162,6 +162,10 @@ case "${progname}" in
         ;;
 esac
 
+# Export original configure arguments for use by sub-configures.
+TOPLEVEL_CONFIGURE_ARGUMENTS="$progname $@"
+export TOPLEVEL_CONFIGURE_ARGUMENTS
+
 # Loop over all args
 
 while :
@@ -401,10 +405,6 @@ do
 	esac
 done
 
-# Remember the pristine configure arguments for later.  $arguments gets
-# built up with further defaults in preparation for recursion.
-original_arguments=$arguments
-
 # process host and target
 
 # Do some error checking and defaulting for the host and target type.
@@ -1605,14 +1605,6 @@ if [ -z "${norecursion}" ] && [ -n "${configdirs}" ] ; then
         done
 fi
 
-# Remember configure arguments for later.
-if [ -d gcc ]; then
-	cat > gcc/configargs.h <<EOF
-/* Generated automatically. */
-static const char configuration_arguments[] = "$original_arguments";
-EOF
-fi
-
 # Perform the same cleanup as the trap handler, minus the "exit 1" of course,
 # and reset the trap handler.
 rm -f ${tmpfile}.com ${tmpfile}.tgt ${tmpfile}.hst ${tmpfile}.pos

gcc/ChangeLog

+2000-11-13  Joseph S. Myers  <jsm28@cam.ac.uk>
+
+	* configure.in: Take toplevel configure arguments from the
+	environment to create configargs.h and substitute
+	gcc_config_arguments, taking account of any existing configargs.h
+	if reconfiguring.
+	* configure: Regenerate.
+	* gccbug.in: Include toplevel configure arguments in gccbug.
+
 2000-11-13  Richard Earnshaw  <rearnsha@arm.com>
 
 	* varasm.c (struct constant_descriptor): Put CONTENTS inside a

gcc/configure.in

@@ -4202,6 +4202,19 @@ fi
 changequote(,)dnl
 gcc_version_full=`grep version_string ${gcc_version_trigger} | sed -e 's/.*\"\([^\"]*\)\".*/\1/'`
 gcc_version=`echo ${gcc_version_full} | sed -e 's/\([^ ]*\) .*/\1/'`
+
+# Compile in configure arguments.
+if [ -e configargs.h ]; then
+	# Being re-configured.
+	gcc_config_arguments=`grep configuration_arguments configargs.h | sed -e 's/.*\"\([^\"]*\)\".*/\1/'`
+	gcc_config_arguments="$gcc_config_arguments : (reconfigured) $TOPLEVEL_CONFIGURE_ARGUMENTS"
+else
+	gcc_config_arguments="$TOPLEVEL_CONFIGURE_ARGUMENTS"
+fi
+cat > configargs.h <<EOF
+/* Generated automatically. */
+static const char configuration_arguments[] = "$gcc_config_arguments";
+EOF
 changequote([,])dnl
 
 # Internationalization
@@ -5175,6 +5188,7 @@ AC_SUBST(extra_parts)
 AC_SUBST(extra_passes)
 AC_SUBST(extra_programs)
 AC_SUBST(float_h_file)
+AC_SUBST(gcc_config_arguments)
 AC_SUBST(gcc_gxx_include_dir)
 AC_SUBST(gcc_version)
 AC_SUBST(gcc_version_full)
@@ -5290,6 +5304,7 @@ host_xmake_file='${host_xmake_file}'
 dep_tmake_file='${dep_tmake_file}'
 tmake_file='${tmake_file}'
 thread_file='${thread_file}'
+gcc_config_arguments='${gcc_config_arguments}'
 gcc_version='${gcc_version}'
 gcc_version_full='${gcc_version_full}'
 gcc_version_trigger='${gcc_version_trigger}'

gcc/gccbug.in

@@ -322,6 +322,7 @@ SEND-PR: support             I need help with gcc.
 host: @host@
 build: @build@
 target: @target@
+configured with: @gcc_config_arguments@
 >Description:
 	$DESCRIPTION_C
 >How-To-Repeat: