Sync top level files with gcc.
Import these patches from the GCC mainline: 2016-01-12 Andris Pavenis <andris.pavenis@iki.fi> * configure.ac: Enable LTO for DJGPP * configure: Regenerate 2016-01-24 Mikhail Maltsev <maltsevm@gmail.com> PR bootstrap/69329 * Makefile.tpl (BASE_FLAGS_TO_PASS): Add LSAN_OPTIONS. * Makefile.in: Regenerate. 2016-01-25 Aditya Kumar <aditya.k7@samsung.com> Sebastian Pop <s.pop@samsung.com> * Makefile.in: Regenerate. * Makefile.tpl: Export ISLVER. * configure: Regenerate. * config/isl.m4: Detect isl-0.15. 2016-01-29 Sebastian Pop <s.pop@samsung.com> * config/isl.m4: Add comments about isl-0.16. * configure: Regenerate.
This commit is contained in:
parent
1233c0bae6
commit
52cf9762c5
6 changed files with 92 additions and 15 deletions
28
ChangeLog
28
ChangeLog
|
@ -1,3 +1,31 @@
|
|||
2016-02-10 Nick Clifton <nickc@redhat.com>
|
||||
|
||||
Import these patches from the GCC mainline:
|
||||
|
||||
2016-01-12 Andris Pavenis <andris.pavenis@iki.fi>
|
||||
|
||||
* configure.ac: Enable LTO for DJGPP
|
||||
* configure: Regenerate
|
||||
|
||||
2016-01-24 Mikhail Maltsev <maltsevm@gmail.com>
|
||||
|
||||
PR bootstrap/69329
|
||||
* Makefile.tpl (BASE_FLAGS_TO_PASS): Add LSAN_OPTIONS.
|
||||
* Makefile.in: Regenerate.
|
||||
|
||||
2016-01-25 Aditya Kumar <aditya.k7@samsung.com>
|
||||
Sebastian Pop <s.pop@samsung.com>
|
||||
|
||||
* Makefile.in: Regenerate.
|
||||
* Makefile.tpl: Export ISLVER.
|
||||
* configure: Regenerate.
|
||||
* config/isl.m4: Detect isl-0.15.
|
||||
|
||||
2016-01-29 Sebastian Pop <s.pop@samsung.com>
|
||||
|
||||
* config/isl.m4: Add comments about isl-0.16.
|
||||
* configure: Regenerate.
|
||||
|
||||
2016-01-12 H.J. Lu <hongjiu.lu@intel.com>
|
||||
|
||||
Sync with GCC
|
||||
|
|
|
@ -3,7 +3,8 @@
|
|||
#
|
||||
# Makefile for directory with subdirs to build.
|
||||
# Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
|
||||
# 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
|
||||
# 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
|
||||
# 2011, 2012, 2013, 2014, 2015, 2016
|
||||
# Free Software Foundation
|
||||
#
|
||||
# This file is free software; you can redistribute it and/or modify
|
||||
|
@ -222,6 +223,7 @@ HOST_EXPORTS = \
|
|||
GMPINC="$(HOST_GMPINC)"; export GMPINC; \
|
||||
ISLLIBS="$(HOST_ISLLIBS)"; export ISLLIBS; \
|
||||
ISLINC="$(HOST_ISLINC)"; export ISLINC; \
|
||||
ISLVER="$(HOST_ISLVER)"; export ISLVER; \
|
||||
LIBELFLIBS="$(HOST_LIBELFLIBS)"; export LIBELFLIBS; \
|
||||
LIBELFINC="$(HOST_LIBELFINC)"; export LIBELFINC; \
|
||||
XGCC_FLAGS_FOR_TARGET="$(XGCC_FLAGS_FOR_TARGET)"; export XGCC_FLAGS_FOR_TARGET; \
|
||||
|
@ -315,6 +317,7 @@ HOST_GMPINC = @gmpinc@
|
|||
# Where to find isl
|
||||
HOST_ISLLIBS = @isllibs@
|
||||
HOST_ISLINC = @islinc@
|
||||
HOST_ISLVER = @islver@
|
||||
|
||||
# Where to find libelf
|
||||
HOST_LIBELFLIBS = @libelflibs@
|
||||
|
@ -789,7 +792,8 @@ BASE_FLAGS_TO_PASS = \
|
|||
$(CXX_FOR_TARGET_FLAG_TO_PASS) \
|
||||
"TFLAGS=$(TFLAGS)" \
|
||||
"CONFIG_SHELL=$(SHELL)" \
|
||||
"MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)"
|
||||
"MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" \
|
||||
$(if $(LSAN_OPTIONS),"LSAN_OPTIONS=$(LSAN_OPTIONS)")
|
||||
|
||||
# We leave this in just in case, but it is not needed anymore.
|
||||
RECURSE_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS)
|
||||
|
|
|
@ -6,7 +6,8 @@ in
|
|||
#
|
||||
# Makefile for directory with subdirs to build.
|
||||
# Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
|
||||
# 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
|
||||
# 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
|
||||
# 2011, 2012, 2013, 2014, 2015, 2016
|
||||
# Free Software Foundation
|
||||
#
|
||||
# This file is free software; you can redistribute it and/or modify
|
||||
|
@ -225,6 +226,7 @@ HOST_EXPORTS = \
|
|||
GMPINC="$(HOST_GMPINC)"; export GMPINC; \
|
||||
ISLLIBS="$(HOST_ISLLIBS)"; export ISLLIBS; \
|
||||
ISLINC="$(HOST_ISLINC)"; export ISLINC; \
|
||||
ISLVER="$(HOST_ISLVER)"; export ISLVER; \
|
||||
LIBELFLIBS="$(HOST_LIBELFLIBS)"; export LIBELFLIBS; \
|
||||
LIBELFINC="$(HOST_LIBELFINC)"; export LIBELFINC; \
|
||||
XGCC_FLAGS_FOR_TARGET="$(XGCC_FLAGS_FOR_TARGET)"; export XGCC_FLAGS_FOR_TARGET; \
|
||||
|
@ -318,6 +320,7 @@ HOST_GMPINC = @gmpinc@
|
|||
# Where to find isl
|
||||
HOST_ISLLIBS = @isllibs@
|
||||
HOST_ISLINC = @islinc@
|
||||
HOST_ISLVER = @islver@
|
||||
|
||||
# Where to find libelf
|
||||
HOST_LIBELFLIBS = @libelflibs@
|
||||
|
@ -590,7 +593,8 @@ BASE_FLAGS_TO_PASS =[+ FOR flags_to_pass +][+ IF optional +] \
|
|||
$(CXX_FOR_TARGET_FLAG_TO_PASS) \
|
||||
"TFLAGS=$(TFLAGS)" \
|
||||
"CONFIG_SHELL=$(SHELL)" \
|
||||
"MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)"
|
||||
"MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" \
|
||||
$(if $(LSAN_OPTIONS),"LSAN_OPTIONS=$(LSAN_OPTIONS)")
|
||||
|
||||
# We leave this in just in case, but it is not needed anymore.
|
||||
RECURSE_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS)
|
||||
|
|
|
@ -106,7 +106,7 @@ AC_DEFUN([ISL_CHECK_VERSION],
|
|||
LDFLAGS="${_isl_saved_LDFLAGS} ${isllibs} ${gmplibs}"
|
||||
LIBS="${_isl_saved_LIBS} -lisl -lgmp"
|
||||
|
||||
AC_MSG_CHECKING([for isl 0.15 (or deprecated 0.14)])
|
||||
AC_MSG_CHECKING([for isl 0.16, 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],
|
||||
|
@ -114,7 +114,19 @@ AC_DEFUN([ISL_CHECK_VERSION],
|
|||
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])
|
||||
AC_MSG_RESULT([recommended isl version is 0.16 or 0.15, the minimum required isl version 0.14 is deprecated])
|
||||
fi
|
||||
|
||||
AC_MSG_CHECKING([for isl 0.16 or 0.15])
|
||||
AC_TRY_LINK([#include <isl/schedule.h>],
|
||||
[isl_options_set_schedule_serialize_sccs (NULL, 0);],
|
||||
[ac_has_isl_options_set_schedule_serialize_sccs=yes],
|
||||
[ac_has_isl_options_set_schedule_serialize_sccs=no])
|
||||
AC_MSG_RESULT($ac_has_isl_options_set_schedule_serialize_sccs)
|
||||
|
||||
if test x"$ac_has_isl_options_set_schedule_serialize_sccs" = x"yes"; then
|
||||
islver="0.15"
|
||||
AC_SUBST([islver])
|
||||
fi
|
||||
|
||||
CFLAGS=$_isl_saved_CFLAGS
|
||||
|
|
41
configure
vendored
41
configure
vendored
|
@ -650,6 +650,7 @@ extra_linker_plugin_flags
|
|||
extra_linker_plugin_configure_flags
|
||||
islinc
|
||||
isllibs
|
||||
islver
|
||||
poststage1_ldflags
|
||||
poststage1_libs
|
||||
stage1_ldflags
|
||||
|
@ -6020,8 +6021,8 @@ $as_echo "$as_me: WARNING: using in-tree isl, disabling version check" >&2;}
|
|||
LDFLAGS="${_isl_saved_LDFLAGS} ${isllibs} ${gmplibs}"
|
||||
LIBS="${_isl_saved_LIBS} -lisl -lgmp"
|
||||
|
||||
{ $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; }
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for isl 0.16, 0.15, or deprecated 0.14" >&5
|
||||
$as_echo_n "checking for isl 0.16, 0.15, or deprecated 0.14... " >&6; }
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
#include <isl/ctx.h>
|
||||
|
@ -6044,8 +6045,36 @@ rm -f core conftest.err conftest.$ac_objext \
|
|||
$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; }
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: recommended isl version is 0.16 or 0.15, the minimum required isl version 0.14 is deprecated" >&5
|
||||
$as_echo "recommended isl version is 0.16 or 0.15, the minimum required isl version 0.14 is deprecated" >&6; }
|
||||
fi
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for isl 0.16 or 0.15" >&5
|
||||
$as_echo_n "checking for isl 0.16 or 0.15... " >&6; }
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
#include <isl/schedule.h>
|
||||
int
|
||||
main ()
|
||||
{
|
||||
isl_options_set_schedule_serialize_sccs (NULL, 0);
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
if ac_fn_c_try_link "$LINENO"; then :
|
||||
ac_has_isl_options_set_schedule_serialize_sccs=yes
|
||||
else
|
||||
ac_has_isl_options_set_schedule_serialize_sccs=no
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_has_isl_options_set_schedule_serialize_sccs" >&5
|
||||
$as_echo "$ac_has_isl_options_set_schedule_serialize_sccs" >&6; }
|
||||
|
||||
if test x"$ac_has_isl_options_set_schedule_serialize_sccs" = x"yes"; then
|
||||
islver="0.15"
|
||||
|
||||
fi
|
||||
|
||||
CFLAGS=$_isl_saved_CFLAGS
|
||||
|
@ -6127,7 +6156,7 @@ if test $target_elf = yes; then :
|
|||
else
|
||||
if test x"$default_enable_lto" = x"yes" ; then
|
||||
case $target in
|
||||
*-apple-darwin9* | *-cygwin* | *-mingw*) ;;
|
||||
*-apple-darwin9* | *-cygwin* | *-mingw* | *djgpp*) ;;
|
||||
# On other non-ELF platforms, LTO has yet to be validated.
|
||||
*) enable_lto=no ;;
|
||||
esac
|
||||
|
@ -6138,7 +6167,7 @@ else
|
|||
# warn during gcc/ subconfigure; unless you're bootstrapping with
|
||||
# -flto it won't be needed until after installation anyway.
|
||||
case $target in
|
||||
*-cygwin* | *-mingw* | *-apple-darwin*) ;;
|
||||
*-cygwin* | *-mingw* | *-apple-darwin* | *djgpp*) ;;
|
||||
*) if test x"$enable_lto" = x"yes"; then
|
||||
as_fn_error "LTO support is not enabled for this target." "$LINENO" 5
|
||||
fi
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
|
||||
# 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012,
|
||||
# 2014, 2015 Free Software Foundation, Inc.
|
||||
# 2014, 2015, 2016 Free Software Foundation, Inc.
|
||||
#
|
||||
# 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
|
||||
|
@ -1817,7 +1817,7 @@ ACX_ELF_TARGET_IFELSE([# ELF platforms build the lto-plugin always.
|
|||
build_lto_plugin=yes
|
||||
],[if test x"$default_enable_lto" = x"yes" ; then
|
||||
case $target in
|
||||
*-apple-darwin9* | *-cygwin* | *-mingw*) ;;
|
||||
*-apple-darwin9* | *-cygwin* | *-mingw* | *djgpp*) ;;
|
||||
# On other non-ELF platforms, LTO has yet to be validated.
|
||||
*) enable_lto=no ;;
|
||||
esac
|
||||
|
@ -1828,7 +1828,7 @@ ACX_ELF_TARGET_IFELSE([# ELF platforms build the lto-plugin always.
|
|||
# warn during gcc/ subconfigure; unless you're bootstrapping with
|
||||
# -flto it won't be needed until after installation anyway.
|
||||
case $target in
|
||||
*-cygwin* | *-mingw* | *-apple-darwin*) ;;
|
||||
*-cygwin* | *-mingw* | *-apple-darwin* | *djgpp*) ;;
|
||||
*) if test x"$enable_lto" = x"yes"; then
|
||||
AC_MSG_ERROR([LTO support is not enabled for this target.])
|
||||
fi
|
||||
|
|
Loading…
Reference in a new issue