diff options
| -rw-r--r-- | .gitignore | 9 | ||||
| -rw-r--r-- | ChangeLog | 47 | ||||
| -rw-r--r-- | Makefile.def | 1 | ||||
| -rw-r--r-- | Makefile.in | 13 | ||||
| -rw-r--r-- | Makefile.tpl | 12 | ||||
| -rwxr-xr-x | config.guess | 23 | ||||
| -rwxr-xr-x | config.sub | 18 | ||||
| -rw-r--r-- | config/isl.m4 | 35 | ||||
| -rwxr-xr-x | configure | 41 | ||||
| -rw-r--r-- | configure.ac | 18 | ||||
| -rw-r--r-- | include/ChangeLog | 10 | ||||
| -rw-r--r-- | include/longlong.h | 4 |
12 files changed, 167 insertions, 64 deletions
@@ -32,6 +32,11 @@ POTFILES TAGS TAGS.sub +.local.vimrc +.lvimrc + +.clang-format + .gdbinit .gdb_history @@ -40,3 +45,7 @@ core !core/ lost+found + +# ignore ./contrib/gcc_update output +LAST_UPDATED +REVISION @@ -1,3 +1,50 @@ +2016-01-11 Nick Clifton <nickc@redhat.com> + + Import the following changes from the GCC mainline: + + 2015-11-13 Tsvetkova Alexandra <aleksandra.tsvetkova@intel.com> + + * configure.ac: Enable libmpx by default. + * configure: Regenerated. + + 2015-11-19 Martin Liska <mliska@suse.cz> + + * .gitignore: Add .clang-format to ignored files. + * Makefile.tpl: Add clang-format. + * Makefile.in: Regenerate. + + 2015-12-01 Andreas Tobler <andreast@gcc.gnu.org> + + PR libffi/65726 + * Makefile.def (lang_env_dependencies): Make libffi depend + on cxx. + * Makefile.in: Regenerate. + + 2015-12-02 Ian Lance Taylor <iant@google.com> + + PR go/66147 + * Makefile.tpl (HOST_EXPORTS): Add XGCC_FLAGS_FOR_TARGET. + * Makefile.in: Regenerate. + + 2015-12-17 Nathan Sidwell <nathan@acm.org> + + * config/isl.m4 (ISL_CHECK_VERSION): Add gmp libs. + * configure: Regenerate. + + 2015-12-17 Sebastian Pop <s.pop@samsung.com> + + * Makefile.in: Replace ISL with isl. + * Makefile.tpl: Same. + * config/isl.m4: Same. + * configure.ac: Same. + * contrib/download_prerequisites: Same. + * configure: Regenerate. + + 2016-01-01 Ben Elliston <bje@gnu.org> + + * config.guess: Import version 2016-01-01. + * config.sub: Likewise. + 2015-11-20 Tristan Gingold <gingold@adacore.com> * configure.ac: Add aarch64-*-darwin* and arm-*-darwin*. diff --git a/Makefile.def b/Makefile.def index 8b4dad9..3582980 100644 --- a/Makefile.def +++ b/Makefile.def @@ -534,6 +534,7 @@ dependencies = { module=all-m4; on=all-build-texinfo; }; // on libgcc and newlib/libgloss. lang_env_dependencies = { module=libjava; cxx=true; }; lang_env_dependencies = { module=libitm; cxx=true; }; +lang_env_dependencies = { module=libffi; cxx=true; }; lang_env_dependencies = { module=libcilkrts; cxx=true; }; lang_env_dependencies = { module=liboffloadmic; cxx=true; }; lang_env_dependencies = { module=newlib; no_c=true; }; diff --git a/Makefile.in b/Makefile.in index bc2bae6..e9b5950 100644 --- a/Makefile.in +++ b/Makefile.in @@ -224,6 +224,7 @@ HOST_EXPORTS = \ ISLINC="$(HOST_ISLINC)"; export ISLINC; \ LIBELFLIBS="$(HOST_LIBELFLIBS)"; export LIBELFLIBS; \ LIBELFINC="$(HOST_LIBELFINC)"; export LIBELFINC; \ + XGCC_FLAGS_FOR_TARGET="$(XGCC_FLAGS_FOR_TARGET)"; export XGCC_FLAGS_FOR_TARGET; \ @if gcc-bootstrap $(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \ @endif gcc-bootstrap @@ -311,7 +312,7 @@ NORMAL_TARGET_EXPORTS = \ HOST_GMPLIBS = @gmplibs@ HOST_GMPINC = @gmpinc@ -# Where to find ISL +# Where to find isl HOST_ISLLIBS = @isllibs@ HOST_ISLINC = @islinc@ @@ -2461,6 +2462,15 @@ vimrc: $(srcdir)/.local.vimrc $(srcdir)/.lvimrc .PHONY: vimrc +# clang-format config + +$(srcdir)/.clang-format: + $(LN_S) contrib/clang-format $@ + +clang-format: $(srcdir)/.clang-format + +.PHONY: clang-format + # Installation targets. .PHONY: install uninstall @@ -51025,6 +51035,7 @@ configure-target-winsup: maybe-all-target-newlib maybe-all-target-libgloss configure-target-libffi: maybe-all-target-newlib maybe-all-target-libgloss +configure-target-libffi: maybe-all-target-libstdc++-v3 configure-target-libjava: maybe-all-target-newlib maybe-all-target-libgloss configure-target-libjava: maybe-all-target-libstdc++-v3 diff --git a/Makefile.tpl b/Makefile.tpl index 660e1e4..f7bb77e 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -227,6 +227,7 @@ HOST_EXPORTS = \ ISLINC="$(HOST_ISLINC)"; export ISLINC; \ LIBELFLIBS="$(HOST_LIBELFLIBS)"; export LIBELFLIBS; \ LIBELFINC="$(HOST_LIBELFINC)"; export LIBELFINC; \ + XGCC_FLAGS_FOR_TARGET="$(XGCC_FLAGS_FOR_TARGET)"; export XGCC_FLAGS_FOR_TARGET; \ @if gcc-bootstrap $(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \ @endif gcc-bootstrap @@ -314,7 +315,7 @@ NORMAL_TARGET_EXPORTS = \ HOST_GMPLIBS = @gmplibs@ HOST_GMPINC = @gmpinc@ -# Where to find ISL +# Where to find isl HOST_ISLLIBS = @isllibs@ HOST_ISLINC = @islinc@ @@ -889,6 +890,15 @@ vimrc: $(srcdir)/.local.vimrc $(srcdir)/.lvimrc .PHONY: vimrc +# clang-format config + +$(srcdir)/.clang-format: + $(LN_S) contrib/clang-format $@ + +clang-format: $(srcdir)/.clang-format + +.PHONY: clang-format + # Installation targets. .PHONY: install uninstall diff --git a/config.guess b/config.guess index fddac42..802e5f1 100755 --- a/config.guess +++ b/config.guess @@ -1,8 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2015 Free Software Foundation, Inc. +# Copyright 1992-2016 Free Software Foundation, Inc. -timestamp='2015-07-03' +timestamp='2016-01-11' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -27,7 +27,7 @@ timestamp='2015-07-03' # Originally written by Per Bothner; maintained since 2000 by Ben Elliston. # # You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess # # Please send patches to <config-patches@gnu.org>. @@ -50,7 +50,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2015 Free Software Foundation, Inc. +Copyright 1992-2016 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -249,6 +249,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:MirBSD:*:*) echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} exit ;; + *:Sortix:*:*) + echo ${UNAME_MACHINE}-unknown-sortix + exit ;; alpha:OSF1:*:*) case $UNAME_RELEASE in *4.0) @@ -962,6 +965,9 @@ EOF ia64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; + k1om:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; m32r*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; @@ -1117,7 +1123,7 @@ EOF # uname -m prints for DJGPP always 'pc', but it prints nothing about # the processor, so we play safe by assuming i586. # Note: whatever this is, it MUST be the same as what config.sub - # prints for the "djgpp" host, or else GDB configury will decide that + # prints for the "djgpp" host, or else GDB configure will decide that # this is a cross-build. echo i586-pc-msdosdjgpp exit ;; @@ -1387,6 +1393,9 @@ EOF x86_64:VMkernel:*:*) echo ${UNAME_MACHINE}-unknown-esx exit ;; + amd64:Isilon\ OneFS:*:*) + echo x86_64-unknown-onefs + exit ;; esac cat >&2 <<EOF @@ -1396,9 +1405,9 @@ This script, last modified $timestamp, has failed to recognize the operating system you are using. It is advised that you download the most up to date version of the config scripts from - http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess and - http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub If the version you run ($0) is already up to date, please send the following data and any information you think might be @@ -1,8 +1,8 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2015 Free Software Foundation, Inc. +# Copyright 1992-2016 Free Software Foundation, Inc. -timestamp='2015-07-28' +timestamp='2016-01-11' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -33,7 +33,7 @@ timestamp='2015-07-28' # Otherwise, we print the canonical config type on stdout and succeed. # You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub # This file is supposed to be the same for all GNU packages # and recognize all the CPU types, system types and aliases @@ -53,8 +53,7 @@ timestamp='2015-07-28' me=`echo "$0" | sed -e 's,.*/,,'` usage="\ -Usage: $0 [OPTION] CPU-MFR-OPSYS - $0 [OPTION] ALIAS +Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS Canonicalize a configuration name. @@ -68,7 +67,7 @@ Report bugs and patches to <config-patches@gnu.org>." version="\ GNU config.sub ($timestamp) -Copyright 1992-2015 Free Software Foundation, Inc. +Copyright 1992-2016 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -306,7 +305,7 @@ case $basic_machine in | riscv32 | riscv64 \ | rl78 | rx \ | score \ - | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ @@ -1379,7 +1378,7 @@ case $os in | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ | -sym* | -kopensolaris* | -plan9* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* | -aros* | -cloudabi* \ + | -aos* | -aros* | -cloudabi* | -sortix* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ @@ -1399,7 +1398,8 @@ case $os in | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \ + | -onefs* | -tirtos*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) diff --git a/config/isl.m4 b/config/isl.m4 index 459fac1..86ccb94 100644 --- a/config/isl.m4 +++ b/config/isl.m4 @@ -19,23 +19,23 @@ # ISL_INIT_FLAGS () # ------------------------- -# Provide configure switches for ISL support. +# Provide configure switches for isl support. # Initialize isllibs/islinc according to the user input. AC_DEFUN([ISL_INIT_FLAGS], [ AC_ARG_WITH([isl-include], [AS_HELP_STRING( [--with-isl-include=PATH], - [Specify directory for installed ISL include files])]) + [Specify directory for installed isl include files])]) AC_ARG_WITH([isl-lib], [AS_HELP_STRING( [--with-isl-lib=PATH], - [Specify the directory for the installed ISL library])]) + [Specify the directory for the installed isl library])]) AC_ARG_ENABLE(isl-version-check, [AS_HELP_STRING( [--disable-isl-version-check], - [disable check for ISL version])], + [disable check for isl version])], ENABLE_ISL_CHECK=$enableval, ENABLE_ISL_CHECK=yes) @@ -58,15 +58,15 @@ AC_DEFUN([ISL_INIT_FLAGS], if test "x${with_isl_lib}" != x; then isllibs="-L$with_isl_lib" fi - dnl If no --with-isl flag was specified and there is in-tree ISL + dnl If no --with-isl flag was specified and there is in-tree isl dnl source, set up flags to use that and skip any version tests - dnl as we cannot run them before building ISL. + dnl as we cannot run them before building isl. if test "x${islinc}" = x && test "x${isllibs}" = x \ && test -d ${srcdir}/isl; then isllibs='-L$$r/$(HOST_SUBDIR)/isl/'"$lt_cv_objdir"' ' islinc='-I$$r/$(HOST_SUBDIR)/isl/include -I$$s/isl/include' ENABLE_ISL_CHECK=no - AC_MSG_WARN([using in-tree ISL, disabling version check]) + AC_MSG_WARN([using in-tree isl, disabling version check]) fi isllibs="${isllibs} -lisl" @@ -75,7 +75,7 @@ AC_DEFUN([ISL_INIT_FLAGS], # ISL_REQUESTED (ACTION-IF-REQUESTED, ACTION-IF-NOT) # ---------------------------------------------------- -# Provide actions for failed ISL detection. +# Provide actions for failed isl detection. AC_DEFUN([ISL_REQUESTED], [ AC_REQUIRE([ISL_INIT_FLAGS]) @@ -94,7 +94,7 @@ AC_DEFUN([ISL_REQUESTED], # ISL_CHECK_VERSION ISL_CHECK_VERSION () # ---------------------------------------------------------------- -# Test that ISL contains functionality added to the minimum expected version. +# Test whether isl contains functionality added to the minimum expected version. AC_DEFUN([ISL_CHECK_VERSION], [ if test "${ENABLE_ISL_CHECK}" = yes ; then @@ -103,15 +103,20 @@ AC_DEFUN([ISL_CHECK_VERSION], _isl_saved_LIBS=$LIBS CFLAGS="${_isl_saved_CFLAGS} ${islinc} ${gmpinc}" - LDFLAGS="${_isl_saved_LDFLAGS} ${isllibs}" - LIBS="${_isl_saved_LIBS} -lisl" + LDFLAGS="${_isl_saved_LDFLAGS} ${isllibs} ${gmplibs}" + LIBS="${_isl_saved_LIBS} -lisl -lgmp" - AC_MSG_CHECKING([for compatible ISL]) - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <isl/val.h>]], [[;]])], - [gcc_cv_isl=yes], - [gcc_cv_isl=no]) + AC_MSG_CHECKING([for isl 0.15 (or deprecated 0.14)]) + AC_TRY_LINK([#include <isl/ctx.h>], + [isl_ctx_get_max_operations (isl_ctx_alloc ());], + [gcc_cv_isl=yes], + [gcc_cv_isl=no]) AC_MSG_RESULT([$gcc_cv_isl]) + if test "${gcc_cv_isl}" = no ; then + AC_MSG_RESULT([recommended isl version is 0.15, minimum required isl version 0.14 is deprecated]) + fi + CFLAGS=$_isl_saved_CFLAGS LDFLAGS=$_isl_saved_LDFLAGS LIBS=$_isl_saved_LIBS @@ -1492,7 +1492,7 @@ Optional Features: build static libjava [default=no] --enable-bootstrap enable bootstrapping [yes if native build] --disable-isl-version-check - disable check for ISL version + disable check for isl version --enable-lto enable link time optimization support --enable-linker-plugin-configure-flags=FLAGS additional flags for configuring linker plugins @@ -1549,12 +1549,12 @@ Optional Packages: --with-boot-libs=LIBS libraries for stage2 and later --with-boot-ldflags=FLAGS linker flags for stage2 and later - --with-isl=PATH Specify prefix directory for the installed ISL + --with-isl=PATH Specify prefix directory for the installed isl package. Equivalent to --with-isl-include=PATH/include plus --with-isl-lib=PATH/lib - --with-isl-include=PATH Specify directory for installed ISL include files - --with-isl-lib=PATH Specify the directory for the installed ISL library + --with-isl-include=PATH Specify directory for installed isl include files + --with-isl-lib=PATH Specify the directory for the installed isl library --with-build-sysroot=SYSROOT use sysroot as the system root during the build --with-debug-prefix-map='A=B C=D ...' @@ -3320,7 +3320,7 @@ fi # Enable libmpx on supported systems by request. if test -d ${srcdir}/libmpx; then - if test x$enable_libmpx = xyes; then + if test x$enable_libmpx = x; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libmpx support" >&5 $as_echo_n "checking for libmpx support... " >&6; } if (srcdir=${srcdir}/libmpx; \ @@ -3334,8 +3334,6 @@ $as_echo "no" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } fi - else - noconfigdirs="$noconfigdirs target-libmpx" fi fi @@ -5945,7 +5943,7 @@ fi -# GCC GRAPHITE dependency ISL. +# GCC GRAPHITE dependency isl. # Basic setup is inlined here, actual checks are in config/isl.m4 @@ -5958,7 +5956,7 @@ fi # Treat --without-isl as a request to disable # GRAPHITE support and skip all following checks. if test "x$with_isl" != "xno"; then - # Check for ISL + # Check for isl # Check whether --with-isl-include was given. @@ -6005,8 +6003,8 @@ fi isllibs='-L$$r/$(HOST_SUBDIR)/isl/'"$lt_cv_objdir"' ' islinc='-I$$r/$(HOST_SUBDIR)/isl/include -I$$s/isl/include' ENABLE_ISL_CHECK=no - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using in-tree ISL, disabling version check" >&5 -$as_echo "$as_me: WARNING: using in-tree ISL, disabling version check" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using in-tree isl, disabling version check" >&5 +$as_echo "$as_me: WARNING: using in-tree isl, disabling version check" >&2;} fi isllibs="${isllibs} -lisl" @@ -6019,18 +6017,18 @@ $as_echo "$as_me: WARNING: using in-tree ISL, disabling version check" >&2;} _isl_saved_LIBS=$LIBS CFLAGS="${_isl_saved_CFLAGS} ${islinc} ${gmpinc}" - LDFLAGS="${_isl_saved_LDFLAGS} ${isllibs}" - LIBS="${_isl_saved_LIBS} -lisl" + LDFLAGS="${_isl_saved_LDFLAGS} ${isllibs} ${gmplibs}" + LIBS="${_isl_saved_LIBS} -lisl -lgmp" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compatible ISL" >&5 -$as_echo_n "checking for compatible ISL... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for isl 0.15 (or deprecated 0.14)" >&5 +$as_echo_n "checking for isl 0.15 (or deprecated 0.14)... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include <isl/val.h> +#include <isl/ctx.h> int main () { -; +isl_ctx_get_max_operations (isl_ctx_alloc ()); ; return 0; } @@ -6045,6 +6043,11 @@ rm -f core conftest.err conftest.$ac_objext \ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_isl" >&5 $as_echo "$gcc_cv_isl" >&6; } + if test "${gcc_cv_isl}" = no ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: recommended isl version is 0.15, minimum required isl version 0.14 is deprecated" >&5 +$as_echo "recommended isl version is 0.15, minimum required isl version 0.14 is deprecated" >&6; } + fi + CFLAGS=$_isl_saved_CFLAGS LDFLAGS=$_isl_saved_LDFLAGS LIBS=$_isl_saved_LIBS @@ -6076,13 +6079,13 @@ $as_echo "$gcc_cv_isl" >&6; } && test "x${isllibs}" = x \ && test "x${islinc}" = x ; then - as_fn_error "Unable to find a usable ISL. See config.log for details." "$LINENO" 5 + as_fn_error "Unable to find a usable isl. See config.log for details." "$LINENO" 5 fi fi -# If the ISL check failed, disable builds of in-tree variant of ISL +# If the isl check failed, disable builds of in-tree variant of isl if test "x$with_isl" = xno || test "x$gcc_cv_isl" = xno; then noconfigdirs="$noconfigdirs isl" diff --git a/configure.ac b/configure.ac index 676fbc4..0ae53ac 100644 --- a/configure.ac +++ b/configure.ac @@ -660,7 +660,7 @@ fi # Enable libmpx on supported systems by request. if test -d ${srcdir}/libmpx; then - if test x$enable_libmpx = xyes; then + if test x$enable_libmpx = x; then AC_MSG_CHECKING([for libmpx support]) if (srcdir=${srcdir}/libmpx; \ . ${srcdir}/configure.tgt; \ @@ -671,8 +671,6 @@ if test -d ${srcdir}/libmpx; then else AC_MSG_RESULT([yes]) fi - else - noconfigdirs="$noconfigdirs target-libmpx" fi fi @@ -1775,31 +1773,31 @@ AC_ARG_WITH(boot-ldflags, fi]) AC_SUBST(poststage1_ldflags) -# GCC GRAPHITE dependency ISL. +# GCC GRAPHITE dependency isl. # Basic setup is inlined here, actual checks are in config/isl.m4 AC_ARG_WITH(isl, [AS_HELP_STRING( [--with-isl=PATH], - [Specify prefix directory for the installed ISL package. + [Specify prefix directory for the installed isl package. Equivalent to --with-isl-include=PATH/include plus --with-isl-lib=PATH/lib])]) # Treat --without-isl as a request to disable # GRAPHITE support and skip all following checks. if test "x$with_isl" != "xno"; then - # Check for ISL + # Check for isl dnl Provide configure switches and initialize islinc & isllibs dnl with user input. ISL_INIT_FLAGS - dnl The versions of ISL that work for Graphite + dnl The versions of isl that work for Graphite ISL_CHECK_VERSION() - dnl Only execute fail-action, if ISL has been requested. + dnl Only execute fail-action, if isl has been requested. ISL_IF_FAILED([ - AC_MSG_ERROR([Unable to find a usable ISL. See config.log for details.])]) + AC_MSG_ERROR([Unable to find a usable isl. See config.log for details.])]) fi -# If the ISL check failed, disable builds of in-tree variant of ISL +# If the isl check failed, disable builds of in-tree variant of isl if test "x$with_isl" = xno || test "x$gcc_cv_isl" = xno; then noconfigdirs="$noconfigdirs isl" diff --git a/include/ChangeLog b/include/ChangeLog index 3c7b3cb..80fc4a8 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,13 @@ +2016-01-11 Nick Clifton <nickc@redhat.com> + + Import this change from GCC mainline: + + 2016-01-07 Mike Frysinger <vapier@gentoo.org> + + * longlong.h: Change !__SHMEDIA__ to + (!defined (__SHMEDIA__) || !__SHMEDIA__). + Change __SHMEDIA__ to defined (__SHMEDIA__) && __SHMEDIA__. + 2016-01-06 Maciej W. Rozycki <macro@imgtec.com> * opcode/mips.h: Add a summary of MIPS16 operand codes. diff --git a/include/longlong.h b/include/longlong.h index 4c8d131..5cbc410 100644 --- a/include/longlong.h +++ b/include/longlong.h @@ -1086,7 +1086,7 @@ extern UDItype __umulsidi3 (USItype, USItype); } while (0) #endif -#if defined(__sh__) && !__SHMEDIA__ && W_TYPE_SIZE == 32 +#if defined(__sh__) && (!defined (__SHMEDIA__) || !__SHMEDIA__) && W_TYPE_SIZE == 32 #ifndef __sh1__ #define umul_ppmm(w1, w0, u, v) \ __asm__ ( \ @@ -1159,7 +1159,7 @@ extern UDItype __umulsidi3 (USItype, USItype); #endif /* __sh__ */ -#if defined (__SH5__) && __SHMEDIA__ && W_TYPE_SIZE == 32 +#if defined (__SH5__) && defined (__SHMEDIA__) && __SHMEDIA__ && W_TYPE_SIZE == 32 #define __umulsidi3(u,v) ((UDItype)(USItype)u*(USItype)v) #define count_leading_zeros(count, x) \ do \ |