summaryrefslogtreecommitdiffstats
path: root/patches/tiobench-0.3.3
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2012-10-18 15:03:24 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2012-10-18 16:24:13 +0200
commit3ad165067c1eba8b6f19228d5e3fbd0f203da881 (patch)
treef02c3e6d6e56940594575ab96365dfa649813a08 /patches/tiobench-0.3.3
parent7b3fb25f63056062f9ac94641c6ff56579aa8172 (diff)
downloadptxdist-3ad165067c1eba8b6f19228d5e3fbd0f203da881.tar.gz
ptxdist-3ad165067c1eba8b6f19228d5e3fbd0f203da881.tar.xz
tiobench: add patch to to fix building with newer glibc
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches/tiobench-0.3.3')
-rw-r--r--patches/tiobench-0.3.3/0001-Output-help-if-no-parameters-are-given.patch (renamed from patches/tiobench-0.3.3/print_help_if_no_parameters_are_given.diff)14
-rw-r--r--patches/tiobench-0.3.3/0002-rename-aligned_alloc-to-avoid-conflicting-with-globa.patch32
-rw-r--r--patches/tiobench-0.3.3/series6
3 files changed, 44 insertions, 8 deletions
diff --git a/patches/tiobench-0.3.3/print_help_if_no_parameters_are_given.diff b/patches/tiobench-0.3.3/0001-Output-help-if-no-parameters-are-given.patch
index 391700e5c..036e27c44 100644
--- a/patches/tiobench-0.3.3/print_help_if_no_parameters_are_given.diff
+++ b/patches/tiobench-0.3.3/0001-Output-help-if-no-parameters-are-given.patch
@@ -1,11 +1,11 @@
-Subject: Output help if no parameters are given
From: Juergen Beisert <j.beisert@pengutronix.de>
+Date: Thu, 18 Oct 2012 14:25:03 +0200
+Subject: [PATCH] Output help if no parameters are given
Output a help, if a user omit any parameter instead of silently start the
job and do something.
Signed-off-by: Juergen Beisert <j.beisert@pengutronix.de>
-
---
#20091205: rsc: added to the sourceforge tracker
@@ -14,11 +14,11 @@ Signed-off-by: Juergen Beisert <j.beisert@pengutronix.de>
tiotest.c | 3 +++
1 file changed, 3 insertions(+)
-Index: tiotest.c
-===================================================================
---- tiotest.c.orig
-+++ tiotest.c
-@@ -112,6 +112,9 @@ void parse_args( ArgumentOptions* args,
+diff --git a/tiotest.c b/tiotest.c
+index 38f54e7..6407d70 100644
+--- a/tiotest.c
++++ b/tiotest.c
+@@ -112,6 +112,9 @@ void parse_args( ArgumentOptions* args, int argc, char *argv[] )
int c;
int once = 0;
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
new file mode 100644
index 000000000..6dc95fcc5
--- /dev/null
+++ b/patches/tiobench-0.3.3/0002-rename-aligned_alloc-to-avoid-conflicting-with-globa.patch
@@ -0,0 +1,32 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Thu, 18 Oct 2012 14:25:50 +0200
+Subject: [PATCH] rename aligned_alloc to avoid conflicting with global
+ definitions
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ tiotest.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tiotest.c b/tiotest.c
+index 6407d70..611fb76 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
+ */
+ ArgumentOptions args;
+
+-static void * aligned_alloc(ssize_t size)
++static void * _aligned_alloc(ssize_t size)
+ {
+ caddr_t a;
+ a = mmap((caddr_t )0, size,
+@@ -284,7 +284,7 @@ void initialize_test( ThreadTest *d )
+ pthread_attr_setscope(&(d->threads[i].thread_attr),
+ PTHREAD_SCOPE_SYSTEM);
+
+- d->threads[i].buffer = aligned_alloc( d->threads[i].blockSize );
++ d->threads[i].buffer = _aligned_alloc( d->threads[i].blockSize );
+ if( d->threads[i].buffer == NULL )
+ {
+ perror("Error allocating memory");
diff --git a/patches/tiobench-0.3.3/series b/patches/tiobench-0.3.3/series
index 008a578c1..f164acc86 100644
--- a/patches/tiobench-0.3.3/series
+++ b/patches/tiobench-0.3.3/series
@@ -1 +1,5 @@
-print_help_if_no_parameters_are_given.diff -p0
+# generated by git-ptx-patches
+#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