- respect CC

- use integrated patch instead

5 files changed, 99 insertions, 69 deletions

diff --git a/benchmarks/ubench/files/patch-Makefile b/benchmarks/ubench/files/patch-Makefile
new file mode 100644
index 000000000000..9052e072ed9d
--- /dev/null
+++ b/benchmarks/ubench/files/patch-Makefile
@@ -0,0 +1,99 @@
+--- configure.orig	Mon May 29 09:46:09 2000
++++ configure	Mon Apr  2 11:49:28 2007
+@@ -12,7 +12,8 @@
+ ###############################################################################
+ 
+ #DEFINES=-DDEBUG
+-INSTALLDIR= /usr/local/bin
++INSTALLDIR= \$(PREFIX)/bin
++MANDIR = \$(PREFIX)/man/man8
+ 
+ !
+ 
+@@ -23,7 +24,6 @@
+ 	case $ARCH in
+ 	i486)
+ cat <<! >> Makefile
+-CC = gcc
+ CFLAGS = -O2 -m486 -Wall -malign-loops=2 -malign-jumps=2 -malign-functions=2 -fomit-frame-pointer
+ LDFLAGS = -s -lm
+ INCLUDES = -I.
+@@ -32,7 +32,6 @@
+ 	;;
+ 	i586)
+ cat <<! >> Makefile
+-CC = gcc
+ CFLAGS = -O2 -Wall -malign-loops=2 -malign-jumps=2 -malign-functions=2 -fomit-frame-pointer
+ LDFLAGS = -s -lm
+ INCLUDES = -I.
+@@ -41,7 +40,6 @@
+ 	;;
+ 	i686)
+ cat <<! >> Makefile
+-CC = gcc
+ CFLAGS = -O2 -Wall -malign-loops=2 -malign-jumps=2 -malign-functions=2 -fomit-frame-pointer
+ LDFLAGS = -s -lm
+ INCLUDES = -I.
+@@ -50,7 +48,6 @@
+ 	;;
+ 	*)
+ cat <<! >> Makefile
+-CC = gcc
+ CFLAGS = -O2 -Wall -malign-loops=2 -malign-jumps=2 -malign-functions=2
+ LDFLAGS = -s -lm
+ INCLUDES = -I.
+@@ -66,7 +63,6 @@
+   case ${BITS} in
+     64)
+ cat <<! >> Makefile
+-CC = cc
+ CFLAGS = +O2 -Ae -z -DHPUX +DA2.0W +DS2.0 -DSS_64BIT_SERVER -DHPPA64 \\
+ -DSLS8NATIVE -DSLU8NATIVE -D_REENTRANT -DHPUX_KTHREAD -DSLXMX_ENABLE \\
+ -DSLMXMX_ENABLE -DSLTS_ENABLE +Omultiprocessor +Olibcalls +Ofastaccess \\
+@@ -78,7 +74,6 @@
+      ;;
+    *)
+ cat <<! >> Makefile
+-CC = cc
+ CFLAGS = +O2 -Ae -z -DHPUX +DA2.0W +DS2.0 -DSS_32BIT_SERVER -DHPPA32 \\
+ -DSLS8NATIVE -DSLU8NATIVE -D_REENTRANT -DHPUX_KTHREAD -DSLXMX_ENABLE \\
+ -DSLMXMX_ENABLE -DSLTS_ENABLE +Omultiprocessor +Olibcalls +Ofastaccess \\
+@@ -94,7 +89,6 @@
+     ARCH="`oslevel`"
+     echo "====  Creating Makefile for ${SYSTEM} ${ARCH}"
+ cat <<! >> Makefile
+-CC = xlc
+ CFLAGS = -O2 -DOSLEVEL=\\\"${ARCH}\\\" -D_XOPEN_SOURCE -D_POSIX_SOURCE -D_ANSI_C_SOURCE -D_ALL_SOURCE
+ LDFLAGS = -lm
+ INCLUDE = -I.
+@@ -104,7 +98,6 @@
+   SunOS)
+     echo "====  Creating Makefile for ${SYSTEM} ${ARCH}"
+ cat <<! >> Makefile
+-CC = cc
+ CFLAGS = -xO5 -DSunOS
+ LDFLAGS = -s -lm
+ INCLUDE = -I.
+@@ -113,7 +106,6 @@
+     ;;
+   *)
+ cat <<! >> Makefile
+-CC = cc
+ CFLAGS = 
+ LDFLAGS = -lm
+ INCLUDES = -I.
+@@ -134,11 +126,11 @@
+ %.o:	%.c
+ 	\$(CC) \$(CFLAGS) \$(INCLUDES) -c \$<
+ 
+-default: ubench
++all: ubench
+ 
+ install: ubench
+-	mv -f \$(INSTALLDIR)/ubench \$(INSTALLDIR)/ubench.old
+-	install -c -m 0555 ubench \$(INSTALLDIR)
++	\$(BSD_INSTALL_MAN) ubench.8 \$(MANDIR)
++	\$(BSD_INSTALL_PROGRAM) ubench \$(INSTALLDIR)
+ 
+ utime:	\$(utimeobjects)
+ 	\$(CC) \$(CFLAGS) \$(LDFLAGS) -o \$@ \$^
diff --git a/benchmarks/ubench/files/patch-aa b/benchmarks/ubench/files/patch-aa
deleted file mode 100644
index ee24e0be1611..000000000000
--- a/benchmarks/ubench/files/patch-aa
+++ /dev/null
@@ -1,36 +0,0 @@
---- configure.orig	Sat Aug 19 23:51:05 2000
-+++ configure	Sat Aug 19 23:52:51 2000
-@@ -12,7 +12,8 @@
- ###############################################################################
- 
- #DEFINES=-DDEBUG
--INSTALLDIR= /usr/local/bin
-+INSTALLDIR= \$(PREFIX)/bin
-+MANDIR = \$(PREFIX)/man/man8
- 
- !
- 
-@@ -114,7 +115,7 @@
-   *)
- cat <<! >> Makefile
- CC = cc
--CFLAGS = 
-+CFLAGS += -D${SYSTEM}
- LDFLAGS = -lm
- INCLUDES = -I.
- 
-@@ -134,11 +135,11 @@
- %.o:	%.c
- 	\$(CC) \$(CFLAGS) \$(INCLUDES) -c \$<
- 
--default: ubench
-+all: ubench
- 
- install: ubench
--	mv -f \$(INSTALLDIR)/ubench \$(INSTALLDIR)/ubench.old
--	install -c -m 0555 ubench \$(INSTALLDIR)
-+	\$(BSD_INSTALL_MAN) ubench.8 \$(MANDIR)
-+	\$(BSD_INSTALL_PROGRAM) ubench \$(INSTALLDIR)
- 
- utime:	\$(utimeobjects)
- 	\$(CC) \$(CFLAGS) \$(LDFLAGS) -o \$@ \$^
diff --git a/benchmarks/ubench/files/patch-ab b/benchmarks/ubench/files/patch-ab
deleted file mode 100644
index 2a7a03629b51..000000000000
--- a/benchmarks/ubench/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- cpubench.c.orig	Tue Jun  6 14:33:33 2000
-+++ cpubench.c	Tue Jun  6 14:34:40 2000
-@@ -41,7 +41,7 @@
- #define sys_errlist _sys_errlist
- #endif
- 
--#ifdef SunOS
-+#if defined SunOS || defined FreeBSD
- extern		sigjmp_buf	env;
- #else
- extern		jmp_buf	env;
diff --git a/benchmarks/ubench/files/patch-ac b/benchmarks/ubench/files/patch-ac
deleted file mode 100644
index f625642fe9cf..000000000000
--- a/benchmarks/ubench/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- membench.c.orig	Tue Jun  6 14:33:33 2000
-+++ membench.c	Tue Jun  6 14:34:29 2000
-@@ -41,7 +41,7 @@
- #define sys_errlist _sys_errlist
- #endif
- 
--#ifdef SunOS
-+#if defined SunOS || defined FreeBSD
- extern		sigjmp_buf	env;
- #else
- extern		jmp_buf	env;
diff --git a/benchmarks/ubench/files/patch-ad b/benchmarks/ubench/files/patch-ad
deleted file mode 100644
index bc6ef63c360b..000000000000
--- a/benchmarks/ubench/files/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
---- signals.c.orig	Tue Jun  6 14:33:33 2000
-+++ signals.c	Tue Jun  6 14:35:08 2000
-@@ -22,7 +22,7 @@
- #include <signal.h>
- #include <setjmp.h>
- 
--#ifdef SunOS
-+#if defined SunOS || defined FreeBSD
- sigjmp_buf	env;
- #else
- jmp_buf		env;