config.gcc: Stop changing enable_threads midstream.
* 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. From-SVN: r80473
This commit is contained in:
Nathanael Nerode
parent
1367264041
commit
615be2cfe6
4 changed files with 50 additions and 67 deletions
|
|
@ -1,3 +1,11 @@
|
|||
2004-04-06 Nathanael Nerode <neroden@gcc.gnu.org>
|
||||
|
||||
* 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.
|
||||
|
||||
2004-04-06 Uros Bizjak <uros@kss-loka.si>
|
||||
|
||||
* builtins.c: Implement support for sincos function.
|
||||
|
|
|
|||
|
|
@ -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 @@ thread_file=
|
|||
# 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 @@ hppa1.1-*-hpux10* | hppa2*-*-hpux10*)
|
|||
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.1-*-hpux10* | hppa2*-*-hpux10*)
|
|||
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 @@ i[34567]86-*-solaris2*)
|
|||
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 @@ sparc64-*-solaris2* | sparcv9-*-solaris2*)
|
|||
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 @@ sparc-*-solaris2*)
|
|||
;;
|
||||
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"
|
||||
|
|
|
|||
10
gcc/configure
vendored
10
gcc/configure
vendored
|
|
@ -4690,8 +4690,6 @@ if test "${enable_threads+set}" = set; then
|
|||
else
|
||||
enable_threads=''
|
||||
fi;
|
||||
# Save in case it gets overwritten in config.gcc
|
||||
enable_threads_flag=$enable_threads
|
||||
|
||||
# Check whether --enable-objc-gc or --disable-objc-gc was given.
|
||||
if test "${enable_objc_gc+set}" = set; then
|
||||
|
|
@ -5261,7 +5259,7 @@ if test "${gcc_cv_prog_makeinfo_modern+set}" = set; then
|
|||
else
|
||||
ac_prog_version=`$MAKEINFO --version 2>&1 |
|
||||
sed -n 's/^.*GNU texinfo.* \([0-9][0-9.]*\).*$/\1/p'`
|
||||
echo "configure:5264: version of makeinfo is $ac_prog_version" >&5
|
||||
echo "configure:5262: version of makeinfo is $ac_prog_version" >&5
|
||||
case $ac_prog_version in
|
||||
'') gcc_cv_prog_makeinfo_modern=no;;
|
||||
4.[2-9]*)
|
||||
|
|
@ -9293,7 +9291,7 @@ fi
|
|||
# ---------
|
||||
|
||||
# Check if a valid thread package
|
||||
case ${enable_threads_flag} in
|
||||
case ${enable_threads} in
|
||||
"" | no)
|
||||
# No threads
|
||||
target_thread_file='single'
|
||||
|
|
@ -9304,10 +9302,10 @@ case ${enable_threads_flag} in
|
|||
;;
|
||||
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
|
||||
|
|
|
|||
|
|
@ -571,9 +571,7 @@ AC_ARG_ENABLE(__cxa_atexit,
|
|||
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 @@ fi
|
|||
# ---------
|
||||
|
||||
# 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 @@ case ${enable_threads_flag} in
|
|||
;;
|
||||
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
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue