1*4882a593Smuzhiyundhrystone: fix compilation problems 2*4882a593Smuzhiyun 3*4882a593SmuzhiyunThis patch fixes two compilation errors with original 4*4882a593Smuzhiyundhrystone sources: 5*4882a593Smuzhiyun* Redefinition of times() with wrong return type 6*4882a593Smuzhiyun - Fixed by commenting out the unnecessary redefinition 7*4882a593Smuzhiyun* Undefined identifier HZ 8*4882a593Smuzhiyun - Originally HZ was supposed to be the clock frequency 9*4882a593Smuzhiyun value for times() 10*4882a593Smuzhiyun - For Linux, the frequency should come from sysconf 11*4882a593Smuzhiyun - This patch defines global varible HZ and initializes 12*4882a593Smuzhiyun it from sysconf 13*4882a593Smuzhiyun 14*4882a593SmuzhiyunAdditionally, this patch adds a simple Makefile. 15*4882a593Smuzhiyun 16*4882a593SmuzhiyunUpstream-status: Pending 17*4882a593Smuzhiyun 18*4882a593SmuzhiyunSign-off-by: Kimmo Surakka <kimmo.surakka@ge.com> 19*4882a593SmuzhiyunSigned-off-by: Jose Alarcon <jose.alarcon@ge.com> 20*4882a593Smuzhiyun--- 21*4882a593Smuzhiyun 22*4882a593Smuzhiyundiff -Naur dhry.orig/dhry_1.c dhry/dhry_1.c 23*4882a593Smuzhiyun--- dhry.orig/dhry_1.c 2015-07-20 14:25:58.059945353 +0300 24*4882a593Smuzhiyun+++ dhry/dhry_1.c 2015-07-20 12:43:25.318945353 +0300 25*4882a593Smuzhiyun@@ -45,11 +45,15 @@ 26*4882a593Smuzhiyun 27*4882a593Smuzhiyun #ifdef TIMES 28*4882a593Smuzhiyun struct tms time_info; 29*4882a593Smuzhiyun-extern int times (); 30*4882a593Smuzhiyun+/* extern int times (); */ 31*4882a593Smuzhiyun /* see library function "times" */ 32*4882a593Smuzhiyun #define Too_Small_Time 120 33*4882a593Smuzhiyun /* Measurements should last at least about 2 seconds */ 34*4882a593Smuzhiyun #endif 35*4882a593Smuzhiyun+#ifndef HZ 36*4882a593Smuzhiyun+#include <unistd.h> /* sysconf */ 37*4882a593Smuzhiyun+ long HZ; 38*4882a593Smuzhiyun+#endif 39*4882a593Smuzhiyun #ifdef TIME 40*4882a593Smuzhiyun extern long time(); 41*4882a593Smuzhiyun /* see library function "time" */ 42*4882a593Smuzhiyun@@ -84,6 +88,9 @@ 43*4882a593Smuzhiyun 44*4882a593Smuzhiyun /* Initializations */ 45*4882a593Smuzhiyun 46*4882a593Smuzhiyun+#ifndef HZ 47*4882a593Smuzhiyun+ HZ = sysconf(_SC_CLK_TCK); 48*4882a593Smuzhiyun+#endif 49*4882a593Smuzhiyun Next_Ptr_Glob = (Rec_Pointer) malloc (sizeof (Rec_Type)); 50*4882a593Smuzhiyun Ptr_Glob = (Rec_Pointer) malloc (sizeof (Rec_Type)); 51*4882a593Smuzhiyun 52*4882a593Smuzhiyundiff -Naur dhry.orig/dhry.h dhry/dhry.h 53*4882a593Smuzhiyun--- dhry.orig/dhry.h 2015-07-20 14:25:58.054945353 +0300 54*4882a593Smuzhiyun+++ dhry/dhry.h 2015-07-20 12:42:59.903945353 +0300 55*4882a593Smuzhiyun@@ -420,4 +420,6 @@ 56*4882a593Smuzhiyun } variant; 57*4882a593Smuzhiyun } Rec_Type, *Rec_Pointer; 58*4882a593Smuzhiyun 59*4882a593Smuzhiyun- 60*4882a593Smuzhiyun+#ifndef HZ 61*4882a593Smuzhiyun+ extern long HZ; 62*4882a593Smuzhiyun+#endif 63*4882a593Smuzhiyundiff -Naur dhry.orig/Makefile dhry/Makefile 64*4882a593Smuzhiyun--- dhry.orig/Makefile 1970-01-01 02:00:00.000000000 +0200 65*4882a593Smuzhiyun+++ dhry/Makefile 2015-07-20 14:10:45.832945353 +0300 66*4882a593Smuzhiyun@@ -0,0 +1,15 @@ 67*4882a593Smuzhiyun+CC=gcc 68*4882a593Smuzhiyun+ 69*4882a593Smuzhiyun+all: dhry 70*4882a593Smuzhiyun+ 71*4882a593Smuzhiyun+dhry: dhry_1.o dhry_2.o 72*4882a593Smuzhiyun+ $(CC) $(LDFLAGS) -o $@ $^ $(LOADLIBES) $(LDLIBS) 73*4882a593Smuzhiyun+ 74*4882a593Smuzhiyun+dhry_1.o: dhry_1.c dhry.h 75*4882a593Smuzhiyun+ 76*4882a593Smuzhiyun+dhry_2.o: dhry_2.c dhry.h 77*4882a593Smuzhiyun+ 78*4882a593Smuzhiyun+clean: 79*4882a593Smuzhiyun+ rm -f *.o *~ 80*4882a593Smuzhiyun+ 81*4882a593Smuzhiyun+.PHONY: all clean 82