Integrate:

[ 34815]
Subject: [PATCH] Relocations errors with Intel CC 10 on 64 bits archs
From: Vincent Pit <perl@profvince.com>
Date: Tue, 11 Nov 2008 15:58:07 +0100
Message-ID: <49199D7F.7030304@profvince.com>

[ 34835]
Subject: [PATCH] Future-proof hints/linux.sh against Sun's cc -V output.
From: Andy Dougherty <doughera@lafayette.edu>
Date: Fri, 14 Nov 2008 13:01:13 -0500 (EST)
Message-ID: <Pine.LNX.4.64.0811141300220.6539@fractal.phys.lafayette.edu>
p4raw-link: @34835 on //depot/perl: 7accc71d75225bb6d25ab63eb19f6c9203f47212
p4raw-link: @34815 on //depot/perl: 95960e9d32db6ab0a2dadc6f50a4298263f7545f

p4raw-id: //depot/maint-5.8/perl@34878
p4raw-integrated: from //depot/maint-5.10/perl@34875 'merge in'
	hints/linux.sh (@34259..)

diff --git a/hints/linux.sh b/hints/linux.sh
index 1fe36c6..ac264c3 100644 (file)
--- a/hints/linux.sh
+++ b/hints/linux.sh
@@ -88,12 +88,22 @@ case "`${cc:-cc} -V 2>&1`" in
     # The -mp flag is needed to pass various floating point related tests
     # The -no-gcc flag is needed otherwise, icc pretends (poorly) to be gcc
     ccflags="-we147 -mp -no-gcc $ccflags"
+    # Prevent relocation errors on 64bits arch
+    case "`uname -m`" in
+       *ia64*|*x86_64*)
+           cccdlflags='-fPIC'
+       ;;
+    esac
     # If we're using ICC, we usually want the best performance
     case "$optimize" in
     '') optimize='-O3' ;;
     esac
     ;;
-*"Sun C"*)
+*" Sun "*"C"*)
+    # Sun's C compiler, which might have a 'tag' name between
+    # 'Sun' and the 'C':  Examples:
+    # cc: Sun C 5.9 Linux_i386 Patch 124871-01 2007/07/31
+    # cc: Sun Ceres C 5.10 Linux_i386 2008/07/10
     test "$optimize" || optimize='-xO2'
     cccdlflags='-KPIC'
     lddlflags='-G -Bdynamic'