Module Name:    src
Committed By:   joerg
Date:           Thu Jul 28 20:24:37 UTC 2011

Modified Files:
        src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64: aes-x86_64.S
            cmll-x86_64.S rc4-x86_64.S sha512-x86_64.S wp-x86_64.S

Log Message:
Drop @GOTPCREL when accessing local variables. For yet unknown reasons,
our version of GNU as decides to silently ignore it. Never versions on
other systems and Clang actually keep it around and create bad object
files. The object files are identical after the changes modulo the GOT
entry in the symbol table.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
    src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aes-x86_64.S \
    src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/rc4-x86_64.S \
    src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha512-x86_64.S \
    src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/wp-x86_64.S
cvs rdiff -u -r1.1 -r1.2 \
    src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/cmll-x86_64.S

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aes-x86_64.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aes-x86_64.S:1.2 src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aes-x86_64.S:1.3
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aes-x86_64.S:1.2	Sun Jun  5 23:09:50 2011
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aes-x86_64.S	Thu Jul 28 20:24:36 2011
@@ -366,7 +366,7 @@
 	movq	%rbp,8(%rsp)
 
 
-	leaq	.LAES_Te+2048@GOTPCREL(%rip),%r14
+	leaq	.LAES_Te+2048(%rip),%r14
 	leaq	768(%rsp),%rbp
 	subq	%r14,%rbp
 	andq	$768,%rbp
@@ -811,7 +811,7 @@
 	movq	%rbp,8(%rsp)
 
 
-	leaq	.LAES_Td+2048@GOTPCREL(%rip),%r14
+	leaq	.LAES_Td+2048(%rip),%r14
 	leaq	768(%rsp),%rbp
 	subq	%r14,%rbp
 	andq	$768,%rbp
@@ -876,7 +876,7 @@
 	testq	$-1,%rdi
 	jz	.Lbadpointer
 
-	leaq	.LAES_Te@GOTPCREL(%rip),%rbp
+	leaq	.LAES_Te(%rip),%rbp
 	leaq	2048+128(%rbp),%rbp
 
 
@@ -1141,7 +1141,7 @@
 	cmpq	%rsi,%rdi
 	jne	.Linvert
 
-	leaq	.LAES_Te+2048+1024@GOTPCREL(%rip),%rax
+	leaq	.LAES_Te+2048+1024(%rip),%rax
 
 	movq	40(%rax),%rsi
 	movq	48(%rax),%rdi
@@ -1309,10 +1309,10 @@
 	cld
 	movl	%r9d,%r9d
 
-	leaq	.LAES_Te@GOTPCREL(%rip),%r14
+	leaq	.LAES_Te(%rip),%r14
 	cmpq	$0,%r9
 	jne	.Lcbc_picked_te
-	leaq	.LAES_Td@GOTPCREL(%rip),%r14
+	leaq	.LAES_Td(%rip),%r14
 .Lcbc_picked_te:
 
 	movl	OPENSSL_ia32cap_P@GOTPCREL(%rip),%r10d
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/rc4-x86_64.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/rc4-x86_64.S:1.2 src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/rc4-x86_64.S:1.3
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/rc4-x86_64.S:1.2	Sun Jun  5 23:09:50 2011
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/rc4-x86_64.S	Thu Jul 28 20:24:36 2011
@@ -401,7 +401,7 @@
 .type	RC4_options,@function
 .align	16
 RC4_options:
-	leaq	.Lopts@GOTPCREL(%rip),%rax
+	leaq	.Lopts(%rip),%rax
 	movl	OPENSSL_ia32cap_P@GOTPCREL(%rip),%edx
 	btl	$20,%edx
 	jnc	.Ldone
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha512-x86_64.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha512-x86_64.S:1.2 src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha512-x86_64.S:1.3
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha512-x86_64.S:1.2	Sun Jun  5 23:09:50 2011
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha512-x86_64.S	Thu Jul 28 20:24:36 2011
@@ -21,7 +21,7 @@
 	movq	%r11,64+24(%rsp)
 .Lprologue:
 
-	leaq	K256@GOTPCREL(%rip),%rbp
+	leaq	K256(%rip),%rbp
 
 	movl	0(%rdi),%eax
 	movl	4(%rdi),%ebx
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/wp-x86_64.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/wp-x86_64.S:1.2 src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/wp-x86_64.S:1.3
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/wp-x86_64.S:1.2	Sun Jun  5 23:09:50 2011
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/wp-x86_64.S	Thu Jul 28 20:24:36 2011
@@ -23,7 +23,7 @@
 .Lprologue:
 
 	movq	%r10,%rbx
-	leaq	.Ltable@GOTPCREL(%rip),%rbp
+	leaq	.Ltable(%rip),%rbp
 
 	xorq	%rcx,%rcx
 	xorq	%rdx,%rdx

Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/cmll-x86_64.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/cmll-x86_64.S:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/cmll-x86_64.S:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/cmll-x86_64.S:1.1	Mon Jun  6 06:08:53 2011
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/cmll-x86_64.S	Thu Jul 28 20:24:36 2011
@@ -29,7 +29,7 @@
 	movq	%rdx,%r14
 
 	shll	$6,%edi
-	leaq	.LCamellia_SBOX@GOTPCREL(%rip),%rbp
+	leaq	.LCamellia_SBOX(%rip),%rbp
 	leaq	(%r14,%rdi,1),%r15
 
 	movl	0(%rsi),%r8d
@@ -298,7 +298,7 @@
 	movq	%rdx,%r15
 
 	shll	$6,%edi
-	leaq	.LCamellia_SBOX@GOTPCREL(%rip),%rbp
+	leaq	.LCamellia_SBOX(%rip),%rbp
 	leaq	(%r15,%rdi,1),%r14
 
 	movl	0(%rsi),%r8d
@@ -595,8 +595,8 @@
 	xorl	12(%r13),%r10d
 
 .L1st128:
-	leaq	.LCamellia_SIGMA@GOTPCREL(%rip),%r14
-	leaq	.LCamellia_SBOX@GOTPCREL(%rip),%rbp
+	leaq	.LCamellia_SIGMA(%rip),%r14
+	leaq	.LCamellia_SBOX(%rip),%rbp
 
 	movl	0(%r14),%ebx
 	movl	4(%r14),%eax
@@ -1638,7 +1638,7 @@
 	movq	%rbp,48(%rsp)
 
 .Lcbc_body:
-	leaq	.LCamellia_SBOX@GOTPCREL(%rip),%rbp
+	leaq	.LCamellia_SBOX(%rip),%rbp
 
 	movl	$32,%ecx
 .align	4

Reply via email to