[openssl-commits] [openssl] master update

Richard Levitte levitte at openssl.org
Sun Jan 31 18:51:38 UTC 2016


The branch master has been updated
       via  0e87e05816d3e4b66ea7904634095aad5f6f325f (commit)
      from  b59e1bed7da7933d4c6af750fe3f0300b57874fe (commit)


- Log -----------------------------------------------------------------
commit 0e87e05816d3e4b66ea7904634095aad5f6f325f
Author: Richard Levitte <levitte at openssl.org>
Date:   Sun Jan 31 18:33:42 2016 +0100

    Remove the extra checks for Intel's C compiler
    
    When the target is {something}-icc, we're doing some extra checks of
    the icc compiler.  However, all such targets were cleaned away in
    March 2015, so this Configure section is dead code.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 Configure | 32 --------------------------------
 1 file changed, 32 deletions(-)

diff --git a/Configure b/Configure
index 4dca9a9..8beaabd 100755
--- a/Configure
+++ b/Configure
@@ -980,38 +980,6 @@ if ($target{build_scheme}->[0] ne "mk1mf")
 #
 # Platform fix-ups
 #
-if ($target =~ /-icc$/)	# Intel C compiler
-	{
-	my $iccver=0;
-	if (open(FD,"$target{cc} -V 2>&1 |"))
-		{
-		while(<FD>) { $iccver=$1 if (/Version ([0-9]+)\./); }
-		close(FD);
-		}
-	if ($iccver>=8)
-		{
-		$config{cflags}=~s/-KPIC/-fPIC/;
-		# Eliminate unnecessary dependency from libirc.a. This is
-		# essential for shared library support, as otherwise
-		# apps/openssl can end up in endless loop upon startup...
-		$config{cflags}.=" -Dmemcpy=__builtin_memcpy -Dmemset=__builtin_memset";
-		}
-	if ($iccver>=9)
-		{
-		$config{ex_libs}.=" -i-static";
-		$config{ex_libs}=~s/-no_cpprt/-no-cpprt/;
-		}
-	if ($iccver>=10)
-		{
-		$config{ex_libs}=~s/-i-static/-static-intel/;
-		}
-	if ($iccver>=11)
-		{
-		$config{cflags}.=" -no-intel-extensions";	# disable Cilk
-		$config{ex_libs}=~s/-no-cpprt/-no-cxxlib/;
-		}
-	}
-
 # Unlike other OSes (like Solaris, Linux, Tru64, IRIX) BSD run-time
 # linkers (tested OpenBSD, NetBSD and FreeBSD) "demand" RPATH set on
 # .so objects. Apparently application RPATH is not global and does


More information about the openssl-commits mailing list