diff options
| -rw-r--r-- | contrib/ChangeLog | 4 | ||||
| -rwxr-xr-x | contrib/check_GNU_style.sh | 2 |
2 files changed, 5 insertions, 1 deletions
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 |