[llvm-commits] CVS: llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/arscan.c job.c make.h misc.c read.c

[Chris Lattner]

Changes in directory llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make:

arscan.c updated: 1.2 -> 1.3
job.c updated: 1.2 -> 1.3
make.h updated: 1.2 -> 1.3
misc.c updated: 1.2 -> 1.3
read.c updated: 1.2 -> 1.3

---
Log message:

Patches to make this benchmakr work better with FreeBSD, contributed by
Vladimir Merzliakov


---
Diffs of the changes:  (+14 -9)

Index: llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/arscan.c
diff -u llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/arscan.c:1.2 llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/arscan.c:1.3
--- llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/arscan.c:1.2	Wed Jun  2 17:35:39 2004
+++ llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/arscan.c	Fri Jun 25 03:03:11 2004
@@ -38,7 +38,7 @@
 #endif
 
 #if	(defined (STDC_HEADERS) || defined (__GNU_LIBRARY__) \
-	 || defined (POSIX))
+	 || defined (POSIX)) || defined (__FreeBSD__)
 #include <stdlib.h>
 #include <string.h>
 #define	ANSI_STRING
@@ -77,7 +77,7 @@
 #define bcmp(s1, s2, n)	memcmp ((s1), (s2), (n))
 #define bzero(s, n)	memset ((s), 0, (n))
 #define bcopy(s, d, n)	memcpy ((d), (s), (n))
-#endif	ANSI_STRING
+#endif	/*ANSI_STRING*/
 #undef	ANSI_STRING
 
 
@@ -93,7 +93,8 @@
 #define	AR_NAMELEN	255
 #endif
 
-#if	defined(__GNU_LIBRARY__) || defined(POSIX) || defined(_IBMR2)
+#if	defined(__GNU_LIBRARY__) || defined(POSIX) || defined(_IBMR2) || \
+        defined(__FreeBSD__)
 #include <unistd.h>
 #else
 extern int read (), open (), close (), write (), fstat ();


Index: llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/job.c
diff -u llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/job.c:1.2 llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/job.c:1.3
--- llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/job.c:1.2	Wed Jun  2 17:35:39 2004
+++ llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/job.c	Fri Jun 25 03:03:11 2004
@@ -30,7 +30,7 @@
 /* Default shell to use.  */
 char default_shell[] = "/bin/sh";
 
-#if	defined(POSIX) || defined(__GNU_LIBRARY__)
+#if	defined(POSIX) || defined(__GNU_LIBRARY__) || defined(__FreeBSD__)
 #include <limits.h>
 #include <unistd.h>
 #define	GET_NGROUPS_MAX	sysconf (_SC_NGROUPS_MAX)
@@ -100,7 +100,7 @@
 #endif	/* WTERMSIG defined or USG and don't have <sys/wait.h>.  */
 
 
-#if	defined(__GNU_LIBRARY__) || defined(POSIX) || defined(__CYGWIN__)
+#if	defined(__GNU_LIBRARY__) || defined(POSIX) || defined(__CYGWIN__) || defined(__FreeBSD__)
 
 #include <sys/types.h>
 #define	GID_T	gid_t


Index: llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/make.h
diff -u llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/make.h:1.2 llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/make.h:1.3
--- llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/make.h:1.2	Wed Jun  2 17:35:39 2004
+++ llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/make.h	Fri Jun 25 03:03:11 2004
@@ -15,7 +15,10 @@
 along with GNU Make; see the file COPYING.  If not, write to
 the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
+#if !defined(_GNU_SOURCE)
 #define _GNU_SOURCE
+#endif
+
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <signal.h>
@@ -80,7 +83,7 @@
 
 
 #if	(defined (STDC_HEADERS) || defined (__GNU_LIBRARY__) \
-	 || defined (POSIX))
+	 || defined (POSIX) || defined(__FreeBSD__))
 #include <stdlib.h>
 #include <string.h>
 #define	ANSI_STRING
@@ -212,7 +215,8 @@
 #define	VFORK_NAME	"vfork"
 #endif	/* USG and don't have vfork.  */
 
-#if	defined(__GNU_LIBRARY__) || defined(POSIX) || defined(__CYGWIN__)
+#if	defined(__GNU_LIBRARY__) || defined(POSIX) || defined(__CYGWIN__) || \
+        defined(__FreeBSD__)
 
 #include <unistd.h>
 #include <signal.h>


Index: llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/misc.c
diff -u llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/misc.c:1.2 llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/misc.c:1.3
--- llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/misc.c:1.2	Wed Jun  2 17:35:39 2004
+++ llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/misc.c	Fri Jun 25 03:03:11 2004
@@ -476,7 +476,7 @@
 }
 #endif
 
-#if	!defined(POSIX) && !defined(__GNU_LIBRARY__) && !defined(__CYGWIN__)
+#if	!defined(POSIX) && !defined(__GNU_LIBRARY__) && !defined(__CYGWIN__) && !defined(__FreeBSD__)
 extern int getuid (), getgid (), geteuid (), getegid ();
 #ifdef	USG
 extern int setuid (), setgid ();


Index: llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/read.c
diff -u llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/read.c:1.2 llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/read.c:1.3
--- llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/read.c:1.2	Wed Jun  2 17:35:39 2004
+++ llvm/test/Programs/MultiSource/Benchmarks/MallocBench/make/read.c	Fri Jun 25 03:03:11 2004
@@ -22,7 +22,7 @@
 #include "variable.h"
 
 /* This is POSIX.2, but most systems using -DPOSIX probably don't have it.  */
-#if defined(__GNU_LIBRARY__) || defined(__CYGWIN__)
+#if defined(__GNU_LIBRARY__) || defined(__CYGWIN__) || defined(__FreeBSD__)
 #include <glob.h>
 #else
 #include "glob/glob.h"