From: Jakub Jelinek <jakub@redhat.com>
Date: Tue, 28 Feb 2012 09:28:18 +0000 (+0100)
Subject: Makefile.am (libstdc++-symbols.ver): Only remove comment lines if they are at the... 
X-Git-Tag: releases/gcc-4.7.0~177
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9396206b54f13ac683b681e2b117fa4704ada247;p=thirdparty%2Fgcc.git

Makefile.am (libstdc++-symbols.ver): Only remove comment lines if they are at the beginning of lines (with optional...

	* src/Makefile.am (libstdc++-symbols.ver): Only remove comment lines
	if they are at the beginning of lines (with optional whitespace before
	#).
	* src/Makefile.in: Regenerated.

From-SVN: r184621
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 08f82bade405..9d038f2b7fba 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2012-02-28  Jakub Jelinek  <jakub@redhat.com>
+
+	* src/Makefile.am (libstdc++-symbols.ver): Only remove comment lines
+	if they are at the beginning of lines (with optional whitespace before
+	#).
+	* src/Makefile.in: Regenerated.
+
 2012-02-27  Jakub Jelinek  <jakub@redhat.com>
 
 	* config/abi/post/i386-linux-gnu/baseline_symbols.txt: Update.
diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am
index f3ca0d7960e8..eb80bfecdd7d 100644
--- a/libstdc++-v3/src/Makefile.am
+++ b/libstdc++-v3/src/Makefile.am
@@ -115,7 +115,7 @@ libstdc++-symbols.ver:  ${glibcxx_srcdir}/$(SYMVER_FILE) \
 	    rm tmp.top tmp.bottom; \
 	  fi; \
 	fi
-	$(EGREP) -v '#(#| |$$)' $@.tmp | \
+	$(EGREP) -v '^[ 	]*#(#| |$$)' $@.tmp | \
 	  $(COMPILE) -E -P -include config.h - > $@ || (rm -f $@ ; exit 1)
 	rm -f $@.tmp
 
diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in
index 17a6fb281a9b..34c0a3156eda 100644
--- a/libstdc++-v3/src/Makefile.in
+++ b/libstdc++-v3/src/Makefile.in
@@ -776,7 +776,7 @@ vpath % $(top_srcdir)
 @ENABLE_SYMVERS_TRUE@	    rm tmp.top tmp.bottom; \
 @ENABLE_SYMVERS_TRUE@	  fi; \
 @ENABLE_SYMVERS_TRUE@	fi
-@ENABLE_SYMVERS_TRUE@	$(EGREP) -v '#(#| |$$)' $@.tmp | \
+@ENABLE_SYMVERS_TRUE@	$(EGREP) -v '^[ 	]*#(#| |$$)' $@.tmp | \
 @ENABLE_SYMVERS_TRUE@	  $(COMPILE) -E -P -include config.h - > $@ || (rm -f $@ ; exit 1)
 @ENABLE_SYMVERS_TRUE@	rm -f $@.tmp
 @ENABLE_SYMVERS_SUN_TRUE@@ENABLE_SYMVERS_TRUE@libstdc++-symbols.ver-sun : libstdc++-symbols.ver \