summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authoralahay01 <alahay01@138bc75d-0d04-0410-961f-82ee72b054a4>2016-06-10 08:53:20 +0000
committeralahay01 <alahay01@138bc75d-0d04-0410-961f-82ee72b054a4>2016-06-10 08:53:20 +0000
commit0b4f50639ea0f1fc14f92d775b586f0aed290b8e (patch)
treea96517b5e8fee6d55a16c78201314ddb7ae210cf /contrib
parentbb038f3eedba6ea2798b126fb9096e55755d28c7 (diff)
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
Diffstat (limited to 'contrib')
-rw-r--r--contrib/ChangeLog4
-rwxr-xr-xcontrib/check_GNU_style.sh2
2 files changed, 5 insertions, 1 deletions
diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index e3e9bfad8bdc..e6eda90d5d3d 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 a7478f8f5731..87a276c9cf47 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