benchtests: Append volatile keyword to type instead of prepending

`volatile int` means the same as 'int volatile', but that's not the
case for 'volatile char *' and 'char * volatile'.  We won't need a
'char volatile *' or other complicated semantics for now.

2 files changed, 6 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index c46833bef4..cc1478c529 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-12-06  Siddhesh Poyarekar  <siddhesh@redhat.com>
+
+	* scripts/bench.pl: Append volatile keyword to type.
+
 2013-12-05  Kaz Kojima  <kkojima@rr.iij4u.or.jp>
 
 	* sysdeps/sh/sotruss-lib.c: New file.
diff --git a/scripts/bench.pl b/scripts/bench.pl
index 90441e1969..10f0ba4179 100755
--- a/scripts/bench.pl
+++ b/scripts/bench.pl
@@ -98,7 +98,7 @@ my $bench_func = "#define CALL_BENCH_FUNC(v, i) $func (";
 my $outvars = "";
 
 if ($ret ne "void") {
-  $outvars = "static volatile $ret ret;\n";
+  $outvars = "static $ret volatile ret;\n";
 }
 
 # Print the definitions and macros.
@@ -139,7 +139,7 @@ if (@args > 0) {
       $bench_func = "$bench_func &out$num";
     }
     else {
-      $arg_struct = "$arg_struct volatile $arg arg$num;";
+      $arg_struct = "$arg_struct $arg volatile arg$num;";
       $bench_func = "$bench_func variants[v].in[i].arg$num";
     }