From: Jani Taskinen <jani@php.net>
Date: Thu, 15 Jan 2009 14:38:19 +0000 (+0000)
Subject: MFH:- Fixed bug #47104 (Linking shared extensions fails with icc)
X-Git-Tag: php-5.2.9RC1~105
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c542cf02a1547edfa3053331292d69f2409d4302;p=php

MFH:- Fixed bug #47104 (Linking shared extensions fails with icc)
---

diff --git a/NEWS b/NEWS
index 50fa50bc08..da205bae4c 100644
--- a/NEWS
+++ b/NEWS
@@ -17,6 +17,7 @@ PHP                                                                        NEWS
 - Fixed bug in xml_error_string() which resulted in messages being
   off by one. (Scott)
 
+- Fixed bug #47104 (Linking shared extensions fails with icc). (Jani)
 - Fixed bug #47109 (Memory leak on $a->{"a"."b"} when $a is not an object).
   (Etienne, Dmitry)
 - Fixed bug #47042 (PHP cgi sapi is removing SCRIPT_FILENAME for non apache).
diff --git a/build/libtool.m4 b/build/libtool.m4
index a4ccb3c7bc..064582c5c7 100644
--- a/build/libtool.m4
+++ b/build/libtool.m4
@@ -4892,12 +4892,18 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
 	    ;;
-	  icpc* | ecpc*)
-	    # Intel C++
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-	    ;;
+      ecpc*)
+        # old Intel C++ for x86_64 which still supported -KPIC.
+        _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+        _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+        ;;
+      icpc*)
+        # Intel C++, used to be incompatible with GCC.
+        _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+        _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+        ;;
 	  pgCC*)
 	    # Portland Group C++ compiler.
 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
@@ -5138,10 +5144,18 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
 
     linux*)
       case $cc_basename in
-      icc* | ecc*)
-	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+      # old Intel for x86_64 which still supported -KPIC.
+      ecc*)
+        _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+        _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+        ;;
+      # icc used to be incompatible with GCC.
+      # ICC 10 doesn't accept -KPIC any more.
+      icc*)
+        _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+        _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
         ;;
       pgcc* | pgf77* | pgf90* | pgf95*)
         # Portland Group compilers (*not* the Pentium gcc compiler,