diff options
| author | Cary Coutant <ccoutant@google.com> | 2014-04-02 15:04:36 -0700 |
|---|---|---|
| committer | Cary Coutant <ccoutant@google.com> | 2014-04-02 15:04:36 -0700 |
| commit | ae447ddd12cf05bc5bef90c4a3f53239b5bcf2f9 (patch) | |
| tree | cf2c145cc7017f573dbe7e37b39d201f373a1570 /gold/testsuite | |
| parent | 0a899fd5acf97c0c9af7c6548e2c0e132148cf78 (diff) | |
| download | gdb-ae447ddd12cf05bc5bef90c4a3f53239b5bcf2f9.zip gdb-ae447ddd12cf05bc5bef90c4a3f53239b5bcf2f9.tar.gz gdb-ae447ddd12cf05bc5bef90c4a3f53239b5bcf2f9.tar.bz2 | |
Modify gold testsuite to disable plugins added by GCC driver.
GCC 4.8 now adds linker plugin options by default, which conflict with the
--incremental tests in the testsuite. This patch checks whether the compiler
supports the -fno-use-linker-plugin option, and adds it to all link
commands.
2014-04-02 Cary Coutant <ccoutant@google.com>
* configure.ac (HAVE_PUBNAMES): Use C instead of C++.
(HAVE_NO_USE_LINKER_PLUGIN): Check for -fno-use-linker-plugin.
* configure: Regenerate.
* testsuite/Makefile.am (OPT_NO_PLUGINS): New macro for
-fno-use-linker-plugin.
(LINK1, CXXLINK1): Add it to the link command.
* testsuite/Makefile.in: Regenerate.
Diffstat (limited to 'gold/testsuite')
| -rw-r--r-- | gold/testsuite/Makefile.am | 15 | ||||
| -rw-r--r-- | gold/testsuite/Makefile.in | 14 |
2 files changed, 21 insertions, 8 deletions
diff --git a/gold/testsuite/Makefile.am b/gold/testsuite/Makefile.am index aa41290..52cc05e 100644 --- a/gold/testsuite/Makefile.am +++ b/gold/testsuite/Makefile.am @@ -19,18 +19,25 @@ AM_CPPFLAGS = \ -DLOCALEDIR="\"$(datadir)/locale\"" \ @INCINTL@ +# Some versions of GCC now automatically enable linker plugins, +# but we want to run our tests without GCC's plugins. +if HAVE_NO_USE_LINKER_PLUGIN +OPT_NO_PLUGINS = -fno-use-linker-plugin +endif + # COMPILE1, LINK1, CXXCOMPILE1, CXXLINK1 are renamed from COMPILE, LINK, # CXXCOMPILE and CXXLINK generated by automake 1.11.1. FIXME: they should # be updated if they are different from automake used by gold. COMPILE1 = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LINK1 = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +LINK1 = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(OPT_NO_PLUGINS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXCOMPILE1 = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -CXXLINK1 = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ - -o $@ +CXXLINK1 = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(OPT_NO_PLUGINS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ -# Strip out -Wp,-D_FORTIFY_SOURCE=, which is rrelevant for the gold +# Strip out -Wp,-D_FORTIFY_SOURCE=, which is irrelevant for the gold # testsuite and incompatible with -O0 used in gold tests, from # COMPILE, LINK, CXXCOMPILE and CXXLINK. COMPILE = `echo $(COMPILE1) | sed -e 's/-Wp,-D_FORTIFY_SOURCE=[0-9[0-9]]*//'` diff --git a/gold/testsuite/Makefile.in b/gold/testsuite/Makefile.in index 60c2c10..da0a338 100644 --- a/gold/testsuite/Makefile.in +++ b/gold/testsuite/Makefile.in @@ -2096,21 +2096,27 @@ AM_CPPFLAGS = \ @INCINTL@ +# Some versions of GCC now automatically enable linker plugins, +# but we want to run our tests without GCC's plugins. +@HAVE_NO_USE_LINKER_PLUGIN_TRUE@OPT_NO_PLUGINS = -fno-use-linker-plugin + # COMPILE1, LINK1, CXXCOMPILE1, CXXLINK1 are renamed from COMPILE, LINK, # CXXCOMPILE and CXXLINK generated by automake 1.11.1. FIXME: they should # be updated if they are different from automake used by gold. COMPILE1 = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LINK1 = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +LINK1 = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(OPT_NO_PLUGINS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ + CXXCOMPILE1 = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -CXXLINK1 = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ - -o $@ +CXXLINK1 = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(OPT_NO_PLUGINS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ -# Strip out -Wp,-D_FORTIFY_SOURCE=, which is rrelevant for the gold +# Strip out -Wp,-D_FORTIFY_SOURCE=, which is irrelevant for the gold # testsuite and incompatible with -O0 used in gold tests, from # COMPILE, LINK, CXXCOMPILE and CXXLINK. COMPILE = `echo $(COMPILE1) | sed -e 's/-Wp,-D_FORTIFY_SOURCE=[0-9[0-9]]*//'` |