Commit 4a5397fb authored by Andy Polyakov's avatar Andy Polyakov
Browse files

Configure, x86gas.pl: fix linker warnings in 32-bit Darwin build.

parent f9542a42

Configure

+1 −1
Original line number Diff line number Diff line
@@ -574,7 +574,7 @@ my %table=( 
"rhapsody-ppc-cc","cc:-O3 -DB_ENDIAN::(unknown):MACOSX_RHAPSODY::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}::",

"darwin-ppc-cc","cc:-arch ppc -O3 -DB_ENDIAN -Wa,-force_cpusubtype_ALL::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc32_asm}:osx32:dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",

"darwin64-ppc-cc","cc:-arch ppc64 -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc64_asm}:osx64:dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",

"darwin-i386-cc","cc:-arch i386 -O3 -fomit-frame-pointer -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR:${x86_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",

"darwin-i386-cc","cc:-arch i386 -O3 -fomit-frame-pointer -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR:".eval{my $asm=$x86_asm;$asm=~s/cast\-586\.o//;$asm}.":macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",

"debug-darwin-i386-cc","cc:-arch i386 -g3 -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR:${x86_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",

"darwin64-x86_64-cc","cc:-arch x86_64 -O3 -DL_ENDIAN -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",

"debug-darwin-ppc-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DB_ENDIAN -g -Wall -O::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc32_asm}:osx32:dlfcn:darwin-shared:-fPIC:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",

TABLE

+1 −1
Original line number Diff line number Diff line
@@ -1368,7 +1368,7 @@ $aes_obj = aes-586.o vpaes-x86.o aesni-x86.o 
$bf_obj       = bf-586.o

$md5_obj      = md5-586.o

$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o

$cast_obj     = cast-586.o

$cast_obj     = 

$rc4_obj      = rc4-586.o

$rmd160_obj   = rmd-586.o

$rc5_obj      = rc5-586.o

crypto/perlasm/x86gas.pl

+3 −2
Original line number Diff line number Diff line
@@ -160,7 +160,8 @@ sub ::file_end 
    }

    if (grep {/\b${nmdecor}OPENSSL_ia32cap_P\b/i} @out) {

	my $tmp=".comm\t${nmdecor}OPENSSL_ia32cap_P,8";

	if ($::elf)	{ push (@out,"$tmp,4\n"); }

	if ($::macosx)	{ push (@out,"$tmp,2\n"); }

	elsif ($::elf)	{ push (@out,"$tmp,4\n"); }

	else		{ push (@out,"$tmp\n"); }

    }

    push(@out,$initseg) if ($initseg);
@@ -183,7 +184,7 @@ sub ::align 
sub ::picmeup

{ my($dst,$sym,$base,$reflabel)=@_;



    if ($::pic && ($::elf || $::aout))

    if (($::pic && ($::elf || $::aout)) || $::macosx)

    {	if (!defined($base))

	{   &::call(&::label("PIC_me_up"));

	    &::set_label("PIC_me_up");