cryptlib.c, etc.: fix linker warnings in 64-bit Darwin build.
authorAndy Polyakov <appro@openssl.org>
Sat, 12 Nov 2011 13:10:00 +0000 (13:10 +0000)
committerAndy Polyakov <appro@openssl.org>
Sat, 12 Nov 2011 13:10:00 +0000 (13:10 +0000)
crypto/cryptlib.c
crypto/perlasm/x86_64-xlate.pl
crypto/rc4/rc4test.c
crypto/x86_64cpuid.pl

index 524daf0..4b0a36c 100644 (file)
@@ -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)
 
-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)
@@ -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);
 }
+#else
+unsigned int OPENSSL_ia32cap_P[2];
 #endif
 
 #else
index 97310d8..1f4ce0a 100755 (executable)
@@ -519,6 +519,7 @@ my %globals;
                    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;
index a5e30ed..f3f8c92 100644 (file)
@@ -121,6 +121,8 @@ int main(int argc, char *argv[])
        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]));
index 0d233a1..775353e 100644 (file)
@@ -23,7 +23,7 @@ print<<___;
        call    OPENSSL_cpuid_setup
 
 .hidden        OPENSSL_ia32cap_P
-.comm  OPENSSL_ia32cap_P,8
+.comm  OPENSSL_ia32cap_P,8,4
 
 .text