OSDN Git Service

* src/Makefile.am (libstdc++-symbols.ver): Only remove comment lines
authorjakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>
Tue, 28 Feb 2012 09:28:18 +0000 (09:28 +0000)
committerjakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>
Tue, 28 Feb 2012 09:28:18 +0000 (09:28 +0000)
if they are at the beginning of lines (with optional whitespace before
#).
* src/Makefile.in: Regenerated.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@184621 138bc75d-0d04-0410-961f-82ee72b054a4

libstdc++-v3/ChangeLog
libstdc++-v3/src/Makefile.am
libstdc++-v3/src/Makefile.in

index 08f82ba..9d038f2 100644 (file)
@@ -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.
index f3ca0d7..eb80bfe 100644 (file)
@@ -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
 
index 17a6fb2..34c0a31 100644 (file)
@@ -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 \