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

	* check_GNU_style.sh: Fix paste args for BSD

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

diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index e3e9bfad8bdc395498a598896f6e8aafc18be669..e6eda90d5d3dcb23b9b63d9a9db35da4e680adf2 100644 (file)
--- 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 a7478f8f573132aef5ed1010f0cf5b13f08350d4..87a276c9cf47b5e07c4407f740ce05dce1928c30 100755 (executable)
--- 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