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

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index fb3abb902683f6953a82dd1d1d4ef1741da65437..6c0fe7e57bce92db64719f7a07dc1db904289ba2 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,11 @@
+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

diff --git a/libstdc++-v3/src/c++11/Makefile.am b/libstdc++-v3/src/c++11/Makefile.am
index cdc49bb7f9b56742563e8de16c16e8e5b9b9979e..91bf6f8d642d46f6cf336a6bc4ab52b30b82be73 100644 (file)
--- 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 dd103ec4060a7a31c03efefa56b074e8137879cd..977f1ab441d61e8464b327ef699e29958c3c0540 100644 (file)
--- 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.