Commit b48111df authored by Andy Polyakov's avatar Andy Polyakov
Browse files

More Intel cc fix-ups [from HEAD].

parent 73e3edd7

Configure

+16 −3
Original line number Diff line number Diff line
@@ -1162,12 +1162,16 @@ if (!$IsMK1MF) 
	}



$cpuid_obj.=" uplink.o uplink-cof.o" if ($cflags =~ /\-DOPENSSL_USE_APPLINK/);



# Compiler fix-ups

if ($target =~ /icc$/)

	{

	my($iccver)=`$cc -V 2>&1`;

	if ($iccver =~ /Version ([0-9]+)\./)	{ $iccver=$1; }

	else					{ $iccver=0;  }

	my $iccver=0;

	if (open(FD,"$cc -V 2>&1 |"))

		{

		while(<FD>) { $iccver=$1 if (/Version ([0-9]+)\./); }

		close(FD);

		}

	if ($iccver>=8)

		{

		# Eliminate unnecessary dependency from libirc.a. This is
@@ -1175,6 +1179,15 @@ if ($target =~ /icc$/) 
		# apps/openssl can end up in endless loop upon startup...

		$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 "")