diff options
| author | Andy Polyakov <appro@openssl.org> | 2011-11-12 13:10:00 +0000 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2011-11-12 13:10:00 +0000 |
| commit | ff6f9f96fd372bb4d05c08dea7d317026edf2e94 (patch) | |
| tree | f34c1bfa5db3483b57830dc658fceffa6f4e8372 | |
| parent | 4a5397fb68279702e6e0b20c514ff18713bdd38b (diff) | |
| download | openssl-new-ff6f9f96fd372bb4d05c08dea7d317026edf2e94.tar.gz | |
cryptlib.c, etc.: fix linker warnings in 64-bit Darwin build.
| -rw-r--r-- | crypto/cryptlib.c | 4 | ||||
| -rwxr-xr-x | crypto/perlasm/x86_64-xlate.pl | 1 | ||||
| -rw-r--r-- | crypto/rc4/rc4test.c | 2 | ||||
| -rw-r--r-- | crypto/x86_64cpuid.pl | 2 |
4 files changed, 7 insertions, 2 deletions
diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c index 524daf037d..4b0a36c3d3 100644 --- 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) -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 diff --git a/crypto/perlasm/x86_64-xlate.pl b/crypto/perlasm/x86_64-xlate.pl index 97310d898d..1f4ce0a84e 100755 --- 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"; + $self->{value} =~ s|,([0-9]+),([0-9]+)$|",$1,".log($2)/log(2)|e if ($flavour eq "macosx"); } $line = ""; return $self; diff --git a/crypto/rc4/rc4test.c b/crypto/rc4/rc4test.c index a5e30ed96c..f3f8c92800 100644 --- 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]; + OPENSSL_cpuid_setup(); + 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 0d233a10ea..775353e9b9 100644 --- a/crypto/x86_64cpuid.pl +++ b/crypto/x86_64cpuid.pl @@ -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 |