X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Fautoconf.cfg;h=2cbb1efaf5fa1e88221b4652f75ed7b9757a988e;hb=a996044f96a0600122c4f208663ae79715868bbc;hp=668c83ea14051294f1e59f58bbee964984062028;hpb=5ddf954ceeda24e3dd9f3dccbd5f43b3433b4200;p=libucw.git

diff --git a/lib/autoconf.cfg b/lib/autoconf.cfg
index 668c83ea..2cbb1efa 100644
--- a/lib/autoconf.cfg
+++ b/lib/autoconf.cfg
@@ -1,5 +1,6 @@
 # Automatic configuration of the UCW Library
 # (c) 2005 Martin Mares <mj@ucw.cz>
+# (c) 2006 Robert Spalek <robert@ucw.cz>
 
 ### OS ###
 
@@ -12,6 +13,8 @@ Test("OS", "Checking on which OS we run", sub {
 
 if (Get("OS") eq "Linux") {
 	Set("CONFIG_LINUX");
+} elsif (Get("OS") eq "Darwin") {
+	Set("CONFIG_DARWIN");
 } else {
 	Fail "Don't know how to run on this operating system.";
 }
@@ -24,7 +27,7 @@ Test("CC", "Checking for C compiler", sub { return "gcc"; });
 # GCC version
 Test("GCCVER", "Checking for GCC version", sub {
 	my $gcc = Get("CC");
-	my $ver = `$gcc --version | sed '2,\$d; s/^\\(.* \\)\\?\\([0-9]*\\.[0-9]*\\).*/\\2/'`;
+	my $ver = `$gcc --version | sed '2,\$d; s/^\\(.* \\)*\\([0-9]*\\.[0-9]*\\).*/\\2/'`;
 	chomp $ver;
 	Fail "Unable to determine GCC version" if $? || $ver eq "";
 	return $ver;
@@ -48,8 +51,46 @@ Test("ARCH", "Checking for machine architecture", sub {
 	}
 });
 
+sub parse_cpuinfo_linux() {
+	open X, "/proc/cpuinfo" || undef;
+	my %pc = ();
+	while (<X>) {
+		chomp;
+		/^$/ && last;
+		/^([^\t]+)\t+:\s*(.*)$/ and $pc{$1}=$2;
+	}
+	close X;
+	return ($pc{'vendor_id'},
+		$pc{'cpu family'},
+		$pc{'model'});
+}
+
+sub parse_cpuinfo_darwin() {
+	@cpu = (`sysctl -n machdep.cpu.vendor`,
+		`sysctl -n machdep.cpu.family`,
+		`sysctl -n machdep.cpu.model`);
+	chomp @cpu;
+	return @cpu;
+}
+
+sub parse_cpuinfo() {
+	my @cpu;
+	if (IsSet("CONFIG_EXACT_CPU")) {
+		if (IsSet("CONFIG_LINUX")) {
+			@cpu = parse_cpuinfo_linux();
+		} elsif (IsSet("CONFIG_DARWIN")) {
+			@cpu = parse_cpuinfo_darwin();
+		}
+	}
+	$cpu[0] = "" if !defined $cpu[0];
+	$cpu[1] = 0 if !defined $cpu[1];
+	$cpu[2] = 0 if !defined $cpu[2];
+	return @cpu;
+}
+
 Test("CPU_ARCH", "Checking for CPU architecture", sub {
 	my $mach = Get("ARCH");
+	my $arch = "";
 	if ($mach eq "i386") {
 		Set("CPU_I386");
 		UnSet("CPU_64BIT_POINTERS");
@@ -57,20 +98,8 @@ Test("CPU_ARCH", "Checking for CPU architecture", sub {
 		UnSet("CPU_BIG_ENDIAN");
 		Set("CPU_ALLOW_UNALIGNED");
 		Set("CPU_STRUCT_ALIGN" => 4);
-		my $arch = "";
-		if (IsSet("CONFIG_EXACT_CPU") && IsSet("CONFIG_LINUX") && open X, "/proc/cpuinfo") {
-			my %pc = ();
-			while (<X>) {
-				chomp;
-				/^$/ && last;
-				/^([^\t]+)\t+:\s*(.*)$/ and $pc{$1}=$2;
-			}
-			close X;
-
+		if (my ($vendor, $family, $model) = parse_cpuinfo()) {
 			# Try to understand CPU vendor, family and model [inspired by MPlayer's configure script]
-			my $vendor = $pc{'vendor_id'} || "";
-			my $family = $pc{'cpu family'} || 0;
-			my $model  = $pc{'model'} || 0;
 			if ($vendor eq "AuthenticAMD") {
 				if ($family >= 6) {
 					if ($model >= 31 && $gccver >= 3004) { $arch = "athlon64"; }
@@ -78,10 +107,14 @@ Test("CPU_ARCH", "Checking for CPU architecture", sub {
 					else { $arch = "athlon"; }
 				}
 			} elsif ($vendor eq "GenuineIntel") {
-				# We don't recognize Prescott and Nocona cores yet (gcc-3.4+)
-				if ($family >= 15 && $gccver >= 3003) { $arch = "pentium4"; }
-				elsif ($family >= 6 && $gccver >= 3003) {
-					if ($model >= 7) { $arch = "pentium3"; }
+				if ($family >= 15 && $gccver >= 3003) {
+					if ($model >= 4) { $arch = "nocona"; }
+					elsif ($model >= 3) { $arch = "prescott"; }
+					else { $arch = "pentium4"; }
+				} elsif ($family == 6 && $gccver >= 3003) {
+					if ($model == 15) { $arch = "prescott"; }
+					elsif (($model == 9 || $model == 13) && $gccver >= 3004) { $arch = "pentium-m"; }
+					elsif ($model >= 7) { $arch = "pentium3"; }
 					elsif ($model >= 3) { $arch = "pentium2"; }
 				}
 			}
@@ -94,13 +127,9 @@ Test("CPU_ARCH", "Checking for CPU architecture", sub {
 					$arch = "i${family}86";
 				}
 			}
-			if ($arch ne "") {
-				Log "(using /proc/cpuinfo) ";
-			} else {
-				Log "(don't understand /proc/cpuinfo) ";
-			}
+			Log (($arch ne "") ? "(using /proc/cpuinfo) " : "(don't understand /proc/cpuinfo) ");
 		}
-		return $arch ? $arch : "i386";
+		return $arch;
 	} elsif ($mach eq "amd64") {
 		Set("CPU_AMD64");
 		Set("CPU_64BIT_POINTERS");
@@ -108,22 +137,33 @@ Test("CPU_ARCH", "Checking for CPU architecture", sub {
 		UnSet("CPU_BIG_ENDIAN");
 		Set("CPU_ALLOW_UNALIGNED");
 		Set("CPU_STRUCT_ALIGN" => 8);
-		return "x86-64";
+		if (my ($vendor, $family, $model) = parse_cpuinfo()) {
+			# In x86-64 world, the detection is somewhat easier so far...
+			if ($vendor eq "AuthenticAMD") {
+				$arch = "athlon64";
+			} elsif ($vendor eq "GenuineIntel") {
+				$arch = "nocona";
+			}
+			Log (($arch ne "") ? "(using /proc/cpuinfo) " : "(don't understand /proc/cpuinfo) ");
+		}
+		return $arch;
 	} else {
-		return undef;
+		return "";
 	}
 });
 
-if (!IsSet("CPU_ARCH")) { Warn "CPU type not recognized, using defaults, keep fingers crossed."; }
-
 ### Compiler and its Options ###
 
-# C flags: tell the compiler we're speaking C99
-Set("CLANG" => "-std=gnu99");
+# C flags: tell the compiler we're speaking C99, and disable common symbols
+Set("CLANG" => "-std=gnu99 -fno-common");
 
 # C optimizations
 Set("COPT" => '-O2');
-Append("COPT", '-march=$(CPU_ARCH)') if IsSet("CPU_ARCH");
+if (Get("CPU_ARCH") eq "") {
+	Warn "CPU type not recognized, using defaults, keep fingers crossed.";
+} else {
+	Append("COPT", '-march=$(CPU_ARCH)');
+}
 
 # C optimizations for highly exposed code
 Set("COPT2" => '-O3');
@@ -140,7 +180,11 @@ Set("LIBS" => "");
 
 # Extra flags for compiling and linking shared libraries
 Set("CSHARED" => '-fPIC');
-Set("LSHARED" => '-shared -Wl,-soname,lib/$(@F)');
+if (IsSet("CONFIG_DARWIN")) {
+	Set("LSHARED" => '-dynamiclib -install_name lib/$(@F) -undefined dynamic_lookup');
+} else {
+	Set("LSHARED" => '-shared -Wl,-soname,lib/$(@F)');
+}
 
 # Extra switches depending on GCC version:
 if ($gccver == 3000) {
@@ -170,6 +214,22 @@ if (IsSet("CONFIG_DEBUG")) {
 	Append("LOPT" => "-s");
 }
 
+if (IsSet("CONFIG_DARWIN")) {
+	# gcc-4.0 on Darwin doesn't set this in the gnu99 mode
+	Append("CLANG" => "-fnested-functions");
+	# Directory hierarchy of the fink project
+	Append("LIBS" => "-L/sw/lib");
+	Append("COPT" => "-I/sw/include");
+	# Fill in some constants not found in the system header files
+	Set("PAGE_SIZE" => `sysctl -n hw.pagesize`);
+	Set("SOL_TCP" => 6);		#missing in /usr/include/netinet/tcp.h
+}
+
+if (IsSet("CONFIG_LARGE_FILES") && IsSet("CONFIG_LINUX")) {
+	# Use 64-bit versions of file functions
+	Set("CONFIG_LFS");
+}
+
 # Decide how will lib/partmap.c work
 Set("PARTMAP_IS_MMAP") if IsSet("CPU_64BIT_POINTERS");