X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=inline;f=lib%2Fautoconf.cfg;h=668c83ea14051294f1e59f58bbee964984062028;hb=8ab69f51fccccbcae521bd7f7e3ae27146fd1217;hp=e833836feada67ee80dff160abb50425f9bff7e8;hpb=5c4102992c8c50d5fc145cdfc157a55cfd7d0d00;p=libucw.git diff --git a/lib/autoconf.cfg b/lib/autoconf.cfg index e833836f..668c83ea 100644 --- a/lib/autoconf.cfg +++ b/lib/autoconf.cfg @@ -16,14 +16,47 @@ if (Get("OS") eq "Linux") { Fail "Don't know how to run on this operating system."; } +### Compiler ### + +# Default compiler +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/'`; + chomp $ver; + Fail "Unable to determine GCC version" if $? || $ver eq ""; + return $ver; +}); +my ($gccmaj, $gccmin) = split(/\./, Get("GCCVER")); +my $gccver = 1000*$gccmaj + $gccmin; +$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"); + 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 = (); @@ -40,14 +73,14 @@ Test("CPU_ARCH", "Checking for CPU architecture", sub { my $model = $pc{'model'} || 0; if ($vendor eq "AuthenticAMD") { if ($family >= 6) { - if ($model >= 31) { $arch = "athlon64"; } - elsif ($model >= 6) { $arch = "athlon-xp"; } + if ($model >= 31 && $gccver >= 3004) { $arch = "athlon64"; } + elsif ($model >= 6 && $gccver >= 3003) { $arch = "athlon-xp"; } else { $arch = "athlon"; } } } elsif ($vendor eq "GenuineIntel") { - # We don't recognize Prescott and Nocona cores yet - if ($family >= 15) { $arch = "pentium4"; } - elsif ($family >= 6) { + # 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"; } elsif ($model >= 3) { $arch = "pentium2"; } } @@ -68,31 +101,28 @@ Test("CPU_ARCH", "Checking for CPU architecture", sub { } } return $arch ? $arch : "i386"; + } elsif ($mach eq "amd64") { + Set("CPU_AMD64"); + Set("CPU_64BIT_POINTERS"); + Set("CPU_LITTLE_ENDIAN"); + UnSet("CPU_BIG_ENDIAN"); + Set("CPU_ALLOW_UNALIGNED"); + 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."; } -### Compiler and its Options ### +if (!IsSet("CPU_ARCH")) { Warn "CPU type not recognized, using defaults, keep fingers crossed."; } -# Default compiler -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/'`; - chomp $ver; - Fail "Unable to determine GCC version" if $? || $ver eq ""; - return $ver; -}); +### Compiler and its Options ### # C flags: tell the compiler we're speaking C99 Set("CLANG" => "-std=gnu99"); # C optimizations -Set("COPT" => '-O2 -fstrict-aliasing -march=$(CPU_ARCH)'); +Set("COPT" => '-O2'); Append("COPT", '-march=$(CPU_ARCH)') if IsSet("CPU_ARCH"); # C optimizations for highly exposed code @@ -100,6 +130,7 @@ Set("COPT2" => '-O3'); # Warnings Set("CWARNS" => '-Wall -W -Wno-parentheses -Wstrict-prototypes -Wmissing-prototypes -Winline'); +Set("CWARNS_OFF" => ''); # Linker flags Set("LOPT" => ""); @@ -112,12 +143,17 @@ Set("CSHARED" => '-fPIC'); Set("LSHARED" => '-shared -Wl,-soname,lib/$(@F)'); # Extra switches depending on GCC version: -if (Get("GCCVER") eq "3.0") { -} elsif (Get("GCCVER") eq "3.3") { +if ($gccver == 3000) { + Append("COPT" => "-fstrict-aliasing"); +} elsif ($gccver == 3003) { Append("CWARNS" => "-Wundef -Wredundant-decls"); Append("COPT" => "-finline-limit=20000 --param max-inline-insns-auto=1000"); -} elsif (Get("GCCVER") eq "3.4") { +} elsif ($gccver == 3004) { Append("CWARNS" => "-Wundef -Wredundant-decls"); + 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"); } else { Warn "Don't know anything about this GCC version, using default switches.\n"; @@ -134,18 +170,13 @@ 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 #LIBS+=-ldmalloc -### CPU Type and Features ### - -Set("CPU_LITTLE_ENDIAN"); -#CPU_BIG_ENDIAN=1 -Set("CPU_ALLOW_UNALIGNED"); -Set("CPU_STRUCT_ALIGN" => 4); -Set("CPU_64BIT_POINTERS"); - # Return success 1;