[Pkg-openssl-changes] r231 - in openssl/trunk: crypto debian

[kroeckx at alioth.debian.org]

Author: kroeckx
Date: 2007-09-02 14:30:46 +0000 (Sun, 02 Sep 2007)
New Revision: 231

Modified:
   openssl/trunk/crypto/Makefile
   openssl/trunk/crypto/x86_64cpuid.pl
   openssl/trunk/debian/changelog
Log:
Make x86_64cpuid.pl use PIC.


Modified: openssl/trunk/crypto/Makefile
===================================================================
--- openssl/trunk/crypto/Makefile	2007-09-02 14:01:13 UTC (rev 230)
+++ openssl/trunk/crypto/Makefile	2007-09-02 14:30:46 UTC (rev 231)
@@ -70,7 +70,7 @@
 uplink-cof.s:	../ms/uplink.pl
 	$(PERL) ../ms/uplink.pl coff > $@
 
-x86_64cpuid.s: x86_64cpuid.pl
+x86_64cpuid.S: x86_64cpuid.pl
 	$(PERL) x86_64cpuid.pl $@
 ia64cpuid.s: ia64cpuid.S
 	$(CC) $(CFLAGS) -E ia64cpuid.S > $@

Modified: openssl/trunk/crypto/x86_64cpuid.pl
===================================================================
--- openssl/trunk/crypto/x86_64cpuid.pl	2007-09-02 14:01:13 UTC (rev 230)
+++ openssl/trunk/crypto/x86_64cpuid.pl	2007-09-02 14:30:46 UTC (rev 231)
@@ -134,5 +134,9 @@
 .size	OPENSSL_ia32_cpuid,.-OPENSSL_ia32_cpuid
 
 .section	.init
+#ifdef OPENSSL_PIC
+	call	OPENSSL_cpuid_setup\@PLT
+#else
 	call	OPENSSL_cpuid_setup
+#endif
 ___

Modified: openssl/trunk/debian/changelog
===================================================================
--- openssl/trunk/debian/changelog	2007-09-02 14:01:13 UTC (rev 230)
+++ openssl/trunk/debian/changelog	2007-09-02 14:30:46 UTC (rev 231)
@@ -2,9 +2,9 @@
 
   * Fix problems with gcc-4.2 (Closes: #429740)
   * Stop using -Bsymbolic to create the shared library.
-  * 
+  * Make x86_64cpuid.pl use PIC.
 
- -- Kurt Roeckx <kurt at roeckx.be>  Sun, 02 Sep 2007 13:57:16 +0000
+ -- Kurt Roeckx <kurt at roeckx.be>  Sun, 02 Sep 2007 16:15:18 +0200
 
 openssl (0.9.8e-6) unstable; urgency=high