From 58e784dfe67ff7c9c14df9ec63785d1e667b533e Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Sun, 14 Jun 2009 11:10:36 +0000
Subject: [PATCH] Don't build compatibility.c for non-gcc2 anymore.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@31043 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/system/libroot/os/arch/x86/Jamfile         | 10 +++++++++-
 src/system/libroot/os/arch/x86/compatibility.c | 16 ++++------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/system/libroot/os/arch/x86/Jamfile b/src/system/libroot/os/arch/x86/Jamfile
index 64cd8a948e..7806e44481 100644
--- a/src/system/libroot/os/arch/x86/Jamfile
+++ b/src/system/libroot/os/arch/x86/Jamfile
@@ -5,14 +5,22 @@ UsePrivateKernelHeaders ;
 	# time.c!
 UsePrivateSystemHeaders ;
 
+local compatibilitySources ;
+if $(HAIKU_GCC_VERSION[1]) = 2 {
+	compatibilitySources =
+		compatibility.c
+	;
+}
+
 MergeObject os_arch_$(TARGET_ARCH).o :
 	atomic.S
 	byteorder.S
-	compatibility.c
 	get_stack_frame.S
 	system_info.c
 	system_time_asm.S
 	thread.c
 	time.c
 	tls.c
+
+	$(compatibilitySources)
 ;
diff --git a/src/system/libroot/os/arch/x86/compatibility.c b/src/system/libroot/os/arch/x86/compatibility.c
index 4db8064e0a..46c77dbb1d 100644
--- a/src/system/libroot/os/arch/x86/compatibility.c
+++ b/src/system/libroot/os/arch/x86/compatibility.c
@@ -3,22 +3,17 @@
  * Distributed under the terms of the MIT License.
  */
 
-// TODO: temporary measurement to fix the build with GCC 4 - in the end, these
-//	private syscalls shouldn't be used anywhere in the Haiku tree, at the very
-//	least they should only be used when compiling for GCC 2.95.3, though.
-#if __GNUC__ < 30
-
 //!	This file includes some known R5 syscalls
 
+#include <errno.h>
+#include <sys/resource.h>
+#include <sys/stat.h>
+
 #include <SupportDefs.h>
 #include <fs_info.h>
 
 #include <syscalls.h>
 
-#include <errno.h>
-#include <sys/resource.h>
-#include <sys/stat.h>
-
 
 int _kset_mon_limit_(int num);
 int _kset_fd_limit_(int num);
@@ -103,6 +98,3 @@ _kstatfs_(dev_t device, void *whatever, int fd, const char *path, fs_info *info)
 
 	return fs_stat_dev(device, info);
 }
-
-
-#endif	// __GNUC__ < 3