diff options
-rw-r--r-- | benchmarks/dhrystone/Makefile | 3 | ||||
-rw-r--r-- | benchmarks/dhrystone/distinfo | 4 | ||||
-rw-r--r-- | benchmarks/dhrystone/patches/patch-dhry__1_c | 44 | ||||
-rw-r--r-- | benchmarks/dhrystone/patches/patch-dhry__2_c | 15 |
4 files changed, 64 insertions, 2 deletions
diff --git a/benchmarks/dhrystone/Makefile b/benchmarks/dhrystone/Makefile index 6aac13ce7fa..2c6eeca22ef 100644 --- a/benchmarks/dhrystone/Makefile +++ b/benchmarks/dhrystone/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.14 2009/05/16 20:21:17 zafer Exp $ +# $NetBSD: Makefile,v 1.15 2012/06/18 01:46:07 dholland Exp $ DISTNAME= dhry2.1 PKGNAME= dhrystone-2.1 +PKGREVISION= 1 CATEGORIES= benchmarks MASTER_SITES= ftp://ftp.planix.com/pub/mirror/ EXTRACT_SUFX= .tar.Z diff --git a/benchmarks/dhrystone/distinfo b/benchmarks/dhrystone/distinfo index d6f81a9a380..7996a17c3e9 100644 --- a/benchmarks/dhrystone/distinfo +++ b/benchmarks/dhrystone/distinfo @@ -1,6 +1,8 @@ -$NetBSD: distinfo,v 1.3 2005/02/22 21:16:36 agc Exp $ +$NetBSD: distinfo,v 1.4 2012/06/18 01:46:07 dholland Exp $ SHA1 (dhry2.1.tar.Z) = 7b99b90dc191aac1b08fbfc256ffc0fc650ab373 RMD160 (dhry2.1.tar.Z) = f4fe0e2bbeacab3e4ce800ac9befef2ff1b47013 Size (dhry2.1.tar.Z) = 32681 bytes SHA1 (patch-aa) = f43b8165845ff6670160d8458cc2c6a2b779f628 +SHA1 (patch-dhry__1_c) = 604950d273d74a1a9c6c98e269815a01becde3aa +SHA1 (patch-dhry__2_c) = 3e6caecd550c4e0f188fb7eeb6c9eda60a468a17 diff --git a/benchmarks/dhrystone/patches/patch-dhry__1_c b/benchmarks/dhrystone/patches/patch-dhry__1_c new file mode 100644 index 00000000000..de888e372b8 --- /dev/null +++ b/benchmarks/dhrystone/patches/patch-dhry__1_c @@ -0,0 +1,44 @@ +$NetBSD: patch-dhry__1_c,v 1.1 2012/06/18 01:46:07 dholland Exp $ + +- use standard headers +- don't declare own malloc +- print pointers with %p + +--- dhry_1.c.orig 1988-07-12 19:35:10.000000000 +0000 ++++ dhry_1.c +@@ -15,6 +15,9 @@ + **************************************************************************** + */ + ++#include <stdlib.h> ++#include <string.h> ++ + #include "dhry.h" + + /* Global Variables: */ +@@ -28,7 +31,6 @@ char Ch_1_Glob, + int Arr_1_Glob [50]; + int Arr_2_Glob [50] [50]; + +-extern char *malloc (); + Enumeration Func_1 (); + /* forward declaration necessary since Enumeration may not simply be int */ + +@@ -221,7 +223,7 @@ main () + printf ("Arr_2_Glob[8][7]: %d\n", Arr_2_Glob[8][7]); + printf (" should be: Number_Of_Runs + 10\n"); + printf ("Ptr_Glob->\n"); +- printf (" Ptr_Comp: %d\n", (int) Ptr_Glob->Ptr_Comp); ++ printf (" Ptr_Comp: %p\n", Ptr_Glob->Ptr_Comp); + printf (" should be: (implementation-dependent)\n"); + printf (" Discr: %d\n", Ptr_Glob->Discr); + printf (" should be: %d\n", 0); +@@ -232,7 +234,7 @@ main () + printf (" Str_Comp: %s\n", Ptr_Glob->variant.var_1.Str_Comp); + printf (" should be: DHRYSTONE PROGRAM, SOME STRING\n"); + printf ("Next_Ptr_Glob->\n"); +- printf (" Ptr_Comp: %d\n", (int) Next_Ptr_Glob->Ptr_Comp); ++ printf (" Ptr_Comp: %p\n", Next_Ptr_Glob->Ptr_Comp); + printf (" should be: (implementation-dependent), same as above\n"); + printf (" Discr: %d\n", Next_Ptr_Glob->Discr); + printf (" should be: %d\n", 0); diff --git a/benchmarks/dhrystone/patches/patch-dhry__2_c b/benchmarks/dhrystone/patches/patch-dhry__2_c new file mode 100644 index 00000000000..694e955ed6d --- /dev/null +++ b/benchmarks/dhrystone/patches/patch-dhry__2_c @@ -0,0 +1,15 @@ +$NetBSD: patch-dhry__2_c,v 1.1 2012/06/18 01:46:07 dholland Exp $ + +- use standard headers + +--- dhry_2.c~ 1988-07-12 19:35:10.000000000 +0000 ++++ dhry_2.c +@@ -15,6 +15,8 @@ + **************************************************************************** + */ + ++#include <string.h> ++ + #include "dhry.h" + + #ifndef REG |