提交 1187ee7d 编写于 作者: A Andy Polyakov

More Intel cc fix-ups.

上级 7c5921e7
...@@ -1180,12 +1180,16 @@ if (!$IsMK1MF) ...@@ -1180,12 +1180,16 @@ if (!$IsMK1MF)
} }
$cpuid_obj.=" uplink.o uplink-cof.o" if ($cflags =~ /\-DOPENSSL_USE_APPLINK/); $cpuid_obj.=" uplink.o uplink-cof.o" if ($cflags =~ /\-DOPENSSL_USE_APPLINK/);
# Compiler fix-ups # Compiler fix-ups
if ($target =~ /icc$/) if ($target =~ /icc$/)
{ {
my($iccver)=`$cc -V 2>&1`; my $iccver=0;
if ($iccver =~ /Version ([0-9]+)\./) { $iccver=$1; } if (open(FD,"$cc -V 2>&1 |"))
else { $iccver=0; } {
while(<FD>) { $iccver=$1 if (/Version ([0-9]+)\./); }
close(FD);
}
if ($iccver>=8) if ($iccver>=8)
{ {
# Eliminate unnecessary dependency from libirc.a. This is # Eliminate unnecessary dependency from libirc.a. This is
...@@ -1193,6 +1197,15 @@ if ($target =~ /icc$/) ...@@ -1193,6 +1197,15 @@ if ($target =~ /icc$/)
# apps/openssl can end up in endless loop upon startup... # apps/openssl can end up in endless loop upon startup...
$cflags.=" -Dmemcpy=__builtin_memcpy -Dmemset=__builtin_memset"; $cflags.=" -Dmemcpy=__builtin_memcpy -Dmemset=__builtin_memset";
} }
if ($iccver>=9)
{
$cflags.=" -i-static";
$cflags=~s/\-no_cpprt/-no-cpprt/;
}
if ($iccver>=10)
{
$cflags=~s/\-i\-static/-static-intel/;
}
} }
if ($sys_id ne "") if ($sys_id ne "")
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册