From: Kelley Cook <kelleycook@wideopenwest.com>
Date: Fri, 20 Jun 2003 20:07:51 +0000 (+0000)
Subject: * opts.sh: Tweak awk script for portability.
X-Git-Tag: releases/gcc-3.4.0~5605
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e819ee4487e5fc02903e71a72cf35841eb62932f;p=thirdparty%2Fgcc.git

* opts.sh: Tweak awk script for portability.

From-SVN: r68282
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3f405374acaf..7625baeb7987 100644
--- 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 bbca27265c72..385ef34414e5 100644
--- 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)
     {