summaryrefslogtreecommitdiff
path: root/benchmarks/lmbench
diff options
context:
space:
mode:
authorabs <abs>2000-11-08 10:13:40 +0000
committerabs <abs>2000-11-08 10:13:40 +0000
commit9339804e04d16ae51f5e479be3d538fbd41fc5f6 (patch)
tree067a15fa12b8afbc9af984e15d20aeb645b09f28 /benchmarks/lmbench
parent7920cb6aed4e8512a595418cbfa2f97af8122bf9 (diff)
downloadpkgsrc-9339804e04d16ae51f5e479be3d538fbd41fc5f6.tar.gz
Work around gcc codegen bug that results in infinite loop compiling mhz.c -O
on arm32
Diffstat (limited to 'benchmarks/lmbench')
-rw-r--r--benchmarks/lmbench/Makefile3
-rw-r--r--benchmarks/lmbench/files/patch-sum4
-rw-r--r--benchmarks/lmbench/patches/patch-aa19
3 files changed, 21 insertions, 5 deletions
diff --git a/benchmarks/lmbench/Makefile b/benchmarks/lmbench/Makefile
index e872f518eac..331f5737864 100644
--- a/benchmarks/lmbench/Makefile
+++ b/benchmarks/lmbench/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2000/03/16 12:16:53 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2000/11/08 10:13:40 abs Exp $
DISTNAME= lmbench-2alpha11
PKGNAME= lmbench-2.11a
@@ -12,6 +12,7 @@ HOMEPAGE= http://www.bitmover.com/lm/lmbench/
ALL_TARGET= build
USE_GMAKE= yes
USE_PERL5= yes
+MAKE_ENV+= MACHINE_ARCH=$(MACHINE_ARCH)
post-configure:
@cd ${WRKSRC}; \
diff --git a/benchmarks/lmbench/files/patch-sum b/benchmarks/lmbench/files/patch-sum
index 05a6d7e80ea..261a1279495 100644
--- a/benchmarks/lmbench/files/patch-sum
+++ b/benchmarks/lmbench/files/patch-sum
@@ -1,6 +1,6 @@
-$NetBSD: patch-sum,v 1.4 1999/11/22 15:08:01 rh Exp $
+$NetBSD: patch-sum,v 1.5 2000/11/08 10:13:41 abs Exp $
-MD5 (patch-aa) = 7598b4509ca3435a0d3a1d15ba8b31d3
+MD5 (patch-aa) = 545032c9d3e7fbdf870cde2c076d90ee
MD5 (patch-ab) = 692496a9eeb91566b091546f1432f193
MD5 (patch-ac) = d7d57bb3601d93f49a968d1f3faed2d6
MD5 (patch-ad) = 6802cdfb8f782d7af9ad27fd87ce6699
diff --git a/benchmarks/lmbench/patches/patch-aa b/benchmarks/lmbench/patches/patch-aa
index 1cd04e1bd81..96d36edd5f0 100644
--- a/benchmarks/lmbench/patches/patch-aa
+++ b/benchmarks/lmbench/patches/patch-aa
@@ -1,6 +1,7 @@
-$NetBSD: patch-aa,v 1.1 1998/08/30 17:46:26 garbled Exp $
+$NetBSD: patch-aa,v 1.2 2000/11/08 10:13:41 abs Exp $
+
--- src/Makefile.orig Fri Jul 31 12:55:18 1998
-+++ src/Makefile Sun Aug 30 06:32:41 1998
++++ src/Makefile
@@ -30,7 +30,7 @@
O= ../bin/unknown
D= ../doc
@@ -19,3 +20,17 @@ $NetBSD: patch-aa,v 1.1 1998/08/30 17:46:26 garbled Exp $
Wall:
@if [ ! -d $(BINDIR) ]; then mkdir -p $(BINDIR); fi
+@@ -181,8 +181,13 @@
+ $O/flushdisk: flushdisk.c
+ $(COMPILE) -DMAIN -o $O/flushdisk flushdisk.c
+
++# Work around gcc codegen bug that results in infinite loop compiling mhz.c -O
+ $O/mhz: mhz.c timing.h stats.h bench.h $O/lmbench.a
++ifeq ($(MACHINE_ARCH),arm32)
++ $(CC) $(SYS5) $(CF) $(CPPFLAGS) $(LDFLAGS) -o $O/mhz mhz.c $O/lmbench.a $(LDLIBS) -lm
++else
+ $(COMPILE) -o $O/mhz mhz.c $O/lmbench.a $(LDLIBS) -lm
++endif
+
+ $O/lat_ctx: lat_ctx.c timing.h stats.h bench.h $O/lmbench.a
+ $(COMPILE) -o $O/lat_ctx lat_ctx.c $O/lmbench.a $(LDLIBS)