X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=ucw%2Fperl%2FUCW%2FConfigure%2FC.pm;h=b14759258ff9c83eb9a45311be989eb6482c25a9;hb=9ef73a67dd942f6e369c2719847d2cc35e920c88;hp=ec39630d34b6cdcd5944948511837ebd3aa7fcb1;hpb=e938d9e3bf5c98b502178ee26d81a410890fb725;p=libucw.git diff --git a/ucw/perl/UCW/Configure/C.pm b/ucw/perl/UCW/Configure/C.pm index ec39630d..b1475925 100644 --- a/ucw/perl/UCW/Configure/C.pm +++ b/ucw/perl/UCW/Configure/C.pm @@ -1,5 +1,5 @@ # UCW Library configuration system: OS and C compiler -# (c) 2005--2008 Martin Mares +# (c) 2005--2012 Martin Mares # (c) 2006 Robert Spalek # (c) 2008 Michal Vaner @@ -46,125 +46,56 @@ $gccver >= 3000 or Fail "GCC older than 3.0 doesn't support C99 well enough."; ### CPU ### Test("ARCH", "Checking for machine architecture", sub { - my $mach = `uname -m`; + # + # We have to ask GCC for the target architecture, because it may + # differ from what uname tells us. This can happen even if we are + # not cross-compiling, for example on Linux with amd64 kernel, but + # i386 userspace. + # + my $gcc = Get("CC"); + my $mach = `$gcc -dumpmachine 2>/dev/null`; + if (!$? && $mach ne "") { + $mach =~ s/-.*//; + } else { + $mach = `uname -m`; + Fail "Unable to determine machine type" if $? || $mach eq ""; + } 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"; + } elsif ($mach eq 'powerpc') { + return $mach; } else { - return "unknown"; - } -}); - -sub parse_cpuinfo_linux() { - open X, "/proc/cpuinfo" || undef; - my %pc = (); - while () { - chomp; - /^$/ && last; - /^([^\t]+)\t+:\s*(.*)$/ and $pc{$1}=$2; - } - close X; - return ($pc{'vendor_id'}, - $pc{'cpu family'}, - $pc{'model'}); -} - -sub parse_cpuinfo_darwin() { - my @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_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"); - Set("CPU_LITTLE_ENDIAN"); - UnSet("CPU_BIG_ENDIAN"); - Set("CPU_ALLOW_UNALIGNED"); - Set("CPU_STRUCT_ALIGN" => 4); - if (IsSet("CONFIG_EXACT_CPU")) { - my ($vendor, $family, $model) = parse_cpuinfo(); - # Try to understand CPU vendor, family and model [inspired by MPlayer's configure script] - if ($vendor eq "AuthenticAMD") { - if ($family >= 6) { - if ($model >= 31 && $gccver >= 3004) { $arch = "athlon64"; } - elsif ($model >= 6 && $gccver >= 3003) { $arch = "athlon-xp"; } - else { $arch = "athlon"; } - } - } elsif ($vendor eq "GenuineIntel") { - 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"; } - } - } - - # No match on vendor, try the family - if ($arch eq "") { - if ($family >= 6) { - $arch = "i686"; - } elsif ($family >= 3) { - $arch = "i${family}86"; - } - } - Log (($arch ne "") ? "(using /proc/cpuinfo) " : "(don't understand /proc/cpuinfo) "); - return $arch; - } else { - return "default"; - } - } 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); - if (IsSet("CONFIG_EXACT_CPU")) { - # In x86-64 world, the detection is somewhat easier so far... - my ($vendor, $family, $model) = parse_cpuinfo(); - 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 "default"; - } - } else { - return "unknown"; + return "unknown ($mach)"; } }); -if (Get("CPU_ARCH") eq "unknown") { - Warn "CPU architecture not recognized, using defaults, keep fingers crossed.\n"; +my $arch = Get("ARCH"); +if ($arch 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); +} elsif ($arch 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); +} elsif ($arch eq "powerpc") { + Set("CPU_AMD64"); + UnSet("CPU_64BIT_POINTERS"); + UnSet("CPU_LITTLE_ENDIAN"); + Set("CPU_BIG_ENDIAN"); + UnSet("CPU_ALLOW_UNALIGNED"); + Set("CPU_STRUCT_ALIGN" => 4); +} elsif (!Get("CPU_LITTLE_ENDIAN") && !Get("CPU_BIG_ENDIAN")) { + Fail "Architecture not recognized, please set CPU_xxx variables manually."; } ### Compiler and its Options ### @@ -174,15 +105,19 @@ Set("CLANG" => "-std=gnu99 -fno-common"); # C optimizations Set("COPT" => '-O2'); -if (Get("CPU_ARCH") ne "unknown" && Get("CPU_ARCH") ne "default") { - Append("COPT", '-march=$(CPU_ARCH)'); +if ($arch =~ /^(i386|amd64)$/ && Get("CONFIG_EXACT_CPU")) { + if ($gccver >= 4002) { + Append('COPT', '-march=native'); + } else { + Warn "CONFIG_EXACT_CPU not supported with old GCC, ignoring.\n"; + } } # C optimizations for highly exposed code Set("COPT2" => '-O3'); # Warnings -Set("CWARNS" => '-Wall -W -Wno-parentheses -Wstrict-prototypes -Wmissing-prototypes -Winline'); +Set("CWARNS" => '-Wall -W -Wno-parentheses -Wstrict-prototypes -Wmissing-prototypes'); Set("CWARNS_OFF" => ''); # Linker flags @@ -193,15 +128,27 @@ Set("LIBS" => ""); # Extra flags for compiling and linking shared libraries Set("CSHARED" => '-fPIC'); -if (IsSet("CONFIG_LOCAL")) { - Set("SONAME_PREFIX" => "lib/"); -} else { - Set("SONAME_PREFIX" => ""); +Append("LOPT" => "-Wl,--rpath-link,run/lib -Lrun/lib"); +if (!IsSet("CONFIG_LOCAL")) { + # Beware that in non-local builds the INSTALL_LIB_DIR must exist in + # standard search paths for shared libraries. + Set("SO_LINK_PATH" => ''); +} +else { + # In local builds, we need to link binaries with custom --rpath. + # GCC seems to fail when this directory does not exist. + Set("SO_LINK_PATH" => "-Wl,--rpath," . Get("INSTALL_LIB_DIR")); + AtWrite { + my $libdir = Get("INSTALL_LIB_DIR"); + if (IsSet("CONFIG_SHARED")) { + `mkdir -p $libdir`; Fail("Cannot create $libdir") if $?; + } + }; } if (IsSet("CONFIG_DARWIN")) { - Set("LSHARED" => '-dynamiclib -install_name $(SONAME_PREFIX)$(@F)$(SONAME_SUFFIX) -undefined dynamic_lookup'); + Set("LSHARED" => '-dynamiclib -install_name $(@F)$(SONAME_SUFFIX) -undefined dynamic_lookup'); } else { - Set("LSHARED" => '-shared -Wl,-soname,$(SONAME_PREFIX)$(@F)$(SONAME_SUFFIX)'); + Set("LSHARED" => '-shared -Wl,-soname,$(@F)$(SONAME_SUFFIX)'); } # Extra switches depending on GCC version: @@ -217,9 +164,6 @@ if ($gccver == 3000) { 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"); - if ($gccver >= 4002) { - Append("COPT" => "-fgnu89-inline"); - } } else { Warn "Don't know anything about this GCC version, using default switches.\n"; } @@ -235,14 +179,48 @@ if (IsSet("CONFIG_DEBUG")) { Append("LOPT" => "-s"); } +# Link-time optimization (experimental) +# This is currently very inefficient, because we do not attempt to disable +# optimizations when compiling individual modules. Therefore, we optimize +# each shared library module twice: when compiling and when linking. +# Doing it properly would require hacking makefiles. +if (IsSet("CONFIG_LTO")) { + Append("LOPT", "-flto"); + Append("COPT", "-flto"); +} + 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("SOL_TCP" => 6); # missing in /usr/include/netinet/tcp.h +} + +### Compiling test programs ### + +sub TestCompile($$) { + my ($testname, $source) = @_; + my $dir = "conftest-$testname"; + `rm -rf $dir && mkdir $dir`; $? and Fail "Cannot initialize $dir"; + + open SRC, ">$dir/conftest.c"; + print SRC $source; + close SRC; + + my $cmd = join(" ", + map { defined($_) ? $_ : "" } + "cd $dir &&", + Get("CC"), Get("CLANG"), Get("COPT"), Get("CEXTRA"), Get("LIBS"), + "conftest.c", "-o", "conftest", + ">conftest.log", "2>&1" + ); + `$cmd`; + my $result = !$?; + + `rm -rf $dir` unless Get("KEEP_CONFTEST"); + + return $result; } ### Writing C headers with configuration ###