Fix build/host/target configure in settting of thread_file.

	* configure.in (thread_file): Rename uses before main loop to
	target_thread_file.  Initialize to empty in main loop.  Set thread_file
	to target_thread_file after main loop if not set.
	* configure: Rebuild.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@17423 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7286a0b..5313c3a 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,10 @@
 Mon Jan 19 11:15:38 1998  Jim Wilson  <wilson@cygnus.com>
 
+       * configure.in (thread_file): Rename uses before main loop to
+       target_thread_file.  Initialize to empty in main loop.  Set thread_file
+       to target_thread_file after main loop if not set.
+       * configure: Rebuild.
+
        * genattrtab.c (find_and_mark_used_attributes): Handle CONST_INT.
        (add_values_to_cover): Revert last change (which had no ChangeLog
        entry).

diff --git a/gcc/configure b/gcc/configure
index da2d978..a34b207 100755 (executable)
--- a/gcc/configure
+++ b/gcc/configure
@@ -656,15 +656,15 @@ fi
 case x${enable_threads} in
        x | xno)
                # No threads
-               thread_file='single'
+               target_thread_file='single'
                ;;
        xyes)
                # default
-               thread_file=''
+               target_thread_file=''
                ;;
        xdecosf1 | xirix | xmach | xos2 | xposix | xpthreads | xsingle | \
        xsolaris | xwin32 | xdce)
-               thread_file=$enable_threads
+               target_thread_file=$enable_threads
                ;;
        *)
                echo "$enable_threads is an unknown thread package" 1>&2
@@ -3152,6 +3152,8 @@ for machine in $build $host $target; do
        # Set this if the build machine requires executables to have a
        # file name suffix.
        exeext=
+       # Set this to control which thread package will be used.
+       thread_file=
 
        # Set default cpu_type, tm_file and xm_file so it can be updated in
        # each machine entry.
@@ -5709,8 +5711,12 @@ if [ "$host_xm_file" != "$build_xm_file" ]; then
        fi
 fi
 
-if [ x$thread_file = x ]
-then thread_file='single'
+if [ x$thread_file = x ]; then
+       if [ x$target_thread_file != x ]; then
+               thread_file=$target_thread_file
+       else
+               thread_file='single'
+       fi
 fi
 
 # Set up the header files.

diff --git a/gcc/configure.in b/gcc/configure.in
index def3962..360103c 100644 (file)
--- a/gcc/configure.in
+++ b/gcc/configure.in
@@ -107,15 +107,15 @@ enable_threads='')
 case x${enable_threads} in
        x | xno)
                # No threads
-               thread_file='single'
+               target_thread_file='single'
                ;;
        xyes)
                # default
-               thread_file=''
+               target_thread_file=''
                ;;
        xdecosf1 | xirix | xmach | xos2 | xposix | xpthreads | xsingle | \
        xsolaris | xwin32 | xdce)
-               thread_file=$enable_threads
+               target_thread_file=$enable_threads
                ;;
        *)
                echo "$enable_threads is an unknown thread package" 1>&2
@@ -252,6 +252,8 @@ for machine in $build $host $target; do
        # Set this if the build machine requires executables to have a
        # file name suffix.
        exeext=
+       # Set this to control which thread package will be used.
+       thread_file=
 
        # Set default cpu_type, tm_file and xm_file so it can be updated in
        # each machine entry.
@@ -2809,8 +2811,12 @@ if [[ "$host_xm_file" != "$build_xm_file" ]]; then
        fi
 fi
 
-if [[ x$thread_file = x ]]
-then thread_file='single'
+if [[ x$thread_file = x ]]; then
+       if [[ x$target_thread_file != x ]]; then
+               thread_file=$target_thread_file
+       else
+               thread_file='single'
+       fi
 fi
 
 # Set up the header files.