From 4849dfd8f454b9c595e6ee7477f6b7b25c31a499 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Mon, 11 Jan 2016 11:06:56 +0000 Subject: Import changes made to files shared with the FSF GCC project. Import the following changes from the GCC mainline: 2015-11-13 Tsvetkova Alexandra * configure.ac: Enable libmpx by default. * configure: Regenerated. 2015-11-19 Martin Liska * .gitignore: Add .clang-format to ignored files. * Makefile.tpl: Add clang-format. * Makefile.in: Regenerate. 2015-12-01 Andreas Tobler PR libffi/65726 * Makefile.def (lang_env_dependencies): Make libffi depend on cxx. * Makefile.in: Regenerate. 2015-12-02 Ian Lance Taylor PR go/66147 * Makefile.tpl (HOST_EXPORTS): Add XGCC_FLAGS_FOR_TARGET. * Makefile.in: Regenerate. 2015-12-17 Nathan Sidwell * config/isl.m4 (ISL_CHECK_VERSION): Add gmp libs. * configure: Regenerate. 2015-12-17 Sebastian Pop * 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 * config.guess: Import version 2016-01-01. * config.sub: Likewise. include 2016-01-07 Mike Frysinger * longlong.h: Change !__SHMEDIA__ to (!defined (__SHMEDIA__) || !__SHMEDIA__). Change __SHMEDIA__ to defined (__SHMEDIA__) && __SHMEDIA__. --- Makefile.in | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'Makefile.in') diff --git a/Makefile.in b/Makefile.in index bc2bae6d7f..e9b59502a2 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 -- cgit v1.2.3