diff options
| author | miod <> | 2015-09-11 14:48:06 +0000 |
|---|---|---|
| committer | miod <> | 2015-09-11 14:48:06 +0000 |
| commit | fef7a51ff03278663db1f3dd51faa3311e38c791 (patch) | |
| tree | 9bb60c95d38048dfdcea14ddf9272897f85b518a /src | |
| parent | 007271986f85dc18c1c8a9f925d1e9c0b5de12c6 (diff) | |
| download | openbsd-fef7a51ff03278663db1f3dd51faa3311e38c791.tar.gz openbsd-fef7a51ff03278663db1f3dd51faa3311e38c791.tar.bz2 openbsd-fef7a51ff03278663db1f3dd51faa3311e38c791.zip | |
Pass "openbsd" instead of "openbsd-elf" as the "flavour" to the perl assembler
machinery. OpenBSD has never been not ELF on amd64, and changing this will
actually make -portable life slightly easier in the near future.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/libcrypto/arch/amd64/Makefile.inc | 4 | ||||
| -rw-r--r-- | src/lib/libcrypto/crypto/arch/amd64/Makefile.inc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libcrypto/arch/amd64/Makefile.inc b/src/lib/libcrypto/arch/amd64/Makefile.inc index 3f92196451..081ed3c252 100644 --- a/src/lib/libcrypto/arch/amd64/Makefile.inc +++ b/src/lib/libcrypto/arch/amd64/Makefile.inc | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | # $OpenBSD: Makefile.inc,v 1.4 2014/11/17 20:31:21 miod Exp $ | 1 | # $OpenBSD: Makefile.inc,v 1.5 2015/09/11 14:48:06 miod Exp $ |
| 2 | 2 | ||
| 3 | # amd64-specific libcrypto build rules | 3 | # amd64-specific libcrypto build rules |
| 4 | 4 | ||
| @@ -63,7 +63,7 @@ SRCS+= ${f}.S | |||
| 63 | GENERATED+=${f}.S | 63 | GENERATED+=${f}.S |
| 64 | ${f}.S: ${LCRYPTO_SRC}/${dir}/asm/${f}.pl | 64 | ${f}.S: ${LCRYPTO_SRC}/${dir}/asm/${f}.pl |
| 65 | (cd ${LCRYPTO_SRC}/${dir} ; \ | 65 | (cd ${LCRYPTO_SRC}/${dir} ; \ |
| 66 | /usr/bin/perl ./asm/${f}.pl openbsd-elf) > ${.TARGET} | 66 | /usr/bin/perl ./asm/${f}.pl openbsd) > ${.TARGET} |
| 67 | .endfor | 67 | .endfor |
| 68 | 68 | ||
| 69 | CFLAGS+= -DOPENSSL_CPUID_OBJ | 69 | CFLAGS+= -DOPENSSL_CPUID_OBJ |
diff --git a/src/lib/libcrypto/crypto/arch/amd64/Makefile.inc b/src/lib/libcrypto/crypto/arch/amd64/Makefile.inc index 3f92196451..081ed3c252 100644 --- a/src/lib/libcrypto/crypto/arch/amd64/Makefile.inc +++ b/src/lib/libcrypto/crypto/arch/amd64/Makefile.inc | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | # $OpenBSD: Makefile.inc,v 1.4 2014/11/17 20:31:21 miod Exp $ | 1 | # $OpenBSD: Makefile.inc,v 1.5 2015/09/11 14:48:06 miod Exp $ |
| 2 | 2 | ||
| 3 | # amd64-specific libcrypto build rules | 3 | # amd64-specific libcrypto build rules |
| 4 | 4 | ||
| @@ -63,7 +63,7 @@ SRCS+= ${f}.S | |||
| 63 | GENERATED+=${f}.S | 63 | GENERATED+=${f}.S |
| 64 | ${f}.S: ${LCRYPTO_SRC}/${dir}/asm/${f}.pl | 64 | ${f}.S: ${LCRYPTO_SRC}/${dir}/asm/${f}.pl |
| 65 | (cd ${LCRYPTO_SRC}/${dir} ; \ | 65 | (cd ${LCRYPTO_SRC}/${dir} ; \ |
| 66 | /usr/bin/perl ./asm/${f}.pl openbsd-elf) > ${.TARGET} | 66 | /usr/bin/perl ./asm/${f}.pl openbsd) > ${.TARGET} |
| 67 | .endfor | 67 | .endfor |
| 68 | 68 | ||
| 69 | CFLAGS+= -DOPENSSL_CPUID_OBJ | 69 | CFLAGS+= -DOPENSSL_CPUID_OBJ |