diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2012-10-25 22:50:54 +0000 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2012-10-25 22:50:54 +0000 |
| commit | aa54351297e54dece824cc13ec9fcc909e97aff3 (patch) | |
| tree | 738e3f15d7d96ee84d686d5579f7bbe0717ab836 /gold | |
| parent | d361fafb734b52810cb9b33a62c1d5b8931ed86f (diff) | |
| download | gdb-aa54351297e54dece824cc13ec9fcc909e97aff3.zip gdb-aa54351297e54dece824cc13ec9fcc909e97aff3.tar.gz gdb-aa54351297e54dece824cc13ec9fcc909e97aff3.tar.bz2 | |
Strip out -Wp,-D_FORTIFY_SOURCE= for gold tests
* testsuite/Makefile.am (COMPILE1): New variable. Renamed from
COMPILE generated by automake.
(LINK1): Likewise.
(CXXCOMPILE1): Likewise.
(CXXLINK1): Likewise.
(COMPILE): Strip out -Wp,-D_FORTIFY_SOURCE= from COMPILE1.
(LINK): Likewise.
(CXXCOMPILE): Likewise.
(CXXLINK): Likewise.
* testsuite/Makefile.in: Regenerated.
Diffstat (limited to 'gold')
| -rw-r--r-- | gold/ChangeLog | 13 | ||||
| -rw-r--r-- | gold/testsuite/Makefile.am | 19 | ||||
| -rw-r--r-- | gold/testsuite/Makefile.in | 29 |
3 files changed, 54 insertions, 7 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog index a15902e..45dc043 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,5 +1,18 @@ 2012-10-25 H.J. Lu <hongjiu.lu@intel.com> + * testsuite/Makefile.am (COMPILE1): New variable. Renamed from + COMPILE generated by automake. + (LINK1): Likewise. + (CXXCOMPILE1): Likewise. + (CXXLINK1): Likewise. + (COMPILE): Strip out -Wp,-D_FORTIFY_SOURCE= from COMPILE1. + (LINK): Likewise. + (CXXCOMPILE): Likewise. + (CXXLINK): Likewise. + * testsuite/Makefile.in: Regenerated. + +2012-10-25 H.J. Lu <hongjiu.lu@intel.com> + * dwp.cc (Dwo_file::record_target_info): Issue a fatal error on bad fwrite return. diff --git a/gold/testsuite/Makefile.am b/gold/testsuite/Makefile.am index 8bb16b6..64e36e4 100644 --- a/gold/testsuite/Makefile.am +++ b/gold/testsuite/Makefile.am @@ -19,6 +19,25 @@ AM_CPPFLAGS = \ -DLOCALEDIR="\"$(datadir)/locale\"" \ @INCINTL@ +# 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 $@ +CXXCOMPILE1 = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +CXXLINK1 = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ + -o $@ + +# Strip out -Wp,-D_FORTIFY_SOURCE=, which is rrelevant 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]]*//'` +LINK = `echo $(LINK1) | sed -e 's/-Wp,-D_FORTIFY_SOURCE=[0-9][0-9]*//'` +CXXCOMPILE = `echo $(CXXCOMPILE1) | sed -e 's/-Wp,-D_FORTIFY_SOURCE=[0-9][0-9]*//'` +CXXLINK = `echo $(CXXLINK1) | sed -e 's/-Wp,-D_FORTIFY_SOURCE=[0-9][0-9]*//'` + TEST_READELF = $(top_builddir)/../binutils/readelf TEST_OBJDUMP = $(top_builddir)/../binutils/objdump TEST_OBJCOPY = $(top_builddir)/../binutils/objcopy diff --git a/gold/testsuite/Makefile.in b/gold/testsuite/Makefile.in index 80aeb09..3a9cf0c 100644 --- a/gold/testsuite/Makefile.in +++ b/gold/testsuite/Makefile.in @@ -1697,15 +1697,8 @@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/../depcomp am__depfiles_maybe = depfiles am__mv = mv -f -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) -LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) CXXLD = $(CXX) -CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ - -o $@ SOURCES = $(libgoldtest_a_SOURCES) basic_pic_test.c basic_pie_test.c \ basic_static_pic_test.c basic_static_test.c basic_test.c \ $(binary_test_SOURCES) $(binary_unittest_SOURCES) \ @@ -2007,6 +2000,28 @@ AM_CPPFLAGS = \ -DLOCALEDIR="\"$(datadir)/locale\"" \ @INCINTL@ + +# 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 $@ +CXXCOMPILE1 = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) + +CXXLINK1 = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ + -o $@ + + +# Strip out -Wp,-D_FORTIFY_SOURCE=, which is rrelevant 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]]*//'` +LINK = `echo $(LINK1) | sed -e 's/-Wp,-D_FORTIFY_SOURCE=[0-9][0-9]*//'` +CXXCOMPILE = `echo $(CXXCOMPILE1) | sed -e 's/-Wp,-D_FORTIFY_SOURCE=[0-9][0-9]*//'` +CXXLINK = `echo $(CXXLINK1) | sed -e 's/-Wp,-D_FORTIFY_SOURCE=[0-9][0-9]*//'` TEST_READELF = $(top_builddir)/../binutils/readelf TEST_OBJDUMP = $(top_builddir)/../binutils/objdump TEST_OBJCOPY = $(top_builddir)/../binutils/objcopy |