diff options
-rw-r--r-- | benchmarks/bytebench/files/patch-aa | 133 | ||||
-rw-r--r-- | benchmarks/unixbench/files/patch-aa | 133 |
2 files changed, 192 insertions, 74 deletions
diff --git a/benchmarks/bytebench/files/patch-aa b/benchmarks/bytebench/files/patch-aa index 8f09da7d9834..011f1cc85f71 100644 --- a/benchmarks/bytebench/files/patch-aa +++ b/benchmarks/bytebench/files/patch-aa @@ -1,37 +1,96 @@ -*** Makefile.orig Wed Feb 5 11:08:43 1992 ---- Makefile Mon Jan 1 23:20:07 1996 -*************** -*** 25,33 **** - ID="@(#)Makefile:3.9 -- 5/15/91 19:30:15"; - SHELL = /bin/sh -! #HZ = ???? #(read from environment) - CFLAGS = -DTIME -! OPTON = -O #optimization on (give it your best shot) -! # -- check your compiler man -! OPTOFF = -Od #optimization off -- check your compiler man - # local directories - PROGDIR = ./pgms ---- 25,34 ---- - ID="@(#)Makefile:3.9 -- 5/15/91 19:30:15"; - SHELL = /bin/sh -! HZ = 128 - CFLAGS = -DTIME -! OPTON = -s -static -O -finline-functions -funroll-loops -fomit-frame-pointer -! #optimization on (give it your best shot) -! # -- check your compiler man -! OPTOFF = -O0 -static #optimization off -- check your compiler man - # local directories - PROGDIR = ./pgms -*************** -*** 36,40 **** - TESTDIR = ./testdir -! RESULTDIR = ./results -! TMPDIR = ./tmp - # other directories - INCLDIR = /usr/include ---- 37,41 ---- - TESTDIR = ./testdir -! # RESULTDIR = ./results -! # TMPDIR = /var/tmp - # other directories - INCLDIR = /usr/include +--- Makefile.orig Wed Feb 5 02:08:43 1992 ++++ Makefile Fri Feb 4 21:15:26 2000 +@@ -24,18 +24,19 @@ + ############################################################################## + ID="@(#)Makefile:3.9 -- 5/15/91 19:30:15"; + SHELL = /bin/sh +-#HZ = ???? #(read from environment) +-CFLAGS = -DTIME +-OPTON = -O #optimization on (give it your best shot) +- # -- check your compiler man +-OPTOFF = -Od #optimization off -- check your compiler man ++HZ = 128 ++CFLAGS ?= -O -finline-functions -funroll-loops -fomit-frame-pointer ++CFLAGS+=-DTIME ++ #optimization on (give it your best shot) ++ # -- check your compiler man ++OPTOFF = -O0 -static #optimization off -- check your compiler man + # local directories + PROGDIR = ./pgms + SRCDIR = ./src + DOCDIR = ./doc + TESTDIR = ./testdir +-RESULTDIR = ./results +-TMPDIR = ./tmp ++# RESULTDIR = ./results ++# TMPDIR = /var/tmp + # other directories + INCLDIR = /usr/include + LIBDIR = /lib +@@ -128,45 +129,45 @@ + + # Individual programs + $(PROGDIR)/arithoh: $(SRCDIR)/arith.c +- cc -o $(PROGDIR)/arithoh ${CFLAGS} ${OPTON} -Darithoh $(SRCDIR)/arith.c ++ $(CC) -o $(PROGDIR)/arithoh ${CFLAGS} ${OPTON} -Darithoh $(SRCDIR)/arith.c + $(PROGDIR)/register: $(SRCDIR)/arith.c +- cc -o $(PROGDIR)/register ${CFLAGS} ${OPTON} -Ddatum=register $(SRCDIR)/arith.c ++ $(CC) -o $(PROGDIR)/register ${CFLAGS} ${OPTON} -Ddatum=register $(SRCDIR)/arith.c + $(PROGDIR)/short: $(SRCDIR)/arith.c +- cc -o $(PROGDIR)/short ${CFLAGS} ${OPTON} -Ddatum=short $(SRCDIR)/arith.c ++ $(CC) -o $(PROGDIR)/short ${CFLAGS} ${OPTON} -Ddatum=short $(SRCDIR)/arith.c + $(PROGDIR)/int: $(SRCDIR)/arith.c +- cc -o $(PROGDIR)/int ${CFLAGS} ${OPTON} -Ddatum=int $(SRCDIR)/arith.c ++ $(CC) -o $(PROGDIR)/int ${CFLAGS} ${OPTON} -Ddatum=int $(SRCDIR)/arith.c + $(PROGDIR)/long: $(SRCDIR)/arith.c +- cc -o $(PROGDIR)/long ${CFLAGS} ${OPTON} -Ddatum=long $(SRCDIR)/arith.c ++ $(CC) -o $(PROGDIR)/long ${CFLAGS} ${OPTON} -Ddatum=long $(SRCDIR)/arith.c + $(PROGDIR)/float: $(SRCDIR)/arith.c +- cc -o $(PROGDIR)/float ${CFLAGS} ${OPTON} -Ddatum=float $(SRCDIR)/arith.c ++ $(CC) -o $(PROGDIR)/float ${CFLAGS} ${OPTON} -Ddatum=float $(SRCDIR)/arith.c + $(PROGDIR)/double: $(SRCDIR)/arith.c +- cc -o $(PROGDIR)/double ${CFLAGS} ${OPTON} -Ddatum=double $(SRCDIR)/arith.c ++ $(CC) -o $(PROGDIR)/double ${CFLAGS} ${OPTON} -Ddatum=double $(SRCDIR)/arith.c + $(PROGDIR)/hanoi: $(SRCDIR)/hanoi.c +- cc -o $(PROGDIR)/hanoi ${CFLAGS} ${OPTON} $(SRCDIR)/hanoi.c ++ $(CC) -o $(PROGDIR)/hanoi ${CFLAGS} ${OPTON} $(SRCDIR)/hanoi.c + $(PROGDIR)/fstime: $(SRCDIR)/fstime.c +- cc -o $(PROGDIR)/fstime ${CFLAGS} ${OPTON} -Dawk=1 $(SRCDIR)/fstime.c ++ $(CC) -o $(PROGDIR)/fstime ${CFLAGS} ${OPTON} -Dawk=1 $(SRCDIR)/fstime.c + $(PROGDIR)/syscall: $(SRCDIR)/syscall.c +- cc -o $(PROGDIR)/syscall ${CFLAGS} ${OPTON} $(SRCDIR)/syscall.c ++ $(CC) -o $(PROGDIR)/syscall ${CFLAGS} ${OPTON} $(SRCDIR)/syscall.c + $(PROGDIR)/context1: $(SRCDIR)/context1.c +- cc -o $(PROGDIR)/context1 ${CFLAGS} ${OPTON} $(SRCDIR)/context1.c ++ $(CC) -o $(PROGDIR)/context1 ${CFLAGS} ${OPTON} $(SRCDIR)/context1.c + $(PROGDIR)/pipe: $(SRCDIR)/pipe.c +- cc -o $(PROGDIR)/pipe ${CFLAGS} ${OPTON} $(SRCDIR)/pipe.c ++ $(CC) -o $(PROGDIR)/pipe ${CFLAGS} ${OPTON} $(SRCDIR)/pipe.c + $(PROGDIR)/spawn: $(SRCDIR)/spawn.c +- cc -o $(PROGDIR)/spawn ${CFLAGS} ${OPTON} $(SRCDIR)/spawn.c ++ $(CC) -o $(PROGDIR)/spawn ${CFLAGS} ${OPTON} $(SRCDIR)/spawn.c + $(PROGDIR)/execl: $(SRCDIR)/execl.c $(SRCDIR)/big.c +- cc -o $(PROGDIR)/execl ${CFLAGS} ${OPTON} $(SRCDIR)/execl.c ++ $(CC) -o $(PROGDIR)/execl ${CFLAGS} ${OPTON} $(SRCDIR)/execl.c + $(PROGDIR)/dhry2: $(SRCDIR)/dhry_1.c $(SRCDIR)/dhry_2.c $(SRCDIR)/dhry.h +- cd $(SRCDIR); cc -c ${CFLAGS} -DHZ=${HZ} ${OPTON} dhry_1.c +- cd $(SRCDIR); cc -c ${CFLAGS} -DHZ=${HZ} ${OPTON} dhry_2.c +- cc -o $(PROGDIR)/dhry2 ${CFLAGS} ${OPTON} $(SRCDIR)/dhry_1.o $(SRCDIR)/dhry_2.o ++ cd $(SRCDIR); $(CC) -c ${CFLAGS} -DHZ=${HZ} ${OPTON} dhry_1.c ++ cd $(SRCDIR); $(CC) -c ${CFLAGS} -DHZ=${HZ} ${OPTON} dhry_2.c ++ $(CC) -o $(PROGDIR)/dhry2 ${CFLAGS} ${OPTON} $(SRCDIR)/dhry_1.o $(SRCDIR)/dhry_2.o + cd $(SRCDIR); rm -f dhry_1.o dhry_2.o + $(PROGDIR)/dhry2reg: $(SRCDIR)/dhry_1.c $(SRCDIR)/dhry_2.c $(SRCDIR)/dhry.h +- cd $(SRCDIR); cc -c ${CFLAGS} -DREG=register -DHZ=${HZ} ${OPTON} dhry_1.c +- cd $(SRCDIR); cc -c ${CFLAGS} -DREG=register -DHZ=${HZ} ${OPTON} dhry_2.c +- cc -o $(PROGDIR)/dhry2reg ${CFLAGS} ${OPTON} $(SRCDIR)/dhry_1.o $(SRCDIR)/dhry_2.o ++ cd $(SRCDIR); $(CC) -c ${CFLAGS} -DREG=register -DHZ=${HZ} ${OPTON} dhry_1.c ++ cd $(SRCDIR); $(CC) -c ${CFLAGS} -DREG=register -DHZ=${HZ} ${OPTON} dhry_2.c ++ $(CC) -o $(PROGDIR)/dhry2reg ${CFLAGS} ${OPTON} $(SRCDIR)/dhry_1.o $(SRCDIR)/dhry_2.o + cd $(SRCDIR); rm -f dhry_1.o dhry_2.o + $(PROGDIR)/looper: $(SRCDIR)/looper.c +- cc -o $(PROGDIR)/looper ${CFLAGS} ${OPTON} $(SRCDIR)/looper.c ++ $(CC) -o $(PROGDIR)/looper ${CFLAGS} ${OPTON} $(SRCDIR)/looper.c + + # Run the benchmarks and create the reports + run: diff --git a/benchmarks/unixbench/files/patch-aa b/benchmarks/unixbench/files/patch-aa index 8f09da7d9834..011f1cc85f71 100644 --- a/benchmarks/unixbench/files/patch-aa +++ b/benchmarks/unixbench/files/patch-aa @@ -1,37 +1,96 @@ -*** Makefile.orig Wed Feb 5 11:08:43 1992 ---- Makefile Mon Jan 1 23:20:07 1996 -*************** -*** 25,33 **** - ID="@(#)Makefile:3.9 -- 5/15/91 19:30:15"; - SHELL = /bin/sh -! #HZ = ???? #(read from environment) - CFLAGS = -DTIME -! OPTON = -O #optimization on (give it your best shot) -! # -- check your compiler man -! OPTOFF = -Od #optimization off -- check your compiler man - # local directories - PROGDIR = ./pgms ---- 25,34 ---- - ID="@(#)Makefile:3.9 -- 5/15/91 19:30:15"; - SHELL = /bin/sh -! HZ = 128 - CFLAGS = -DTIME -! OPTON = -s -static -O -finline-functions -funroll-loops -fomit-frame-pointer -! #optimization on (give it your best shot) -! # -- check your compiler man -! OPTOFF = -O0 -static #optimization off -- check your compiler man - # local directories - PROGDIR = ./pgms -*************** -*** 36,40 **** - TESTDIR = ./testdir -! RESULTDIR = ./results -! TMPDIR = ./tmp - # other directories - INCLDIR = /usr/include ---- 37,41 ---- - TESTDIR = ./testdir -! # RESULTDIR = ./results -! # TMPDIR = /var/tmp - # other directories - INCLDIR = /usr/include +--- Makefile.orig Wed Feb 5 02:08:43 1992 ++++ Makefile Fri Feb 4 21:15:26 2000 +@@ -24,18 +24,19 @@ + ############################################################################## + ID="@(#)Makefile:3.9 -- 5/15/91 19:30:15"; + SHELL = /bin/sh +-#HZ = ???? #(read from environment) +-CFLAGS = -DTIME +-OPTON = -O #optimization on (give it your best shot) +- # -- check your compiler man +-OPTOFF = -Od #optimization off -- check your compiler man ++HZ = 128 ++CFLAGS ?= -O -finline-functions -funroll-loops -fomit-frame-pointer ++CFLAGS+=-DTIME ++ #optimization on (give it your best shot) ++ # -- check your compiler man ++OPTOFF = -O0 -static #optimization off -- check your compiler man + # local directories + PROGDIR = ./pgms + SRCDIR = ./src + DOCDIR = ./doc + TESTDIR = ./testdir +-RESULTDIR = ./results +-TMPDIR = ./tmp ++# RESULTDIR = ./results ++# TMPDIR = /var/tmp + # other directories + INCLDIR = /usr/include + LIBDIR = /lib +@@ -128,45 +129,45 @@ + + # Individual programs + $(PROGDIR)/arithoh: $(SRCDIR)/arith.c +- cc -o $(PROGDIR)/arithoh ${CFLAGS} ${OPTON} -Darithoh $(SRCDIR)/arith.c ++ $(CC) -o $(PROGDIR)/arithoh ${CFLAGS} ${OPTON} -Darithoh $(SRCDIR)/arith.c + $(PROGDIR)/register: $(SRCDIR)/arith.c +- cc -o $(PROGDIR)/register ${CFLAGS} ${OPTON} -Ddatum=register $(SRCDIR)/arith.c ++ $(CC) -o $(PROGDIR)/register ${CFLAGS} ${OPTON} -Ddatum=register $(SRCDIR)/arith.c + $(PROGDIR)/short: $(SRCDIR)/arith.c +- cc -o $(PROGDIR)/short ${CFLAGS} ${OPTON} -Ddatum=short $(SRCDIR)/arith.c ++ $(CC) -o $(PROGDIR)/short ${CFLAGS} ${OPTON} -Ddatum=short $(SRCDIR)/arith.c + $(PROGDIR)/int: $(SRCDIR)/arith.c +- cc -o $(PROGDIR)/int ${CFLAGS} ${OPTON} -Ddatum=int $(SRCDIR)/arith.c ++ $(CC) -o $(PROGDIR)/int ${CFLAGS} ${OPTON} -Ddatum=int $(SRCDIR)/arith.c + $(PROGDIR)/long: $(SRCDIR)/arith.c +- cc -o $(PROGDIR)/long ${CFLAGS} ${OPTON} -Ddatum=long $(SRCDIR)/arith.c ++ $(CC) -o $(PROGDIR)/long ${CFLAGS} ${OPTON} -Ddatum=long $(SRCDIR)/arith.c + $(PROGDIR)/float: $(SRCDIR)/arith.c +- cc -o $(PROGDIR)/float ${CFLAGS} ${OPTON} -Ddatum=float $(SRCDIR)/arith.c ++ $(CC) -o $(PROGDIR)/float ${CFLAGS} ${OPTON} -Ddatum=float $(SRCDIR)/arith.c + $(PROGDIR)/double: $(SRCDIR)/arith.c +- cc -o $(PROGDIR)/double ${CFLAGS} ${OPTON} -Ddatum=double $(SRCDIR)/arith.c ++ $(CC) -o $(PROGDIR)/double ${CFLAGS} ${OPTON} -Ddatum=double $(SRCDIR)/arith.c + $(PROGDIR)/hanoi: $(SRCDIR)/hanoi.c +- cc -o $(PROGDIR)/hanoi ${CFLAGS} ${OPTON} $(SRCDIR)/hanoi.c ++ $(CC) -o $(PROGDIR)/hanoi ${CFLAGS} ${OPTON} $(SRCDIR)/hanoi.c + $(PROGDIR)/fstime: $(SRCDIR)/fstime.c +- cc -o $(PROGDIR)/fstime ${CFLAGS} ${OPTON} -Dawk=1 $(SRCDIR)/fstime.c ++ $(CC) -o $(PROGDIR)/fstime ${CFLAGS} ${OPTON} -Dawk=1 $(SRCDIR)/fstime.c + $(PROGDIR)/syscall: $(SRCDIR)/syscall.c +- cc -o $(PROGDIR)/syscall ${CFLAGS} ${OPTON} $(SRCDIR)/syscall.c ++ $(CC) -o $(PROGDIR)/syscall ${CFLAGS} ${OPTON} $(SRCDIR)/syscall.c + $(PROGDIR)/context1: $(SRCDIR)/context1.c +- cc -o $(PROGDIR)/context1 ${CFLAGS} ${OPTON} $(SRCDIR)/context1.c ++ $(CC) -o $(PROGDIR)/context1 ${CFLAGS} ${OPTON} $(SRCDIR)/context1.c + $(PROGDIR)/pipe: $(SRCDIR)/pipe.c +- cc -o $(PROGDIR)/pipe ${CFLAGS} ${OPTON} $(SRCDIR)/pipe.c ++ $(CC) -o $(PROGDIR)/pipe ${CFLAGS} ${OPTON} $(SRCDIR)/pipe.c + $(PROGDIR)/spawn: $(SRCDIR)/spawn.c +- cc -o $(PROGDIR)/spawn ${CFLAGS} ${OPTON} $(SRCDIR)/spawn.c ++ $(CC) -o $(PROGDIR)/spawn ${CFLAGS} ${OPTON} $(SRCDIR)/spawn.c + $(PROGDIR)/execl: $(SRCDIR)/execl.c $(SRCDIR)/big.c +- cc -o $(PROGDIR)/execl ${CFLAGS} ${OPTON} $(SRCDIR)/execl.c ++ $(CC) -o $(PROGDIR)/execl ${CFLAGS} ${OPTON} $(SRCDIR)/execl.c + $(PROGDIR)/dhry2: $(SRCDIR)/dhry_1.c $(SRCDIR)/dhry_2.c $(SRCDIR)/dhry.h +- cd $(SRCDIR); cc -c ${CFLAGS} -DHZ=${HZ} ${OPTON} dhry_1.c +- cd $(SRCDIR); cc -c ${CFLAGS} -DHZ=${HZ} ${OPTON} dhry_2.c +- cc -o $(PROGDIR)/dhry2 ${CFLAGS} ${OPTON} $(SRCDIR)/dhry_1.o $(SRCDIR)/dhry_2.o ++ cd $(SRCDIR); $(CC) -c ${CFLAGS} -DHZ=${HZ} ${OPTON} dhry_1.c ++ cd $(SRCDIR); $(CC) -c ${CFLAGS} -DHZ=${HZ} ${OPTON} dhry_2.c ++ $(CC) -o $(PROGDIR)/dhry2 ${CFLAGS} ${OPTON} $(SRCDIR)/dhry_1.o $(SRCDIR)/dhry_2.o + cd $(SRCDIR); rm -f dhry_1.o dhry_2.o + $(PROGDIR)/dhry2reg: $(SRCDIR)/dhry_1.c $(SRCDIR)/dhry_2.c $(SRCDIR)/dhry.h +- cd $(SRCDIR); cc -c ${CFLAGS} -DREG=register -DHZ=${HZ} ${OPTON} dhry_1.c +- cd $(SRCDIR); cc -c ${CFLAGS} -DREG=register -DHZ=${HZ} ${OPTON} dhry_2.c +- cc -o $(PROGDIR)/dhry2reg ${CFLAGS} ${OPTON} $(SRCDIR)/dhry_1.o $(SRCDIR)/dhry_2.o ++ cd $(SRCDIR); $(CC) -c ${CFLAGS} -DREG=register -DHZ=${HZ} ${OPTON} dhry_1.c ++ cd $(SRCDIR); $(CC) -c ${CFLAGS} -DREG=register -DHZ=${HZ} ${OPTON} dhry_2.c ++ $(CC) -o $(PROGDIR)/dhry2reg ${CFLAGS} ${OPTON} $(SRCDIR)/dhry_1.o $(SRCDIR)/dhry_2.o + cd $(SRCDIR); rm -f dhry_1.o dhry_2.o + $(PROGDIR)/looper: $(SRCDIR)/looper.c +- cc -o $(PROGDIR)/looper ${CFLAGS} ${OPTON} $(SRCDIR)/looper.c ++ $(CC) -o $(PROGDIR)/looper ${CFLAGS} ${OPTON} $(SRCDIR)/looper.c + + # Run the benchmarks and create the reports + run: |