parent
f2906a8e9e
commit
01f3428caf
|
@ -1,3 +1,8 @@
|
||||||
|
2011-11-08 Richard Henderson <rth@redhat.com>
|
||||||
|
|
||||||
|
* configure.ac: Test libitm/configure.tgt to disable libitm.
|
||||||
|
* configure: Rebuild.
|
||||||
|
|
||||||
2011-11-07 Aldy Hernandez <aldyh@redhat.com>
|
2011-11-07 Aldy Hernandez <aldyh@redhat.com>
|
||||||
Richard Henderson <rth@redhat.com>
|
Richard Henderson <rth@redhat.com>
|
||||||
|
|
||||||
|
|
|
@ -3057,22 +3057,18 @@ if test x$enable_libgomp = x ; then
|
||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Disable libitm on non POSIX hosted systems.
|
# Disable libitm on unsupported hosted systems.
|
||||||
if test x$enable_libitm = x ; then
|
if test x$enable_libitm = x; then
|
||||||
# Enable libitm by default on hosted POSIX systems.
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libitm support" >&5
|
||||||
case "${target}" in
|
$as_echo_n "checking for libitm support... " >&6; }
|
||||||
*-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu)
|
if (. ${srcdir}/libitm/configure.tgt; test -n "$UNSUPPORTED"); then
|
||||||
;;
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||||
*-*-netbsd* | *-*-freebsd* | *-*-openbsd*)
|
$as_echo "no" >&6; }
|
||||||
;;
|
|
||||||
*-*-solaris2* | *-*-sysv4* | *-*-irix6* | *-*-osf* | *-*-hpux11*)
|
|
||||||
;;
|
|
||||||
*-*-darwin* | *-*-aix*)
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
noconfigdirs="$noconfigdirs target-libitm"
|
noconfigdirs="$noconfigdirs target-libitm"
|
||||||
;;
|
else
|
||||||
esac
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||||
|
$as_echo "yes" >&6; }
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Disable libssp for some systems.
|
# Disable libssp for some systems.
|
||||||
|
|
23
configure.ac
23
configure.ac
|
@ -493,22 +493,15 @@ if test x$enable_libgomp = x ; then
|
||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Disable libitm on non POSIX hosted systems.
|
# Disable libitm on unsupported hosted systems.
|
||||||
if test x$enable_libitm = x ; then
|
if test x$enable_libitm = x; then
|
||||||
# Enable libitm by default on hosted POSIX systems.
|
AC_MSG_CHECKING([for libitm support])
|
||||||
case "${target}" in
|
if (. ${srcdir}/libitm/configure.tgt; test -n "$UNSUPPORTED"); then
|
||||||
*-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu)
|
AC_MSG_RESULT([no])
|
||||||
;;
|
|
||||||
*-*-netbsd* | *-*-freebsd* | *-*-openbsd*)
|
|
||||||
;;
|
|
||||||
*-*-solaris2* | *-*-sysv4* | *-*-irix6* | *-*-osf* | *-*-hpux11*)
|
|
||||||
;;
|
|
||||||
*-*-darwin* | *-*-aix*)
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
noconfigdirs="$noconfigdirs target-libitm"
|
noconfigdirs="$noconfigdirs target-libitm"
|
||||||
;;
|
else
|
||||||
esac
|
AC_MSG_RESULT([yes])
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Disable libssp for some systems.
|
# Disable libssp for some systems.
|
||||||
|
|
|
@ -1,3 +1,10 @@
|
||||||
|
2011-11-08 Richard Henderson <rth@redhat.com>
|
||||||
|
|
||||||
|
* configure.ac: Exit if unsupported.
|
||||||
|
* configure: Rebuild.
|
||||||
|
* configure.tgt: Delete boilerplate from libgomp for unsupported
|
||||||
|
targets. Set UNSUPPORTED for unsupported targets.
|
||||||
|
|
||||||
2011-11-08 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
|
2011-11-08 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
|
||||||
|
|
||||||
* configure.tgt: Handle i386 like i[456]86.
|
* configure.tgt: Handle i386 like i[456]86.
|
||||||
|
|
|
@ -17003,6 +17003,10 @@ _ACEOF
|
||||||
|
|
||||||
# Get target configury.
|
# Get target configury.
|
||||||
. ${srcdir}/configure.tgt
|
. ${srcdir}/configure.tgt
|
||||||
|
if test -n "$UNSUPPORTED"; then
|
||||||
|
as_fn_error "Configuration ${target} is unsupported." "$LINENO" 5
|
||||||
|
fi
|
||||||
|
|
||||||
CFLAGS="$save_CFLAGS $XCFLAGS"
|
CFLAGS="$save_CFLAGS $XCFLAGS"
|
||||||
|
|
||||||
# Check for __sync_val_compare_and_swap, but only after the target has
|
# Check for __sync_val_compare_and_swap, but only after the target has
|
||||||
|
|
|
@ -224,6 +224,10 @@ LIBITM_CHECK_SIZE_T_MANGLING
|
||||||
|
|
||||||
# Get target configury.
|
# Get target configury.
|
||||||
. ${srcdir}/configure.tgt
|
. ${srcdir}/configure.tgt
|
||||||
|
if test -n "$UNSUPPORTED"; then
|
||||||
|
AC_MSG_ERROR([Configuration ${target} is unsupported.])
|
||||||
|
fi
|
||||||
|
|
||||||
CFLAGS="$save_CFLAGS $XCFLAGS"
|
CFLAGS="$save_CFLAGS $XCFLAGS"
|
||||||
|
|
||||||
# Check for __sync_val_compare_and_swap, but only after the target has
|
# Check for __sync_val_compare_and_swap, but only after the target has
|
||||||
|
|
|
@ -28,7 +28,7 @@
|
||||||
# XLDFLAGS Add extra link flags to use.
|
# XLDFLAGS Add extra link flags to use.
|
||||||
|
|
||||||
# Optimize TLS usage by avoiding the overhead of dynamic allocation.
|
# Optimize TLS usage by avoiding the overhead of dynamic allocation.
|
||||||
if test $gcc_cv_have_tls = yes ; then
|
if test "$gcc_cv_have_tls" = yes ; then
|
||||||
case "${target}" in
|
case "${target}" in
|
||||||
|
|
||||||
# For x86, we use slots in the TCB head for most of our TLS.
|
# For x86, we use slots in the TCB head for most of our TLS.
|
||||||
|
@ -47,10 +47,6 @@ fi
|
||||||
# work out any special compilation flags as necessary.
|
# work out any special compilation flags as necessary.
|
||||||
case "${target_cpu}" in
|
case "${target_cpu}" in
|
||||||
alpha*) ARCH=alpha ;;
|
alpha*) ARCH=alpha ;;
|
||||||
ia64*) ARCH=ia64 ;;
|
|
||||||
mips*) ARCH=mips ;;
|
|
||||||
powerpc*) ARCH=powerpc ;;
|
|
||||||
s390*) ARCH=s390 ;;
|
|
||||||
|
|
||||||
i[3456]86)
|
i[3456]86)
|
||||||
case " ${CC} ${CFLAGS} " in
|
case " ${CC} ${CFLAGS} " in
|
||||||
|
@ -75,57 +71,33 @@ case "${target_cpu}" in
|
||||||
ARCH=x86
|
ARCH=x86
|
||||||
;;
|
;;
|
||||||
|
|
||||||
sparcv9 | sparc64)
|
|
||||||
# Note that sparcv7 and sparcv8 is not included here. We need cas.
|
|
||||||
echo "int i;" > conftestx.c
|
|
||||||
if ${CC} ${CFLAGS} -c -o conftestx.o conftestx.c > /dev/null 2>&1; then
|
|
||||||
case "`/usr/bin/file conftestx.o`" in
|
|
||||||
*32-bit*)
|
|
||||||
case " ${CC} ${CFLAGS}" in
|
|
||||||
*" -mcpu=ultrasparc"*)
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
XCFLAGS="${XCFLAGS} -mcpu=v9"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
rm -f conftestx.c conftestx.o
|
|
||||||
ARCH=sparc
|
|
||||||
;;
|
|
||||||
|
|
||||||
*)
|
*)
|
||||||
ARCH="${target_cpu}"
|
ARCH="${target_cpu}"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
# For the benefit of top-level configure, determine if the cpu is supported.
|
||||||
|
test -d ${srcdir}/$ARCH || UNSUPPORTED=1
|
||||||
|
|
||||||
# Since we require POSIX threads, assume a POSIX system by default.
|
# Since we require POSIX threads, assume a POSIX system by default.
|
||||||
config_path="$ARCH posix generic"
|
config_path="$ARCH posix generic"
|
||||||
|
|
||||||
# Other system configury
|
# Other system configury
|
||||||
case "${target}" in
|
case "${target}" in
|
||||||
*-*-linux*)
|
*-*-linux*)
|
||||||
if test $enable_linux_futex = yes; then
|
if test "$enable_linux_futex" = yes; then
|
||||||
config_path="linux/$ARCH linux $config_path"
|
config_path="linux/$ARCH linux $config_path"
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
|
|
||||||
*-*-hpux11*)
|
*-*-gnu* | *-*-k*bsd*-gnu \
|
||||||
# HPUX v11.x requires -lrt to resolve sem_init in libgomp.la
|
| *-*-netbsd* | *-*-freebsd* | *-*-openbsd* \
|
||||||
XLDFLAGS="${XLDFLAGS} -lrt"
|
| *-*-solaris2* | *-*-sysv4* | *-*-irix6* | *-*-osf* | *-*-hpux11* \
|
||||||
|
| *-*-darwin* | *-*-aix*)
|
||||||
|
# POSIX system. The OS is supported.
|
||||||
;;
|
;;
|
||||||
|
|
||||||
*-*-mingw32*)
|
*) # Non-POSIX, or embedded system
|
||||||
config_path="$ARCH mingw32 posix generic"
|
UNSUPPORTED=1
|
||||||
;;
|
|
||||||
|
|
||||||
*-*-solaris2.[56]*)
|
|
||||||
config_path="$ARCH posix95 posix generic"
|
|
||||||
XLDFLAGS="${XLDFLAGS} -lposix4"
|
|
||||||
;;
|
|
||||||
|
|
||||||
*-*-darwin*)
|
|
||||||
config_path="$ARCH bsd posix generic"
|
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
Loading…
Reference in New Issue