aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely@redhat.com>2018-04-18 13:14:58 +0100
committerJonathan Wakely <redi@gcc.gnu.org>2018-04-18 13:14:58 +0100
commit05b14480611a6791e11f8f5811ca291e79ddbb46 (patch)
tree7dde3172f374cdde7739576f3af631b750ff1a47
parent7d6051b12507a69c82e21fbea867dd8b0eda22c8 (diff)
downloadgcc-05b14480611a6791e11f8f5811ca291e79ddbb46.zip
gcc-05b14480611a6791e11f8f5811ca291e79ddbb46.tar.gz
gcc-05b14480611a6791e11f8f5811ca291e79ddbb46.tar.bz2
PR libstdc++/85442 fix duplicate debuginfo for cxx11-ios_failure.cc
2018-04-18 Jonathan Wakely <jwakely@redhat.com> Jakub Jelinek <jakub@redhat.com> PR libstdc++/85442 * src/c++11/Makefile.am: Don't generate debuginfo again for cxx11-ios_failure-lt.s and cxx11-ios_failure.s files. * src/c++11/Makefile.in: Regenerate. Co-Authored-By: Jakub Jelinek <jakub@redhat.com> From-SVN: r259467
-rw-r--r--libstdc++-v3/ChangeLog8
-rw-r--r--libstdc++-v3/src/c++11/Makefile.am4
-rw-r--r--libstdc++-v3/src/c++11/Makefile.in4
3 files changed, 12 insertions, 4 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index fb3abb9..6c0fe7e 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,4 +1,12 @@
2018-04-18 Jonathan Wakely <jwakely@redhat.com>
+ Jakub Jelinek <jakub@redhat.com>
+
+ PR libstdc++/85442
+ * src/c++11/Makefile.am: Don't generate debuginfo again for
+ cxx11-ios_failure-lt.s and cxx11-ios_failure.s files.
+ * src/c++11/Makefile.in: Regenerate.
+
+2018-04-18 Jonathan Wakely <jwakely@redhat.com>
PR libstdc++/84442
* testsuite/30_threads/thread/cons/terminate.cc
diff --git a/libstdc++-v3/src/c++11/Makefile.am b/libstdc++-v3/src/c++11/Makefile.am
index cdc49bb..91bf6f8 100644
--- a/libstdc++-v3/src/c++11/Makefile.am
+++ b/libstdc++-v3/src/c++11/Makefile.am
@@ -141,9 +141,9 @@ cxx11-ios_failure.s: cxx11-ios_failure.cc
-rm -f tmp-$@
cxx11-ios_failure.lo: cxx11-ios_failure-lt.s
- $(LTCXXCOMPILE) -c $< -o $@
+ $(LTCXXCOMPILE) -g0 -c $< -o $@
cxx11-ios_failure.o: cxx11-ios_failure.s
- $(CXXCOMPILE) -c $<
+ $(CXXCOMPILE) -g0 -c $<
endif
# AM_CXXFLAGS needs to be in each subdirectory so that it can be
diff --git a/libstdc++-v3/src/c++11/Makefile.in b/libstdc++-v3/src/c++11/Makefile.in
index dd103ec..977f1ab 100644
--- a/libstdc++-v3/src/c++11/Makefile.in
+++ b/libstdc++-v3/src/c++11/Makefile.in
@@ -763,9 +763,9 @@ hashtable_c++0x.o: hashtable_c++0x.cc
@ENABLE_DUAL_ABI_TRUE@ -rm -f tmp-$@
@ENABLE_DUAL_ABI_TRUE@cxx11-ios_failure.lo: cxx11-ios_failure-lt.s
-@ENABLE_DUAL_ABI_TRUE@ $(LTCXXCOMPILE) -c $< -o $@
+@ENABLE_DUAL_ABI_TRUE@ $(LTCXXCOMPILE) -g0 -c $< -o $@
@ENABLE_DUAL_ABI_TRUE@cxx11-ios_failure.o: cxx11-ios_failure.s
-@ENABLE_DUAL_ABI_TRUE@ $(CXXCOMPILE) -c $<
+@ENABLE_DUAL_ABI_TRUE@ $(CXXCOMPILE) -g0 -c $<
# 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.