mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-11-23 01:53:38 +08:00
Merge autoconf / automake update changes from GCC.
Top level: Merge from GCC: PR bootstrap/82856 * multilib.am: New file. From automake. config: Merge from GCC: PR bootstrap/82856 * math.m4, tls.m4: Use AC_LANG_SOURCE. zlib: Merge from GCC. PR bootstrap/82856 * Makefile.am: Include multilib.am. * Makefile.in: Regenerate.
This commit is contained in:
Joseph Myers
parent
1443936e96
commit
b555fb21f9
@ -1,3 +1,9 @@
|
||||
2018-10-31 Joseph Myers <joseph@codesourcery.com>
|
||||
|
||||
Merge from GCC:
|
||||
PR bootstrap/82856
|
||||
* multilib.am: New file. From automake.
|
||||
|
||||
2018-09-12 Sergio Durigan Junior <sergiodj@redhat.com>
|
||||
|
||||
* src-release.sh (GDB_SUPPORT_DIRS): Add "contrib".
|
||||
|
||||
@ -1,3 +1,9 @@
|
||||
2018-10-31 Joseph Myers <joseph@codesourcery.com>
|
||||
|
||||
Merge from GCC:
|
||||
PR bootstrap/82856
|
||||
* math.m4, tls.m4: Use AC_LANG_SOURCE.
|
||||
|
||||
2018-06-19 Simon Marchi <simon.marchi@ericsson.com>
|
||||
|
||||
* override.m4 (_GCC_AUTOCONF_VERSION): Bump from 2.64 to 2.69.
|
||||
|
||||
@ -25,7 +25,7 @@ AC_DEFUN([GCC_CHECK_MATH_FUNC],
|
||||
AC_REQUIRE([GCC_CHECK_LIBM])
|
||||
AC_REQUIRE([GCC_CHECK_MATH_HEADERS])
|
||||
AC_CACHE_CHECK([for $1], [gcc_cv_math_func_$1],
|
||||
[AC_LINK_IFELSE([
|
||||
[AC_LINK_IFELSE([AC_LANG_SOURCE([
|
||||
#ifdef HAVE_COMPLEX_H
|
||||
#include <complex.h>
|
||||
#endif
|
||||
@ -40,7 +40,7 @@ main ()
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
],
|
||||
])],
|
||||
[gcc_cv_math_func_$1=yes],
|
||||
[gcc_cv_math_func_$1=no])])
|
||||
if test $gcc_cv_math_func_$1 = yes; then
|
||||
|
||||
@ -4,14 +4,14 @@ AC_DEFUN([GCC_CHECK_TLS], [
|
||||
GCC_ENABLE(tls, yes, [], [Use thread-local storage])
|
||||
AC_CACHE_CHECK([whether the target supports thread-local storage],
|
||||
gcc_cv_have_tls, [
|
||||
AC_RUN_IFELSE([__thread int a; int b; int main() { return a = b; }],
|
||||
AC_RUN_IFELSE([AC_LANG_SOURCE([__thread int a; int b; int main() { return a = b; }])],
|
||||
[dnl If the test case passed with dynamic linking, try again with
|
||||
dnl static linking, but only if static linking is supported (not
|
||||
dnl on Solaris 10). This fails with some older Red Hat releases.
|
||||
chktls_save_LDFLAGS="$LDFLAGS"
|
||||
LDFLAGS="-static $LDFLAGS"
|
||||
AC_LINK_IFELSE([int main() { return 0; }],
|
||||
[AC_RUN_IFELSE([__thread int a; int b; int main() { return a = b; }],
|
||||
AC_LINK_IFELSE([AC_LANG_SOURCE([int main() { return 0; }])],
|
||||
[AC_RUN_IFELSE([AC_LANG_SOURCE([__thread int a; int b; int main() { return a = b; }])],
|
||||
[gcc_cv_have_tls=yes], [gcc_cv_have_tls=no],[])],
|
||||
[gcc_cv_have_tls=yes])
|
||||
LDFLAGS="$chktls_save_LDFLAGS"
|
||||
@ -71,7 +71,7 @@ AC_DEFUN([GCC_CHECK_TLS], [
|
||||
[gcc_cv_have_tls=no],
|
||||
[dnl This is the cross-compiling case. Assume libc supports TLS if the
|
||||
dnl binutils and the compiler do.
|
||||
AC_LINK_IFELSE([__thread int a; int b; int main() { return a = b; }],
|
||||
AC_LINK_IFELSE([AC_LANG_SOURCE([__thread int a; int b; int main() { return a = b; }])],
|
||||
[chktls_save_LDFLAGS="$LDFLAGS"
|
||||
dnl Shared library options may depend on the host; this check
|
||||
dnl is only known to be needed for GNU/Linux.
|
||||
@ -83,8 +83,8 @@ AC_DEFUN([GCC_CHECK_TLS], [
|
||||
chktls_save_CFLAGS="$CFLAGS"
|
||||
CFLAGS="-fPIC $CFLAGS"
|
||||
dnl If -shared works, test if TLS works in a shared library.
|
||||
AC_LINK_IFELSE([int f() { return 0; }],
|
||||
[AC_LINK_IFELSE([__thread int a; int b; int f() { return a = b; }],
|
||||
AC_LINK_IFELSE([AC_LANG_SOURCE([int f() { return 0; }])],
|
||||
[AC_LINK_IFELSE([AC_LANG_SOURCE([__thread int a; int b; int f() { return a = b; }])],
|
||||
[gcc_cv_have_tls=yes],
|
||||
[gcc_cv_have_tls=no])],
|
||||
[gcc_cv_have_tls=yes])
|
||||
@ -102,7 +102,7 @@ AC_DEFUN([GCC_CHECK_CC_TLS], [
|
||||
GCC_ENABLE(tls, yes, [], [Use thread-local storage])
|
||||
AC_CACHE_CHECK([whether the target assembler supports thread-local storage],
|
||||
gcc_cv_have_cc_tls, [
|
||||
AC_COMPILE_IFELSE([__thread int a; int b; int main() { return a = b; }],
|
||||
AC_COMPILE_IFELSE([AC_LANG_SOURCE([__thread int a; int b; int main() { return a = b; }])],
|
||||
[gcc_cv_have_cc_tls=yes], [gcc_cv_have_cc_tls=no])]
|
||||
)])
|
||||
if test "$enable_tls $gcc_cv_have_cc_tls" = "yes yes"; then
|
||||
|
||||
45
multilib.am
Normal file
45
multilib.am
Normal file
@ -0,0 +1,45 @@
|
||||
## automake - create Makefile.in from Makefile.am
|
||||
|
||||
## Copyright (C) 1994-2017 Free Software Foundation, Inc.
|
||||
## This Makefile.in is free software; the Free Software Foundation
|
||||
## gives unlimited permission to copy and/or distribute it,
|
||||
## with or without modifications, as long as this notice is preserved.
|
||||
|
||||
## This program is distributed in the hope that it will be useful,
|
||||
## but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
## GNU General Public License for more details.
|
||||
|
||||
MULTISRCTOP =
|
||||
MULTIBUILDTOP =
|
||||
MULTIDIRS =
|
||||
MULTISUBDIR =
|
||||
MULTIDO = true
|
||||
MULTICLEAN = true
|
||||
|
||||
# GNU Make needs to see an explicit $(MAKE) variable in the command it
|
||||
# runs to enable its job server during parallel builds. Hence the
|
||||
# comments below.
|
||||
all-multi:
|
||||
$(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do # $(MAKE)
|
||||
install-multi:
|
||||
$(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do # $(MAKE)
|
||||
mostlyclean-multi:
|
||||
$(MULTICLEAN) $(AM_MAKEFLAGS) DO=mostlyclean multi-clean # $(MAKE)
|
||||
clean-multi:
|
||||
$(MULTICLEAN) $(AM_MAKEFLAGS) DO=clean multi-clean # $(MAKE)
|
||||
distclean-multi:
|
||||
$(MULTICLEAN) $(AM_MAKEFLAGS) DO=distclean multi-clean # $(MAKE)
|
||||
maintainer-clean-multi:
|
||||
$(MULTICLEAN) $(AM_MAKEFLAGS) DO=maintainer-clean multi-clean # $(MAKE)
|
||||
|
||||
.MAKE .PHONY: all-multi clean-multi distclean-multi install-am \
|
||||
install-multi maintainer-clean-multi mostlyclean-multi
|
||||
|
||||
install-exec-local: install-multi
|
||||
|
||||
all-local: all-multi
|
||||
mostlyclean-local: mostlyclean-multi
|
||||
clean-local: clean-multi
|
||||
distclean-local: distclean-multi
|
||||
maintainer-clean-local: maintainer-clean-multi
|
||||
@ -1,3 +1,10 @@
|
||||
2018-10-31 Joseph Myers <joseph@codesourcery.com>
|
||||
|
||||
Merge from GCC.
|
||||
PR bootstrap/82856
|
||||
* Makefile.am: Include multilib.am.
|
||||
* Makefile.in: Regenerate.
|
||||
|
||||
2018-06-21 Alan Modra <amodra@gmail.com>
|
||||
|
||||
* Makefile.in: Regenerate.
|
||||
|
||||
@ -59,3 +59,5 @@ AM_MAKEFLAGS = \
|
||||
"PICFLAG=$(PICFLAG)" \
|
||||
"RANLIB=$(RANLIB)" \
|
||||
"DESTDIR=$(DESTDIR)"
|
||||
|
||||
include $(top_srcdir)/../multilib.am
|
||||
|
||||
@ -245,7 +245,8 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/../compile \
|
||||
$(top_srcdir)/../config.guess $(top_srcdir)/../config.sub \
|
||||
$(top_srcdir)/../depcomp $(top_srcdir)/../install-sh \
|
||||
$(top_srcdir)/../ltmain.sh $(top_srcdir)/../missing \
|
||||
$(top_srcdir)/../mkinstalldirs ChangeLog README
|
||||
$(top_srcdir)/../mkinstalldirs $(top_srcdir)/../multilib.am \
|
||||
ChangeLog README
|
||||
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
||||
distdir = $(PACKAGE)-$(VERSION)
|
||||
top_distdir = $(distdir)
|
||||
@ -441,13 +442,19 @@ AM_MAKEFLAGS = \
|
||||
"RANLIB=$(RANLIB)" \
|
||||
"DESTDIR=$(DESTDIR)"
|
||||
|
||||
MULTISRCTOP =
|
||||
MULTIBUILDTOP =
|
||||
MULTIDIRS =
|
||||
MULTISUBDIR =
|
||||
MULTIDO = true
|
||||
MULTICLEAN = true
|
||||
all: all-am
|
||||
|
||||
.SUFFIXES:
|
||||
.SUFFIXES: .c .lo .o .obj
|
||||
am--refresh: Makefile
|
||||
@:
|
||||
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
|
||||
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../multilib.am $(am__configure_deps)
|
||||
@for dep in $?; do \
|
||||
case '$(am__configure_deps)' in \
|
||||
*$$dep*) \
|
||||
@ -469,6 +476,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
||||
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
|
||||
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
|
||||
esac;
|
||||
$(top_srcdir)/../multilib.am $(am__empty):
|
||||
|
||||
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
|
||||
$(SHELL) ./config.status --recheck
|
||||
@ -1030,7 +1038,7 @@ distcleancheck: distclean
|
||||
exit 1; } >&2
|
||||
check-am: all-am
|
||||
check: check-am
|
||||
all-am: Makefile $(LIBRARIES) $(LTLIBRARIES)
|
||||
all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) all-local
|
||||
installdirs:
|
||||
for dir in "$(DESTDIR)$(toolexeclibdir)"; do \
|
||||
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
|
||||
@ -1067,15 +1075,16 @@ maintainer-clean-generic:
|
||||
@echo "it deletes files that may require special tools to rebuild."
|
||||
clean: clean-am
|
||||
|
||||
clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
|
||||
clean-toolexeclibLIBRARIES mostlyclean-am
|
||||
clean-am: clean-generic clean-libtool clean-local \
|
||||
clean-noinstLTLIBRARIES clean-toolexeclibLIBRARIES \
|
||||
mostlyclean-am
|
||||
|
||||
distclean: distclean-am
|
||||
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
|
||||
-rm -rf ./$(DEPDIR)
|
||||
-rm -f Makefile
|
||||
distclean-am: clean-am distclean-compile distclean-generic \
|
||||
distclean-libtool distclean-tags
|
||||
distclean-libtool distclean-local distclean-tags
|
||||
|
||||
dvi: dvi-am
|
||||
|
||||
@ -1095,7 +1104,7 @@ install-dvi: install-dvi-am
|
||||
|
||||
install-dvi-am:
|
||||
|
||||
install-exec-am: install-toolexeclibLIBRARIES
|
||||
install-exec-am: install-exec-local install-toolexeclibLIBRARIES
|
||||
|
||||
install-html: install-html-am
|
||||
|
||||
@ -1122,12 +1131,13 @@ maintainer-clean: maintainer-clean-am
|
||||
-rm -rf $(top_srcdir)/autom4te.cache
|
||||
-rm -rf ./$(DEPDIR)
|
||||
-rm -f Makefile
|
||||
maintainer-clean-am: distclean-am maintainer-clean-generic
|
||||
maintainer-clean-am: distclean-am maintainer-clean-generic \
|
||||
maintainer-clean-local
|
||||
|
||||
mostlyclean: mostlyclean-am
|
||||
|
||||
mostlyclean-am: mostlyclean-compile mostlyclean-generic \
|
||||
mostlyclean-libtool
|
||||
mostlyclean-libtool mostlyclean-local
|
||||
|
||||
pdf: pdf-am
|
||||
|
||||
@ -1141,28 +1151,56 @@ uninstall-am: uninstall-toolexeclibLIBRARIES
|
||||
|
||||
.MAKE: install-am install-strip
|
||||
|
||||
.PHONY: CTAGS GTAGS TAGS all all-am am--refresh check check-am clean \
|
||||
clean-cscope clean-generic clean-libtool \
|
||||
clean-noinstLTLIBRARIES clean-toolexeclibLIBRARIES cscope \
|
||||
cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \
|
||||
.PHONY: CTAGS GTAGS TAGS all all-am all-local am--refresh check \
|
||||
check-am clean clean-cscope clean-generic clean-libtool \
|
||||
clean-local clean-noinstLTLIBRARIES clean-toolexeclibLIBRARIES \
|
||||
cscope cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \
|
||||
dist-gzip dist-lzip dist-shar dist-tarZ dist-xz dist-zip \
|
||||
distcheck distclean distclean-compile distclean-generic \
|
||||
distclean-libtool distclean-tags distcleancheck distdir \
|
||||
distuninstallcheck dvi dvi-am html html-am info info-am \
|
||||
install install-am install-data install-data-am install-dvi \
|
||||
install-dvi-am install-exec install-exec-am install-html \
|
||||
distclean-libtool distclean-local distclean-tags \
|
||||
distcleancheck distdir distuninstallcheck dvi dvi-am html \
|
||||
html-am info info-am install install-am install-data \
|
||||
install-data-am install-dvi install-dvi-am install-exec \
|
||||
install-exec-am install-exec-local install-html \
|
||||
install-html-am install-info install-info-am install-man \
|
||||
install-pdf install-pdf-am install-ps install-ps-am \
|
||||
install-strip install-toolexeclibLIBRARIES installcheck \
|
||||
installcheck-am installdirs maintainer-clean \
|
||||
maintainer-clean-generic mostlyclean mostlyclean-compile \
|
||||
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
|
||||
tags tags-am uninstall uninstall-am \
|
||||
uninstall-toolexeclibLIBRARIES
|
||||
maintainer-clean-generic maintainer-clean-local mostlyclean \
|
||||
mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
|
||||
mostlyclean-local pdf pdf-am ps ps-am tags tags-am uninstall \
|
||||
uninstall-am uninstall-toolexeclibLIBRARIES
|
||||
|
||||
.PRECIOUS: Makefile
|
||||
|
||||
|
||||
# GNU Make needs to see an explicit $(MAKE) variable in the command it
|
||||
# runs to enable its job server during parallel builds. Hence the
|
||||
# comments below.
|
||||
all-multi:
|
||||
$(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do # $(MAKE)
|
||||
install-multi:
|
||||
$(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do # $(MAKE)
|
||||
mostlyclean-multi:
|
||||
$(MULTICLEAN) $(AM_MAKEFLAGS) DO=mostlyclean multi-clean # $(MAKE)
|
||||
clean-multi:
|
||||
$(MULTICLEAN) $(AM_MAKEFLAGS) DO=clean multi-clean # $(MAKE)
|
||||
distclean-multi:
|
||||
$(MULTICLEAN) $(AM_MAKEFLAGS) DO=distclean multi-clean # $(MAKE)
|
||||
maintainer-clean-multi:
|
||||
$(MULTICLEAN) $(AM_MAKEFLAGS) DO=maintainer-clean multi-clean # $(MAKE)
|
||||
|
||||
.MAKE .PHONY: all-multi clean-multi distclean-multi install-am \
|
||||
install-multi maintainer-clean-multi mostlyclean-multi
|
||||
|
||||
install-exec-local: install-multi
|
||||
|
||||
all-local: all-multi
|
||||
mostlyclean-local: mostlyclean-multi
|
||||
clean-local: clean-multi
|
||||
distclean-local: distclean-multi
|
||||
maintainer-clean-local: maintainer-clean-multi
|
||||
|
||||
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
||||
# Otherwise a system limit (for SysV at least) may be exceeded.
|
||||
.NOEXPORT:
|
||||
|
||||
Loading…
Reference in New Issue
Block a user