From: Alan Hayward <alan.hayward@arm.com>
Date: Fri, 10 Jun 2016 08:53:20 +0000 (+0000)
Subject: check_GNU_style.sh: Fix paste args for BSD
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=22d222d2401660d21b8d4f8f2a9b96cee9d852e7;p=gcc.git

check_GNU_style.sh: Fix paste args for BSD

2016-06-10  Alan Hayward  <alan.hayward@arm.com>

	* check_GNU_style.sh: Fix paste args for BSD

From-SVN: r237289
---

diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index e3e9bfad8bd..e6eda90d5d3 100644
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,7 @@
+2016-06-10  Alan Hayward  <alan.hayward@arm.com>
+
+	* check_GNU_style.sh: Fix paste args for BSD
+
 2016-06-09  David Malcolm  <dmalcolm@redhat.com>
 
 	* config-list.mk (LIST): Add OPT-enable-obsolete to avr-rtems,
diff --git a/contrib/check_GNU_style.sh b/contrib/check_GNU_style.sh
index a7478f8f573..87a276c9cf4 100755
--- a/contrib/check_GNU_style.sh
+++ b/contrib/check_GNU_style.sh
@@ -191,7 +191,7 @@ col (){
 	# Combine prefix back with long lines.
 	# Filter out empty lines.
 	local found=false
-	paste -d '' "$tmp2" "$tmp3" \
+	paste -d '\0' "$tmp2" "$tmp3" \
 	    | grep -v '^[0-9][0-9]*:+$' \
 	    > "$tmp" && found=true