* opts.sh: Tweak awk script for portability.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3f40537..7625bae 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2003-06-20  Kelley Cook  <kelleycook@wideopenwest.com>
+
+       * opts.sh: Tweak awk script for portability.
+
 2003-06-20  Mark Mitchell  <mark@codesourcery.com>
 
        PR c++/10888

diff --git a/gcc/opts.sh b/gcc/opts.sh
index bbca272..385ef34 100644 (file)
--- a/gcc/opts.sh
+++ b/gcc/opts.sh
@@ -33,15 +33,11 @@ SORT=sort           # Could be /bin/sort or /usr/bin/sort
 C_FILE=$1; shift
 H_FILE=$1; shift
 
-# Must unset, so that RS="" works in gawk 3.0-3.1.1 (possibly earlier too)
-# Appears to be a gawk bug, RS="" is not an extension
-unset POSIXLY_CORRECT
-
 ${AWK} '
-       BEGIN{ RS=""; FS="\n" }
        # Ignore comments and blank lines
        /^[ \t]*(;|$)/  { next }
-       /^[^ \t]/       { gsub ("\n", "\034", $0); print }
+       # Note that RS="" falls foul of gawk 3.1.2 bugs
+       /^[^ \t]/       { getline tmp; print $0 "\034" tmp}
 ' "$@" | ${SORT} | ${AWK} '
     function switch_flags (flags,   result)
     {