X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Fautoconf.cfg;h=668c83ea14051294f1e59f58bbee964984062028;hb=6c387c164c40f5f24efc45a6d2836e8ab45e3a04;hp=0e8496dc85d883fa64a9fde491005a87fc6d74cf;hpb=adccd410be409235bcd59425615101a06693f36d;p=libucw.git

diff --git a/lib/autoconf.cfg b/lib/autoconf.cfg
index 0e8496dc..668c83ea 100644
--- a/lib/autoconf.cfg
+++ b/lib/autoconf.cfg
@@ -35,11 +35,22 @@ $gccver >= 3000 or Fail "GCC older than 3.0 doesn't support C99 well enough.";
 
 ### CPU ###
 
-Test("CPU_ARCH", "Checking for CPU architecture", sub {
+Test("ARCH", "Checking for machine architecture", sub {
 	my $mach = `uname -m`;
 	chomp $mach;
 	Fail "Unable to determine machine type" if $? || $mach eq "";
 	if ($mach =~ /^i[0-9]86$/) {
+		return "i386";
+	} elsif ($mach =~ /^(x86[_-]|amd)64$/) {
+		return "amd64";
+	} else {
+		return "unknown";
+	}
+});
+
+Test("CPU_ARCH", "Checking for CPU architecture", sub {
+	my $mach = Get("ARCH");
+	if ($mach eq "i386") {
 		Set("CPU_I386");
 		UnSet("CPU_64BIT_POINTERS");
 		Set("CPU_LITTLE_ENDIAN");
@@ -90,7 +101,7 @@ Test("CPU_ARCH", "Checking for CPU architecture", sub {
 			}
 		}
 		return $arch ? $arch : "i386";
-	} elsif ($mach =~ /^(x86[_-]|amd)64$/) {
+	} elsif ($mach eq "amd64") {
 		Set("CPU_AMD64");
 		Set("CPU_64BIT_POINTERS");
 		Set("CPU_LITTLE_ENDIAN");
@@ -99,10 +110,11 @@ Test("CPU_ARCH", "Checking for CPU architecture", sub {
 		Set("CPU_STRUCT_ALIGN" => 8);
 		return "x86-64";
 	} else {
-		return "unknown";
+		return undef;
 	}
 });
-if (Get("CPU_ARCH") eq "unknown") { Warn "CPU type not recognized, using defaults, keep fingers crossed."; }
+
+if (!IsSet("CPU_ARCH")) { Warn "CPU type not recognized, using defaults, keep fingers crossed."; }
 
 ### Compiler and its Options ###
 
@@ -138,8 +150,8 @@ if ($gccver == 3000) {
 	Append("COPT" => "-finline-limit=20000 --param max-inline-insns-auto=1000");
 } elsif ($gccver == 3004) {
 	Append("CWARNS" => "-Wundef -Wredundant-decls");
-	Append("COPT" => "-finline-limit=5000 --param large-function-insns=5000 --param inline-unit-growth=200 --param large-function-growth=400");
-} elsif ($gccver == 4000) {
+	Append("COPT" => "-finline-limit=2000 --param large-function-insns=5000 --param inline-unit-growth=200 --param large-function-growth=400");
+} elsif ($gccver == 4000 || $gccver == 4001) {
 	Append("CWARNS" => "-Wundef -Wredundant-decls -Wno-pointer-sign -Wdisabled-optimization -Wno-missing-field-initializers");
 	Append("CWARNS_OFF" => "-Wno-pointer-sign");
 	Append("COPT" => "-finline-limit=5000 --param large-function-insns=5000 --param inline-unit-growth=200 --param large-function-growth=400");
@@ -158,6 +170,9 @@ if (IsSet("CONFIG_DEBUG")) {
 	Append("LOPT" => "-s");
 }
 
+# Decide how will lib/partmap.c work
+Set("PARTMAP_IS_MMAP") if IsSet("CPU_64BIT_POINTERS");
+
 # If debugging memory allocations:
 #LIBS+=-lefence
 #CDEBUG+=-DDEBUG_DMALLOC