darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Import changes made to files shared with the FSF GCC project.

Browse source 
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.

include	2016-01-07  Mike Frysinger  <vapier@gentoo.org>

	* longlong.h: Change !__SHMEDIA__ to
	(!defined (__SHMEDIA__) || !__SHMEDIA__).
	Change __SHMEDIA__ to defined (__SHMEDIA__) && __SHMEDIA__.
This commit is contained in:
Nick Clifton 2016-01-11 11:06:56 +00:00
parent 34ac507d94
commit 4849dfd8f4
12 changed files with 167 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
.gitignore vendored
View file

@ -32,6 +32,11 @@ POTFILES
TAGS TAGS
TAGS.sub TAGS.sub
.local.vimrc
.lvimrc
.clang-format
.gdbinit .gdbinit
.gdb_history .gdb_history
@ -40,3 +45,7 @@ core
!core/ !core/
lost+found lost+found
# ignore ./contrib/gcc_update output
LAST_UPDATED
REVISION

47
ChangeLog
View file

@ -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> 2015-11-20 Tristan Gingold <gingold@adacore.com>
* configure.ac: Add aarch64-*-darwin* and arm-*-darwin*. * configure.ac: Add aarch64-*-darwin* and arm-*-darwin*.

1
Makefile.def
View file

@ -534,6 +534,7 @@ dependencies = { module=all-m4; on=all-build-texinfo; };
// on libgcc and newlib/libgloss. // on libgcc and newlib/libgloss.
lang_env_dependencies = { module=libjava; cxx=true; }; lang_env_dependencies = { module=libjava; cxx=true; };
lang_env_dependencies = { module=libitm; 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=libcilkrts; cxx=true; };
lang_env_dependencies = { module=liboffloadmic; cxx=true; }; lang_env_dependencies = { module=liboffloadmic; cxx=true; };
lang_env_dependencies = { module=newlib; no_c=true; }; lang_env_dependencies = { module=newlib; no_c=true; };

13
Makefile.in
View file

@ -224,6 +224,7 @@ HOST_EXPORTS = \
ISLINC="$(HOST_ISLINC)"; export ISLINC; \ ISLINC="$(HOST_ISLINC)"; export ISLINC; \
LIBELFLIBS="$(HOST_LIBELFLIBS)"; export LIBELFLIBS; \ LIBELFLIBS="$(HOST_LIBELFLIBS)"; export LIBELFLIBS; \
LIBELFINC="$(HOST_LIBELFINC)"; export LIBELFINC; \ LIBELFINC="$(HOST_LIBELFINC)"; export LIBELFINC; \
XGCC_FLAGS_FOR_TARGET="$(XGCC_FLAGS_FOR_TARGET)"; export XGCC_FLAGS_FOR_TARGET; \
@if gcc-bootstrap @if gcc-bootstrap
$(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \ $(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
@endif gcc-bootstrap @endif gcc-bootstrap
@ -311,7 +312,7 @@ NORMAL_TARGET_EXPORTS = \
HOST_GMPLIBS = @gmplibs@ HOST_GMPLIBS = @gmplibs@
HOST_GMPINC = @gmpinc@ HOST_GMPINC = @gmpinc@
# Where to find ISL # Where to find isl
HOST_ISLLIBS = @isllibs@ HOST_ISLLIBS = @isllibs@
HOST_ISLINC = @islinc@ HOST_ISLINC = @islinc@
@ -2461,6 +2462,15 @@ vimrc: $(srcdir)/.local.vimrc $(srcdir)/.lvimrc
.PHONY: vimrc .PHONY: vimrc
# clang-format config
$(srcdir)/.clang-format:
$(LN_S) contrib/clang-format $@
clang-format: $(srcdir)/.clang-format
.PHONY: clang-format
# Installation targets. # Installation targets.
.PHONY: install uninstall .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-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-newlib maybe-all-target-libgloss
configure-target-libjava: maybe-all-target-libstdc++-v3 configure-target-libjava: maybe-all-target-libstdc++-v3

12
Makefile.tpl
View file

@ -227,6 +227,7 @@ HOST_EXPORTS = \
ISLINC="$(HOST_ISLINC)"; export ISLINC; \ ISLINC="$(HOST_ISLINC)"; export ISLINC; \
LIBELFLIBS="$(HOST_LIBELFLIBS)"; export LIBELFLIBS; \ LIBELFLIBS="$(HOST_LIBELFLIBS)"; export LIBELFLIBS; \
LIBELFINC="$(HOST_LIBELFINC)"; export LIBELFINC; \ LIBELFINC="$(HOST_LIBELFINC)"; export LIBELFINC; \
XGCC_FLAGS_FOR_TARGET="$(XGCC_FLAGS_FOR_TARGET)"; export XGCC_FLAGS_FOR_TARGET; \
@if gcc-bootstrap @if gcc-bootstrap
$(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \ $(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
@endif gcc-bootstrap @endif gcc-bootstrap
@ -314,7 +315,7 @@ NORMAL_TARGET_EXPORTS = \
HOST_GMPLIBS = @gmplibs@ HOST_GMPLIBS = @gmplibs@
HOST_GMPINC = @gmpinc@ HOST_GMPINC = @gmpinc@
# Where to find ISL # Where to find isl
HOST_ISLLIBS = @isllibs@ HOST_ISLLIBS = @isllibs@
HOST_ISLINC = @islinc@ HOST_ISLINC = @islinc@
@ -889,6 +890,15 @@ vimrc: $(srcdir)/.local.vimrc $(srcdir)/.lvimrc
.PHONY: vimrc .PHONY: vimrc
# clang-format config
$(srcdir)/.clang-format:
$(LN_S) contrib/clang-format $@
clang-format: $(srcdir)/.clang-format
.PHONY: clang-format
# Installation targets. # Installation targets.
.PHONY: install uninstall .PHONY: install uninstall

23
config.guess vendored
View file

@ -1,8 +1,8 @@
#! /bin/sh #! /bin/sh
# Attempt to guess a canonical system name. # 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 # 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 # 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. # Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
# #
# You can get the latest version of this script from: # 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>. # Please send patches to <config-patches@gnu.org>.
@ -50,7 +50,7 @@ version="\
GNU config.guess ($timestamp) GNU config.guess ($timestamp)
Originally written by Per Bothner. 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 This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." 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:*:*) *:MirBSD:*:*)
echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
exit ;; exit ;;
*:Sortix:*:*)
echo ${UNAME_MACHINE}-unknown-sortix
exit ;;
alpha:OSF1:*:*) alpha:OSF1:*:*)
case $UNAME_RELEASE in case $UNAME_RELEASE in
*4.0) *4.0)
@ -962,6 +965,9 @@ EOF
ia64:Linux:*:*) ia64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-${LIBC} echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;; exit ;;
k1om:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
m32r*:Linux:*:*) m32r*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-${LIBC} echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;; exit ;;
@ -1117,7 +1123,7 @@ EOF
# uname -m prints for DJGPP always 'pc', but it prints nothing about # uname -m prints for DJGPP always 'pc', but it prints nothing about
# the processor, so we play safe by assuming i586. # the processor, so we play safe by assuming i586.
# Note: whatever this is, it MUST be the same as what config.sub # 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. # this is a cross-build.
echo i586-pc-msdosdjgpp echo i586-pc-msdosdjgpp
exit ;; exit ;;
@ -1387,6 +1393,9 @@ EOF
x86_64:VMkernel:*:*) x86_64:VMkernel:*:*)
echo ${UNAME_MACHINE}-unknown-esx echo ${UNAME_MACHINE}-unknown-esx
exit ;; exit ;;
amd64:Isilon\ OneFS:*:*)
echo x86_64-unknown-onefs
exit ;;
esac esac
cat >&2 <<EOF 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 the operating system you are using. It is advised that you
download the most up to date version of the config scripts from 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 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 If the version you run ($0) is already up to date, please
send the following data and any information you think might be send the following data and any information you think might be

18
config.sub vendored
View file

@ -1,8 +1,8 @@
#! /bin/sh #! /bin/sh
# Configuration validation subroutine script. # 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 # 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 # 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. # Otherwise, we print the canonical config type on stdout and succeed.
# You can get the latest version of this script from: # 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 # This file is supposed to be the same for all GNU packages
# and recognize all the CPU types, system types and aliases # and recognize all the CPU types, system types and aliases
@ -53,8 +53,7 @@ timestamp='2015-07-28'
me=`echo "$0" | sed -e 's,.*/,,'` me=`echo "$0" | sed -e 's,.*/,,'`
usage="\ usage="\
Usage: $0 [OPTION] CPU-MFR-OPSYS Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
$0 [OPTION] ALIAS
Canonicalize a configuration name. Canonicalize a configuration name.
@ -68,7 +67,7 @@ Report bugs and patches to <config-patches@gnu.org>."
version="\ version="\
GNU config.sub ($timestamp) 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 This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@ -306,7 +305,7 @@ case $basic_machine in
| riscv32 | riscv64 \ | riscv32 | riscv64 \
| rl78 | rx \ | rl78 | rx \
| score \ | 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 \ | sh64 | sh64le \
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
| sparcv8 | sparcv9 | sparcv9b | sparcv9v \ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
@ -1379,7 +1378,7 @@ case $os in
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
| -sym* | -kopensolaris* | -plan9* \ | -sym* | -kopensolaris* | -plan9* \
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
| -aos* | -aros* | -cloudabi* \ | -aos* | -aros* | -cloudabi* | -sortix* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
| -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
@ -1399,7 +1398,8 @@ case $os in
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ | -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. # Remember, each alternative MUST END IN *, to match a version number.
;; ;;
-qnx*) -qnx*)

35
config/isl.m4
View file

@ -19,23 +19,23 @@
# ISL_INIT_FLAGS () # ISL_INIT_FLAGS ()
# ------------------------- # -------------------------
# Provide configure switches for ISL support. # Provide configure switches for isl support.
# Initialize isllibs/islinc according to the user input. # Initialize isllibs/islinc according to the user input.
AC_DEFUN([ISL_INIT_FLAGS], AC_DEFUN([ISL_INIT_FLAGS],
[ [
AC_ARG_WITH([isl-include], AC_ARG_WITH([isl-include],
[AS_HELP_STRING( [AS_HELP_STRING(
[--with-isl-include=PATH], [--with-isl-include=PATH],
[Specify directory for installed ISL include files])]) [Specify directory for installed isl include files])])
AC_ARG_WITH([isl-lib], AC_ARG_WITH([isl-lib],
[AS_HELP_STRING( [AS_HELP_STRING(
[--with-isl-lib=PATH], [--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, AC_ARG_ENABLE(isl-version-check,
[AS_HELP_STRING( [AS_HELP_STRING(
[--disable-isl-version-check], [--disable-isl-version-check],
[disable check for ISL version])], [disable check for isl version])],
ENABLE_ISL_CHECK=$enableval, ENABLE_ISL_CHECK=$enableval,
ENABLE_ISL_CHECK=yes) ENABLE_ISL_CHECK=yes)
@ -58,15 +58,15 @@ AC_DEFUN([ISL_INIT_FLAGS],
if test "x${with_isl_lib}" != x; then if test "x${with_isl_lib}" != x; then
isllibs="-L$with_isl_lib" isllibs="-L$with_isl_lib"
fi 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 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 \ if test "x${islinc}" = x && test "x${isllibs}" = x \
&& test -d ${srcdir}/isl; then && test -d ${srcdir}/isl; then
isllibs='-L$$r/$(HOST_SUBDIR)/isl/'"$lt_cv_objdir"' ' isllibs='-L$$r/$(HOST_SUBDIR)/isl/'"$lt_cv_objdir"' '
islinc='-I$$r/$(HOST_SUBDIR)/isl/include -I$$s/isl/include' islinc='-I$$r/$(HOST_SUBDIR)/isl/include -I$$s/isl/include'
ENABLE_ISL_CHECK=no 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 fi
isllibs="${isllibs} -lisl" isllibs="${isllibs} -lisl"
@ -75,7 +75,7 @@ AC_DEFUN([ISL_INIT_FLAGS],
# ISL_REQUESTED (ACTION-IF-REQUESTED, ACTION-IF-NOT) # 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_DEFUN([ISL_REQUESTED],
[ [
AC_REQUIRE([ISL_INIT_FLAGS]) AC_REQUIRE([ISL_INIT_FLAGS])
@ -94,7 +94,7 @@ AC_DEFUN([ISL_REQUESTED],
# ISL_CHECK_VERSION ISL_CHECK_VERSION () # 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], AC_DEFUN([ISL_CHECK_VERSION],
[ [
if test "${ENABLE_ISL_CHECK}" = yes ; then if test "${ENABLE_ISL_CHECK}" = yes ; then
@ -103,15 +103,20 @@ AC_DEFUN([ISL_CHECK_VERSION],
_isl_saved_LIBS=$LIBS _isl_saved_LIBS=$LIBS
CFLAGS="${_isl_saved_CFLAGS} ${islinc} ${gmpinc}" CFLAGS="${_isl_saved_CFLAGS} ${islinc} ${gmpinc}"
LDFLAGS="${_isl_saved_LDFLAGS} ${isllibs}" LDFLAGS="${_isl_saved_LDFLAGS} ${isllibs} ${gmplibs}"
LIBS="${_isl_saved_LIBS} -lisl" LIBS="${_isl_saved_LIBS} -lisl -lgmp"
AC_MSG_CHECKING([for compatible ISL]) AC_MSG_CHECKING([for isl 0.15 (or deprecated 0.14)])
AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <isl/val.h>]], [[;]])], AC_TRY_LINK([#include <isl/ctx.h>],
[gcc_cv_isl=yes], [isl_ctx_get_max_operations (isl_ctx_alloc ());],
[gcc_cv_isl=no]) [gcc_cv_isl=yes],
[gcc_cv_isl=no])
AC_MSG_RESULT([$gcc_cv_isl]) 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 CFLAGS=$_isl_saved_CFLAGS
LDFLAGS=$_isl_saved_LDFLAGS LDFLAGS=$_isl_saved_LDFLAGS
LIBS=$_isl_saved_LIBS LIBS=$_isl_saved_LIBS

41
configure vendored
View file

@ -1492,7 +1492,7 @@ Optional Features:
build static libjava [default=no] build static libjava [default=no]
--enable-bootstrap enable bootstrapping [yes if native build] --enable-bootstrap enable bootstrapping [yes if native build]
--disable-isl-version-check --disable-isl-version-check
disable check for ISL version disable check for isl version
--enable-lto enable link time optimization support --enable-lto enable link time optimization support
--enable-linker-plugin-configure-flags=FLAGS --enable-linker-plugin-configure-flags=FLAGS
additional flags for configuring linker plugins additional flags for configuring linker plugins
@ -1549,12 +1549,12 @@ Optional Packages:
--with-boot-libs=LIBS libraries for stage2 and later --with-boot-libs=LIBS libraries for stage2 and later
--with-boot-ldflags=FLAGS --with-boot-ldflags=FLAGS
linker flags for stage2 and later 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 package. Equivalent to
--with-isl-include=PATH/include plus --with-isl-include=PATH/include plus
--with-isl-lib=PATH/lib --with-isl-lib=PATH/lib
--with-isl-include=PATH Specify directory for installed ISL include files --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-lib=PATH Specify the directory for the installed isl library
--with-build-sysroot=SYSROOT --with-build-sysroot=SYSROOT
use sysroot as the system root during the build use sysroot as the system root during the build
--with-debug-prefix-map='A=B C=D ...' --with-debug-prefix-map='A=B C=D ...'
@ -3320,7 +3320,7 @@ fi
# Enable libmpx on supported systems by request. # Enable libmpx on supported systems by request.
if test -d ${srcdir}/libmpx; then 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 "$as_me:${as_lineno-$LINENO}: checking for libmpx support" >&5
$as_echo_n "checking for libmpx support... " >&6; } $as_echo_n "checking for libmpx support... " >&6; }
if (srcdir=${srcdir}/libmpx; \ if (srcdir=${srcdir}/libmpx; \
@ -3334,8 +3334,6 @@ $as_echo "no" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; } $as_echo "yes" >&6; }
fi fi
else
noconfigdirs="$noconfigdirs target-libmpx"
fi fi
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 # 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 # Treat --without-isl as a request to disable
# GRAPHITE support and skip all following checks. # GRAPHITE support and skip all following checks.
if test "x$with_isl" != "xno"; then if test "x$with_isl" != "xno"; then
# Check for ISL # Check for isl
# Check whether --with-isl-include was given. # Check whether --with-isl-include was given.
@ -6005,8 +6003,8 @@ fi
isllibs='-L$$r/$(HOST_SUBDIR)/isl/'"$lt_cv_objdir"' ' isllibs='-L$$r/$(HOST_SUBDIR)/isl/'"$lt_cv_objdir"' '
islinc='-I$$r/$(HOST_SUBDIR)/isl/include -I$$s/isl/include' islinc='-I$$r/$(HOST_SUBDIR)/isl/include -I$$s/isl/include'
ENABLE_ISL_CHECK=no ENABLE_ISL_CHECK=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using in-tree ISL, disabling version check" >&5 { $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: WARNING: using in-tree isl, disabling version check" >&2;}
fi fi
isllibs="${isllibs} -lisl" isllibs="${isllibs} -lisl"
@ -6019,18 +6017,18 @@ $as_echo "$as_me: WARNING: using in-tree ISL, disabling version check" >&2;}
_isl_saved_LIBS=$LIBS _isl_saved_LIBS=$LIBS
CFLAGS="${_isl_saved_CFLAGS} ${islinc} ${gmpinc}" CFLAGS="${_isl_saved_CFLAGS} ${islinc} ${gmpinc}"
LDFLAGS="${_isl_saved_LDFLAGS} ${isllibs}" LDFLAGS="${_isl_saved_LDFLAGS} ${isllibs} ${gmplibs}"
LIBS="${_isl_saved_LIBS} -lisl" LIBS="${_isl_saved_LIBS} -lisl -lgmp"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for compatible ISL" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for isl 0.15 (or deprecated 0.14)" >&5
$as_echo_n "checking for compatible ISL... " >&6; } $as_echo_n "checking for isl 0.15 (or deprecated 0.14)... " >&6; }
cat confdefs.h - <<_ACEOF >conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */ /* end confdefs.h. */
#include <isl/val.h> #include <isl/ctx.h>
int int
main () main ()
{ {
; isl_ctx_get_max_operations (isl_ctx_alloc ());
; ;
return 0; 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 "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_isl" >&5
$as_echo "$gcc_cv_isl" >&6; } $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 CFLAGS=$_isl_saved_CFLAGS
LDFLAGS=$_isl_saved_LDFLAGS LDFLAGS=$_isl_saved_LDFLAGS
LIBS=$_isl_saved_LIBS LIBS=$_isl_saved_LIBS
@ -6076,13 +6079,13 @@ $as_echo "$gcc_cv_isl" >&6; }
&& test "x${isllibs}" = x \ && test "x${isllibs}" = x \
&& test "x${islinc}" = x ; then && 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
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 || if test "x$with_isl" = xno ||
test "x$gcc_cv_isl" = xno; then test "x$gcc_cv_isl" = xno; then
noconfigdirs="$noconfigdirs isl" noconfigdirs="$noconfigdirs isl"

18
configure.ac
View file

@ -660,7 +660,7 @@ fi
# Enable libmpx on supported systems by request. # Enable libmpx on supported systems by request.
if test -d ${srcdir}/libmpx; then 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]) AC_MSG_CHECKING([for libmpx support])
if (srcdir=${srcdir}/libmpx; \ if (srcdir=${srcdir}/libmpx; \
. ${srcdir}/configure.tgt; \ . ${srcdir}/configure.tgt; \
@ -671,8 +671,6 @@ if test -d ${srcdir}/libmpx; then
else else
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
fi fi
else
noconfigdirs="$noconfigdirs target-libmpx"
fi fi
fi fi
@ -1775,31 +1773,31 @@ AC_ARG_WITH(boot-ldflags,
fi]) fi])
AC_SUBST(poststage1_ldflags) AC_SUBST(poststage1_ldflags)
# GCC GRAPHITE dependency ISL. # GCC GRAPHITE dependency isl.
# Basic setup is inlined here, actual checks are in config/isl.m4 # Basic setup is inlined here, actual checks are in config/isl.m4
AC_ARG_WITH(isl, AC_ARG_WITH(isl,
[AS_HELP_STRING( [AS_HELP_STRING(
[--with-isl=PATH], [--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 Equivalent to --with-isl-include=PATH/include
plus --with-isl-lib=PATH/lib])]) plus --with-isl-lib=PATH/lib])])
# Treat --without-isl as a request to disable # Treat --without-isl as a request to disable
# GRAPHITE support and skip all following checks. # GRAPHITE support and skip all following checks.
if test "x$with_isl" != "xno"; then if test "x$with_isl" != "xno"; then
# Check for ISL # Check for isl
dnl Provide configure switches and initialize islinc & isllibs dnl Provide configure switches and initialize islinc & isllibs
dnl with user input. dnl with user input.
ISL_INIT_FLAGS ISL_INIT_FLAGS
dnl The versions of ISL that work for Graphite dnl The versions of isl that work for Graphite
ISL_CHECK_VERSION() 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([ 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 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 || if test "x$with_isl" = xno ||
test "x$gcc_cv_isl" = xno; then test "x$gcc_cv_isl" = xno; then
noconfigdirs="$noconfigdirs isl" noconfigdirs="$noconfigdirs isl"

10
include/ChangeLog
View file

@ -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> 2016-01-06 Maciej W. Rozycki <macro@imgtec.com>
* opcode/mips.h: Add a summary of MIPS16 operand codes. * opcode/mips.h: Add a summary of MIPS16 operand codes.

4
include/longlong.h
View file

@ -1086,7 +1086,7 @@ extern UDItype __umulsidi3 (USItype, USItype);
} while (0) } while (0)
#endif #endif
#if defined(__sh__) && !__SHMEDIA__ && W_TYPE_SIZE == 32 #if defined(__sh__) && (!defined (__SHMEDIA__) || !__SHMEDIA__) && W_TYPE_SIZE == 32
#ifndef __sh1__ #ifndef __sh1__
#define umul_ppmm(w1, w0, u, v) \ #define umul_ppmm(w1, w0, u, v) \
__asm__ ( \ __asm__ ( \
@ -1159,7 +1159,7 @@ extern UDItype __umulsidi3 (USItype, USItype);
#endif /* __sh__ */ #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 __umulsidi3(u,v) ((UDItype)(USItype)u*(USItype)v)
#define count_leading_zeros(count, x) \ #define count_leading_zeros(count, x) \
do \ do \