diff options
| author | emaste <emaste@FreeBSD.org> | 2016-05-06 13:04:45 +0000 |
|---|---|---|
| committer | emaste <emaste@FreeBSD.org> | 2016-05-06 13:04:45 +0000 |
| commit | c5ae2cf039060fa60177616b3111c3e567c5460a (patch) | |
| tree | 74de87ed58d858cce41a1eda60bde3ee1b25d757 /secure/lib/libcrypto | |
| parent | a5193740b95ef87e9ab4864032a28f58cb60085a (diff) | |
| download | FreeBSD-src-c5ae2cf039060fa60177616b3111c3e567c5460a.zip FreeBSD-src-c5ae2cf039060fa60177616b3111c3e567c5460a.tar.gz | |
Revert r299139: these are generated files
We'll need to properly generate PIC/non-PIC from the source .pl files.
Reported by: jkim
Diffstat (limited to 'secure/lib/libcrypto')
| -rw-r--r-- | secure/lib/libcrypto/Makefile | 2 | ||||
| -rw-r--r-- | secure/lib/libcrypto/i386/crypt586.s (renamed from secure/lib/libcrypto/i386/crypt586.S) | 8 |
2 files changed, 1 insertions, 9 deletions
diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile index b41f533..fbb38e9 100644 --- a/secure/lib/libcrypto/Makefile +++ b/secure/lib/libcrypto/Makefile @@ -137,7 +137,7 @@ SRCS+= cbc_cksm.c cbc_enc.c cfb64ede.c cfb64enc.c cfb_enc.c des_old.c \ fcrypt.c ofb64ede.c ofb64enc.c ofb_enc.c pcbc_enc.c qud_cksm.c \ rand_key.c read2pwd.c rpc_enc.c set_key.c str2key.c xcbc_enc.c .if ${MACHINE_CPUARCH} == "i386" -SRCS+= crypt586.S des-586.s +SRCS+= crypt586.s des-586.s .else SRCS+= des_enc.c fcrypt_b.c .endif diff --git a/secure/lib/libcrypto/i386/crypt586.S b/secure/lib/libcrypto/i386/crypt586.s index a02a3fc..43f903a 100644 --- a/secure/lib/libcrypto/i386/crypt586.S +++ b/secure/lib/libcrypto/i386/crypt586.s @@ -14,15 +14,7 @@ fcrypt_body: xorl %edi,%edi xorl %esi,%esi -#ifdef PIC - calll .L1 -.L1: - popl %edx - addl $_GLOBAL_OFFSET_TABLE_+(.-.L1), %edx - movl DES_SPtrans@GOT(%edx), %edx -#else leal DES_SPtrans,%edx -#endif pushl %edx movl 28(%esp),%ebp pushl $25 |
