From 927fe98a10b4a91a3467a33c5da9d609508b59dd Mon Sep 17 00:00:00 2001 From: dholland Date: Sat, 23 Jun 2012 18:33:37 +0000 Subject: Fix broken Solaris build by not using sys_errlist[]. One minor other fix to pass -Wall. --- benchmarks/ubench/distinfo | 6 +++- benchmarks/ubench/patches/patch-cpubench_c | 49 +++++++++++++++++++++++++++++ benchmarks/ubench/patches/patch-diskbench_c | 40 +++++++++++++++++++++++ benchmarks/ubench/patches/patch-membench_c | 39 +++++++++++++++++++++++ benchmarks/ubench/patches/patch-ubench_c | 30 ++++++++++++++++++ 5 files changed, 163 insertions(+), 1 deletion(-) create mode 100644 benchmarks/ubench/patches/patch-cpubench_c create mode 100644 benchmarks/ubench/patches/patch-diskbench_c create mode 100644 benchmarks/ubench/patches/patch-membench_c create mode 100644 benchmarks/ubench/patches/patch-ubench_c (limited to 'benchmarks') diff --git a/benchmarks/ubench/distinfo b/benchmarks/ubench/distinfo index ecdb49aaa9d..782e62d9b19 100644 --- a/benchmarks/ubench/distinfo +++ b/benchmarks/ubench/distinfo @@ -1,6 +1,10 @@ -$NetBSD: distinfo,v 1.1.1.1 2005/09/03 05:57:45 xtraeme Exp $ +$NetBSD: distinfo,v 1.2 2012/06/23 18:33:37 dholland Exp $ SHA1 (ubench-0.32.tar.gz) = 749ae490c95b9fe95753b47b5711cbeb9bdb3a29 RMD160 (ubench-0.32.tar.gz) = 33a2e7b869af1e7c81eb2211b3ee4946e97933d2 Size (ubench-0.32.tar.gz) = 9341 bytes SHA1 (patch-aa) = 07a31eccb56a50b6a5261a6db7b4d37bdc57a3a6 +SHA1 (patch-cpubench_c) = 45a7ea8e8773d7d1fdd3152716bb64b7ce6acfe2 +SHA1 (patch-diskbench_c) = 8b6db9abafe6afacd7cd919683e0cd6530897d0a +SHA1 (patch-membench_c) = 2db9657a837e00d3a1b50528836fc644aa3dcb7a +SHA1 (patch-ubench_c) = ef27fa5cf4280d6eb19330943a15890d8f57935f diff --git a/benchmarks/ubench/patches/patch-cpubench_c b/benchmarks/ubench/patches/patch-cpubench_c new file mode 100644 index 00000000000..512f082b94c --- /dev/null +++ b/benchmarks/ubench/patches/patch-cpubench_c @@ -0,0 +1,49 @@ +$NetBSD: patch-cpubench_c,v 1.1 2012/06/23 18:33:38 dholland Exp $ + +Use standard headers. +Use strerror(), not sys_errlist[]. + +--- cpubench.c~ 2000-05-29 03:21:13.000000000 +0000 ++++ cpubench.c +@@ -25,6 +25,8 @@ + #include + #include + #include ++#include ++#include + #include + #include + #include +@@ -33,14 +35,6 @@ + #include + #include + +-#if defined HPUX || defined _AIX +-extern char *sys_errlist[]; +-#endif +-#ifdef SunOS +-extern char *_sys_errlist[]; +-#define sys_errlist _sys_errlist +-#endif +- + #ifdef SunOS + extern sigjmp_buf env; + #else +@@ -121,7 +115,7 @@ int cpubench() + double dlt; + if ( pipe(sv) == -1 ) + { +- fprintf(stderr,"**** cpubench: pipe: %s\n",sys_errlist[errno]); ++ fprintf(stderr,"**** cpubench: pipe: %s\n", strerror(errno)); + CPUflag=0; + return 0; + } +@@ -162,7 +156,7 @@ int cpubench() + child_pid[child_number]=fork(); + if ( child_pid[child_number] == -1 ) + { +- fprintf(stderr,"**** cpubench: fork: %s\n",sys_errlist[errno]); ++ fprintf(stderr,"**** cpubench: fork: %s\n", strerror(errno)); + CPUflag=0; + return 0; + } diff --git a/benchmarks/ubench/patches/patch-diskbench_c b/benchmarks/ubench/patches/patch-diskbench_c new file mode 100644 index 00000000000..2e2a7906c03 --- /dev/null +++ b/benchmarks/ubench/patches/patch-diskbench_c @@ -0,0 +1,40 @@ +$NetBSD: patch-diskbench_c,v 1.1 2012/06/23 18:33:38 dholland Exp $ + +Use strerror(), not sys_errlist[]. + +--- diskbench.c~ 2000-07-31 17:24:10.000000000 +0000 ++++ diskbench.c +@@ -33,15 +33,6 @@ + #include + #include + +-#if defined HPUX || defined _AIX +-extern char *sys_errlist[]; +-#endif +- +-#ifdef SunOS +-extern char *_sys_errlist[]; +-#define sys_errlist _sys_errlist; +-#endif +- + #ifdef SunOS + extern sigjmp_buf env; + #else +@@ -110,7 +101,7 @@ int diskbench() + double dlt; + if ( pipe(sv) == -1 ) + { +- fprintf(stderr,"**** diskbench: pipe: %s\n",sys_errlist[errno]); ++ fprintf(stderr,"**** diskbench: pipe: %s\n", strerror(errno)); + DISKflag=0; + return 0; + } +@@ -150,7 +141,7 @@ int diskbench() + child_pid[child_number]=fork(); + if ( child_pid[child_number] == -1 ) + { +- fprintf(stderr,"**** diskbench: fork: %s\n",sys_errlist[errno]); ++ fprintf(stderr,"**** diskbench: fork: %s\n", strerror(errno)); + DISKflag=0; + return 0; + } diff --git a/benchmarks/ubench/patches/patch-membench_c b/benchmarks/ubench/patches/patch-membench_c new file mode 100644 index 00000000000..9326be49244 --- /dev/null +++ b/benchmarks/ubench/patches/patch-membench_c @@ -0,0 +1,39 @@ +$NetBSD: patch-membench_c,v 1.1 2012/06/23 18:33:39 dholland Exp $ + +Use strerror(), not sys_errlist[]. + +--- membench.c~ 2000-07-31 17:23:27.000000000 +0000 ++++ membench.c +@@ -34,14 +34,6 @@ + #include + #include + +-#if defined HPUX || defined _AIX +-extern char *sys_errlist[]; +-#endif +-#ifdef SunOS +-extern char *_sys_errlist[]; +-#define sys_errlist _sys_errlist +-#endif +- + #ifdef SunOS + extern sigjmp_buf env; + #else +@@ -109,7 +101,7 @@ int membench() + double dlt; + if ( pipe(sv) == -1 ) + { +- fprintf(stderr,"**** membench: pipe: %s\n",sys_errlist[errno]); ++ fprintf(stderr,"**** membench: pipe: %s\n", strerror(errno)); + MEMflag=0; + return 0; + } +@@ -149,7 +141,7 @@ int membench() + child_pid[child_number]=fork(); + if ( child_pid[child_number] == -1 ) + { +- fprintf(stderr,"**** membench: fork: %s\n",sys_errlist[errno]); ++ fprintf(stderr,"**** membench: fork: %s\n", strerror(errno)); + MEMflag=0; + return 0; + } diff --git a/benchmarks/ubench/patches/patch-ubench_c b/benchmarks/ubench/patches/patch-ubench_c new file mode 100644 index 00000000000..345fbc87a22 --- /dev/null +++ b/benchmarks/ubench/patches/patch-ubench_c @@ -0,0 +1,30 @@ +$NetBSD: patch-ubench_c,v 1.1 2012/06/23 18:33:39 dholland Exp $ + +Use strerror(), not sys_errlist[]. + +--- ubench.c~ 2000-05-29 03:07:21.000000000 +0000 ++++ ubench.c +@@ -29,14 +29,6 @@ + #include + #include + +-#if defined HPUX || defined _AIX +-extern char *sys_errlist[]; +-#endif +-#ifdef SunOS +-extern char *_sys_errlist[]; +-#define sys_errlist _sys_errlist +-#endif +- + int cpubench(); + int membench(); + #ifdef DISKNETYES +@@ -138,7 +130,7 @@ prgs: switch ( argc[i][s] ) + signalSetup(); + print_version(); + if ( uname(&utsbuf) == -1 ) +- fprintf(stderr,"**** ubench: uname: %s\n",sys_errlist[errno]); ++ fprintf(stderr,"**** ubench: uname: %s\n", strerror(errno)); + else + { + #if defined HPUX -- cgit v1.2.3