diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2015-12-02 15:54:11 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2015-12-03 22:28:37 +0100 |
| commit | c00487686b1211dc400775da67ae67c8a4000a9d (patch) | |
| tree | dba3ae89d68d5f0e45ec198479e8919793f8f162 /patches/tiobench-0.3.3 | |
| parent | e4019333c9762a41d132907eccfa602208e5d5e9 (diff) | |
| download | ptxdist-c00487686b1211dc400775da67ae67c8a4000a9d.tar.gz ptxdist-c00487686b1211dc400775da67ae67c8a4000a9d.tar.xz | |
tiobench: fix building with gcc-5.x
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches/tiobench-0.3.3')
4 files changed, 29 insertions, 9 deletions
diff --git a/patches/tiobench-0.3.3/0001-Output-help-if-no-parameters-are-given.patch b/patches/tiobench-0.3.3/0001-Output-help-if-no-parameters-are-given.patch index 036e27c44..48de2c555 100644 --- a/patches/tiobench-0.3.3/0001-Output-help-if-no-parameters-are-given.patch +++ b/patches/tiobench-0.3.3/0001-Output-help-if-no-parameters-are-given.patch @@ -7,15 +7,11 @@ job and do something. Signed-off-by: Juergen Beisert <j.beisert@pengutronix.de> --- - -#20091205: rsc: added to the sourceforge tracker -# https://sourceforge.net/tracker/?func=detail&aid=2909392&group_id=3857&atid=303857 - - tiotest.c | 3 +++ + tiotest.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tiotest.c b/tiotest.c -index 38f54e7..6407d70 100644 +index 38f54e7917a0..6407d70252bf 100644 --- a/tiotest.c +++ b/tiotest.c @@ -112,6 +112,9 @@ void parse_args( ArgumentOptions* args, int argc, char *argv[] ) diff --git a/patches/tiobench-0.3.3/0002-rename-aligned_alloc-to-avoid-conflicting-with-globa.patch b/patches/tiobench-0.3.3/0002-rename-aligned_alloc-to-avoid-conflicting-with-globa.patch index 6dc95fcc5..4055f6198 100644 --- a/patches/tiobench-0.3.3/0002-rename-aligned_alloc-to-avoid-conflicting-with-globa.patch +++ b/patches/tiobench-0.3.3/0002-rename-aligned_alloc-to-avoid-conflicting-with-globa.patch @@ -5,11 +5,11 @@ Subject: [PATCH] rename aligned_alloc to avoid conflicting with global Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> --- - tiotest.c | 4 ++-- + tiotest.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tiotest.c b/tiotest.c -index 6407d70..611fb76 100644 +index 6407d70252bf..611fb76f9635 100644 --- a/tiotest.c +++ b/tiotest.c @@ -31,7 +31,7 @@ static const char* versionStr = "tiotest v0.3.3 (C) 1999-2000 Mika Kuoppala <mik diff --git a/patches/tiobench-0.3.3/0003-remove-bogus-inline.patch b/patches/tiobench-0.3.3/0003-remove-bogus-inline.patch new file mode 100644 index 000000000..824787c1f --- /dev/null +++ b/patches/tiobench-0.3.3/0003-remove-bogus-inline.patch @@ -0,0 +1,23 @@ +From: Michael Olbrich <m.olbrich@pengutronix.de> +Date: Wed, 2 Dec 2015 11:49:11 +0100 +Subject: [PATCH] remove bogus 'inline' + +It breaks compiling with gcc-5.x + +Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> +--- + crc32.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/crc32.c b/crc32.c +index bae73847d5d3..810fcc0d054a 100644 +--- a/crc32.c ++++ b/crc32.c +@@ -72,7 +72,6 @@ static const unsigned long crctab[256] = { + 0xA2F33668, 0xBCB4666D, 0xB8757BDA, 0xB5365D03, 0xB1F740B4 + }; + +-inline + unsigned long crc32( const void* buffer, + unsigned long length, + unsigned long crc) diff --git a/patches/tiobench-0.3.3/series b/patches/tiobench-0.3.3/series index f164acc86..6eaedc046 100644 --- a/patches/tiobench-0.3.3/series +++ b/patches/tiobench-0.3.3/series @@ -2,4 +2,5 @@ #tag:base --start-number 1 0001-Output-help-if-no-parameters-are-given.patch 0002-rename-aligned_alloc-to-avoid-conflicting-with-globa.patch -# 88360e443d1610797d3b2c7188f8eba9 - git-ptx-patches magic +0003-remove-bogus-inline.patch +# aa049ab87f0815e71f60cb3d4f5f0d1d - git-ptx-patches magic |