cryptlib.c, etc.: fix linker warnings in 64-bit Darwin build.

diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c
index 524daf037d108dcc7a86fcb2c7eec07969c8ddfc..4b0a36c3d3a5e8717cfac5b6ef0ae95515422ef6 100644 (file)
--- a/crypto/cryptlib.c
+++ b/crypto/cryptlib.c
@@ -125,7 +125,7 @@ static double SSLeay_MSVC5_hack=0.0; /* and for VC1.5 */
        defined(__INTEL__) || \
        defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64)
 
        defined(__INTEL__) || \
        defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64)
 

-unsigned int  OPENSSL_ia32cap_P[2];
+extern unsigned int  OPENSSL_ia32cap_P[2];

 unsigned int *OPENSSL_ia32cap_loc(void) { return OPENSSL_ia32cap_P; }
 
 #if defined(OPENSSL_CPUID_OBJ) && !defined(OPENSSL_NO_ASM) && !defined(I386_ONLY)
 unsigned int *OPENSSL_ia32cap_loc(void) { return OPENSSL_ia32cap_P; }
 
 #if defined(OPENSSL_CPUID_OBJ) && !defined(OPENSSL_NO_ASM) && !defined(I386_ONLY)


@@ -164,6 +164,8 @@ void OPENSSL_cpuid_setup(void)
     OPENSSL_ia32cap_P[0] = (unsigned int)vec|(1<<10);
     OPENSSL_ia32cap_P[1] = (unsigned int)(vec>>32);
 }
     OPENSSL_ia32cap_P[0] = (unsigned int)vec|(1<<10);
     OPENSSL_ia32cap_P[1] = (unsigned int)(vec>>32);
 }

+#else
+unsigned int OPENSSL_ia32cap_P[2];

 #endif
 
 #else
 #endif
 
 #else

diff --git a/crypto/perlasm/x86_64-xlate.pl b/crypto/perlasm/x86_64-xlate.pl
index 97310d898db732d4df39cf39665a12c9b6cd9c32..1f4ce0a84e664233c00333630bf01db05ac679bb 100755 (executable)
--- a/crypto/perlasm/x86_64-xlate.pl
+++ b/crypto/perlasm/x86_64-xlate.pl
@@ -519,6 +519,7 @@ my %globals;
                    elsif ($flavour eq "mingw64") { $self->{value} = ""; }
                } elsif ($dir =~ /\.comm/) {
                    $self->{value} = "$dir\t$prefix$line";
                    elsif ($flavour eq "mingw64") { $self->{value} = ""; }
                } elsif ($dir =~ /\.comm/) {
                    $self->{value} = "$dir\t$prefix$line";

+                   $self->{value} =~ s|,([0-9]+),([0-9]+)$|",$1,".log($2)/log(2)|e if ($flavour eq "macosx");

                }
                $line = "";
                return $self;
                }
                $line = "";
                return $self;

diff --git a/crypto/rc4/rc4test.c b/crypto/rc4/rc4test.c
index a5e30ed96c6d43c9d493474338cb1aebac8cb967..f3f8c92800f0a7efbe7cd024e3936499cf52c109 100644 (file)
--- a/crypto/rc4/rc4test.c
+++ b/crypto/rc4/rc4test.c
@@ -121,6 +121,8 @@ int main(int argc, char *argv[])
        RC4_KEY key;
        unsigned char obuf[512];
 
        RC4_KEY key;
        unsigned char obuf[512];
 

+       OPENSSL_cpuid_setup();
+

        for (i=0; i<6; i++)
                {
                RC4_set_key(&key,keys[i][0],&(keys[i][1]));
        for (i=0; i<6; i++)
                {
                RC4_set_key(&key,keys[i][0],&(keys[i][1]));

diff --git a/crypto/x86_64cpuid.pl b/crypto/x86_64cpuid.pl
index 0d233a10ea9e4179a0ced04a5c671ac0044bf17f..775353e9b9685a03e9f8d53bfeffa62f1419f5a0 100644 (file)
--- a/crypto/x86_64cpuid.pl
+++ b/crypto/x86_64cpuid.pl
@@ -23,7 +23,7 @@ print<<___;
        call    OPENSSL_cpuid_setup
 
 .hidden        OPENSSL_ia32cap_P
        call    OPENSSL_cpuid_setup
 
 .hidden        OPENSSL_ia32cap_P

-.comm  OPENSSL_ia32cap_P,8
+.comm  OPENSSL_ia32cap_P,8,4

 
 .text
 
 
 .text