From 769e49eb03b412604d9909b9e9c8ab4a87703dd1 Mon Sep 17 00:00:00 2001 From: Nathanael Nerode Date: Wed, 8 Oct 2003 21:32:50 +0000 Subject: [PATCH] config.gcc: Don't accept --enable-threads=pthreads. * config.gcc: Don't accept --enable-threads=pthreads. Clean up related case statements. * configure.in: Don't accept --enable-threads=pthreads, decosf1, mach, or os2 (none of which work anyway). Alphabetize supported thread files in case clause. * configure: Regenerate. From-SVN: r72244 --- gcc/ChangeLog | 9 +++++++++ gcc/config.gcc | 22 +++++++++++----------- gcc/configure | 4 ++-- gcc/configure.in | 4 ++-- 4 files changed, 24 insertions(+), 15 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 544f37472cb..2139eab2de8 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2003-10-08 Nathanael Nerode + + * config.gcc: Don't accept --enable-threads=pthreads. Clean + up related case statements. + * configure.in: Don't accept --enable-threads=pthreads, + decosf1, mach, or os2 (none of which work anyway). Alphabetize + supported thread files in case clause. + * configure: Regenerate. + 2003-10-08 Geoffrey Keating * function.c (pad_to_arg_alignment): Move 'boundary_in_bytes' diff --git a/gcc/config.gcc b/gcc/config.gcc index f58e854c282..1a13e1c7f78 100644 --- a/gcc/config.gcc +++ b/gcc/config.gcc @@ -381,7 +381,7 @@ case ${target} in no) fbsd_tm_file="${fbsd_tm_file} freebsd-nthr.h" ;; - "" | yes | pthreads | posix) + "" | yes | posix) thread_file='posix' tmake_file="${tmake_file} t-freebsd-thread" # Before 5.0, FreeBSD can't bind shared libraries to -lc @@ -567,8 +567,8 @@ alpha*-dec-osf[45]*) target_cpu_default=MASK_SUPPORT_ARCH ;; esac - case x${enable_threads} in - x | xyes | xpthreads | xposix) + case ${enable_threads} in + "" | yes | posix) thread_file='posix' tmake_file="${tmake_file} alpha/t-osf-pthread" ;; @@ -620,10 +620,10 @@ arm*-*-linux*) # ARM GNU/Linux with ELF tmake_file="t-slibgcc-elf-ver t-linux arm/t-linux" extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o" gnu_ld=yes - case x${enable_threads} in - x | xyes | xpthreads | xposix) - thread_file='posix' - ;; + case ${enable_threads} in + "" | yes | posix) + thread_file='posix' + ;; esac ;; arm*-*-uclinux*) # ARM ucLinux @@ -1609,10 +1609,10 @@ powerpc-*-netbsd*) powerpc-*-chorusos*) tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h chorus.h" tmake_file="rs6000/t-fprules rs6000/t-ppcos rs6000/t-ppccomm" - case x${enable_threads} in - xyes | xpthreads | xposix) - thread_file='posix' - ;; + case ${enable_threads} in + yes | posix) + thread_file='posix' + ;; esac use_fixproto=yes ;; diff --git a/gcc/configure b/gcc/configure index 214c0fc799c..ce98920a719 100755 --- a/gcc/configure +++ b/gcc/configure @@ -5248,8 +5248,8 @@ case ${enable_threads_flag} in # default target_thread_file='single' ;; - decosf1 | irix | mach | os2 | posix | pthreads | single | \ - solaris | win32 | dce | rtems| vxworks | aix | gnat) + aix | dce | gnat | irix | posix | rtems | \ + single | solaris | vxworks | win32 ) target_thread_file=${enable_threads_flag} ;; *) diff --git a/gcc/configure.in b/gcc/configure.in index a08f1317b31..b57aff2006c 100644 --- a/gcc/configure.in +++ b/gcc/configure.in @@ -1070,8 +1070,8 @@ case ${enable_threads_flag} in # default target_thread_file='single' ;; - decosf1 | irix | mach | os2 | posix | pthreads | single | \ - solaris | win32 | dce | rtems| vxworks | aix | gnat) + aix | dce | gnat | irix | posix | rtems | \ + single | solaris | vxworks | win32 ) target_thread_file=${enable_threads_flag} ;; *) -- 2.30.2