This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[committed] small thread configury cleanup
- From: neroden at twcny dot rr dot com (Nathanael Nerode)
- To: gcc-patches at gcc dot gnu dot org
- Date: Tue, 6 Apr 2004 22:15:26 -0400
- Subject: [committed] small thread configury cleanup
I'd like to clean this up so much more, but I haven't quite worked out
the right way yet... so this is an interim cleanup, which needed to be
done anyway.
Bootstrapped i686-pc-linux-gnu, tested various appropriate configurations,
committing.
* config.gcc: Stop changing enable_threads midstream.
Replace uses of enable_threads_flag with enable_threads.
* configure.ac: Replace uses of enable_threads_flag with
enable_threads. Improve autoconf quotation in one place.
* configure: Regenerate.
Index: config.gcc
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config.gcc,v
retrieving revision 1.447
diff -u -r1.447 config.gcc
--- config.gcc 1 Apr 2004 16:05:16 -0000 1.447
+++ config.gcc 5 Apr 2004 05:22:24 -0000
@@ -30,7 +30,7 @@
#
# with_* Various variables as set by configure.
#
-# enable_threads_flag Either the name, yes or no depending on whether
+# enable_threads Either the name, yes or no depending on whether
# threads support was requested.
#
# default_use_cxa_atexit
@@ -167,7 +167,6 @@
# configure entries modify them.
gas="$gas_flag"
gnu_ld="$gnu_ld_flag"
-enable_threads=$enable_threads_flag
default_use_cxa_atexit=no
target_gtfiles=
need_64bit_hwint=
@@ -790,13 +789,15 @@
target_cpu_default="(MASK_PA_11 | MASK_BIG_SWITCH)"
tm_file="${tm_file} pa/pa32-regs.h dbxelf.h pa/som.h pa/pa-hpux.h pa/pa-hpux10.h"
tmake_file="pa/t-pa pa/t-pa-hpux pa/t-hpux-shlib"
- if test x$enable_threads = x; then
- enable_threads=$have_pthread_h
- fi
- case x${enable_threads} in
- xyes | xdce)
- tmake_file="${tmake_file} pa/t-dce-thr"
- ;;
+ case ${enable_threads} in
+ "")
+ if test x$have_pthread_h = xyes ; then
+ tmake_file="${tmake_file} pa/t-dce-thr"
+ fi
+ ;;
+ yes | dce)
+ tmake_file="${tmake_file} pa/t-dce-thr"
+ ;;
esac
use_collect2=yes
use_fixproto=yes
@@ -804,13 +805,15 @@
hppa1.0-*-hpux10*)
tm_file="${tm_file} pa/pa32-regs.h dbxelf.h pa/som.h pa/pa-hpux.h pa/pa-hpux10.h"
tmake_file="pa/t-pa pa/t-pa-hpux pa/t-hpux-shlib"
- if test x$enable_threads = x; then
- enable_threads=$have_pthread_h
- fi
- case x${enable_threads} in
- xyes | xdce)
- tmake_file="${tmake_file} pa/t-dce-thr"
- ;;
+ case ${enable_threads} in
+ "")
+ if test x$have_pthread_h = xyes ; then
+ tmake_file="${tmake_file} pa/t-dce-thr"
+ fi
+ ;;
+ yes | dce)
+ tmake_file="${tmake_file} pa/t-dce-thr"
+ ;;
esac
use_collect2=yes
use_fixproto=yes
@@ -985,19 +988,11 @@
tmake_file="$tmake_file t-slibgcc-sld"
fi
extra_parts="crt1.o crti.o crtn.o gcrt1.o gmon.o crtbegin.o crtend.o"
- if test x${enable_threads} = x; then
- enable_threads=$have_pthread_h
- if test x${enable_threads} = x; then
- enable_threads=$have_thread_h
- fi
- fi
- if test x${enable_threads} = xyes; then
- if test x${have_pthread_h} = xyes; then
- thread_file='posix'
- else
- thread_file='solaris'
- fi
- fi
+ case ${enable_threads}:${have_pthread_h}:${have_thread_h} in
+ no:*:*) ;;
+ *:yes:* ) thread_file=posix ;;
+ yes:*:* | *:*:yes ) thread_file=solaris ;;
+ esac
;;
i[34567]86-*-sysv5*) # Intel x86 on System V Release 5
tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h i386/sysv4.h i386/sysv5.h"
@@ -1830,19 +1825,11 @@
tmake_file="$tmake_file t-slibgcc-sld"
fi
extra_parts="crt1.o crti.o crtn.o gcrt1.o crtbegin.o crtend.o"
- if test x${enable_threads} = x ; then
- enable_threads=$have_pthread_h
- if test x${enable_threads} = x ; then
- enable_threads=$have_thread_h
- fi
- fi
- if test x${enable_threads} = xyes ; then
- if test x${have_pthread_h} = xyes ; then
- thread_file='posix'
- else
- thread_file='solaris'
- fi
- fi
+ case ${enable_threads}:${have_pthread_h}:${have_thread_h} in
+ no:*:*) ;;
+ *:yes:* ) thread_file=posix ;;
+ yes:*:* | *:*:yes ) thread_file=solaris ;;
+ esac
need_64bit_hwint=yes
;;
sparc-*-solaris2*)
@@ -1875,19 +1862,11 @@
;;
esac
extra_parts="crt1.o crti.o crtn.o gcrt1.o gmon.o crtbegin.o crtend.o"
- if test x${enable_threads} = x; then
- enable_threads=$have_pthread_h
- if test x${enable_threads} = x; then
- enable_threads=$have_thread_h
- fi
- fi
- if test x${enable_threads} = xyes; then
- if test x${have_pthread_h} = xyes; then
- thread_file='posix'
- else
- thread_file='solaris'
- fi
- fi
+ case ${enable_threads}:${have_pthread_h}:${have_thread_h} in
+ no:*:*) ;;
+ *:yes:* ) thread_file=posix ;;
+ yes:*:* | *:*:yes ) thread_file=solaris ;;
+ esac
;;
sparc-*-sysv4*)
tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sparc/sysv4-only.h"
Index: configure.ac
===================================================================
RCS file: /cvs/gcc/gcc/gcc/configure.ac,v
retrieving revision 2.29
diff -u -r2.29 configure.ac
--- configure.ac 5 Apr 2004 03:58:42 -0000 2.29
+++ configure.ac 5 Apr 2004 05:22:26 -0000
@@ -571,9 +571,7 @@
AC_ARG_ENABLE(threads,
[ --enable-threads enable thread usage for target GCC
--enable-threads=LIB use LIB thread package for target GCC],,
-enable_threads='')
-# Save in case it gets overwritten in config.gcc
-enable_threads_flag=$enable_threads
+[enable_threads=''])
AC_ARG_ENABLE(objc-gc,
[ --enable-objc-gc enable the use of Boehm's garbage collector with
@@ -1212,7 +1210,7 @@
# ---------
# Check if a valid thread package
-case ${enable_threads_flag} in
+case ${enable_threads} in
"" | no)
# No threads
target_thread_file='single'
@@ -1223,10 +1221,10 @@
;;
aix | dce | gnat | irix | posix | rtems | \
single | solaris | vxworks | win32 )
- target_thread_file=${enable_threads_flag}
+ target_thread_file=${enable_threads}
;;
*)
- echo "${enable_threads_flag} is an unknown thread package" 1>&2
+ echo "${enable_threads} is an unknown thread package" 1>&2
exit 1
;;
esac
--
Make sure your vote will count.
http://www.verifiedvoting.org/