summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSerhey Popovych <serhe.popovych@gmail.com>2018-12-14 19:54:37 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-12-15 17:10:52 +0000
commitfb02d11cad12876432a4c8719ad8b5cb91436516 (patch)
treed79d41f38e4e4dce56cc4b546f0c3bbab79ea2bf
parent6be12c06228cf7c686f16d21eba178e9437e1e65 (diff)
downloadpoky-fb02d11cad12876432a4c8719ad8b5cb91436516.tar.gz
openssl: Skip assembler optimized code for powerpc64 with musl
This code is written for elfv1 ABI in mind and linked as such: disable all optimizations at the moment when building for powerpc64 with musl. (From OE-Core rev: bee9e807430178426b2a5635b573ae285e889c39) Signed-off-by: Serhey Popovych <serhe.popovych@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/openssl/openssl10_1.0.2q.bb1
-rw-r--r--meta/recipes-connectivity/openssl/openssl_1.1.1a.bb1
2 files changed, 2 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl10_1.0.2q.bb b/meta/recipes-connectivity/openssl/openssl10_1.0.2q.bb
index 6518dac076..9d67053b7a 100644
--- a/meta/recipes-connectivity/openssl/openssl10_1.0.2q.bb
+++ b/meta/recipes-connectivity/openssl/openssl10_1.0.2q.bb
@@ -81,6 +81,7 @@ CCACHE = ""
81 81
82TERMIO ?= "-DTERMIO" 82TERMIO ?= "-DTERMIO"
83TERMIO_libc-musl = "-DTERMIOS" 83TERMIO_libc-musl = "-DTERMIOS"
84EXTRA_OECONF_append_libc-musl_powerpc64 = " no-asm"
84 85
85CFLAG = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'le', '-DL_ENDIAN', '-DB_ENDIAN', d)} \ 86CFLAG = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'le', '-DL_ENDIAN', '-DB_ENDIAN', d)} \
86 ${TERMIO} ${CFLAGS} -Wall" 87 ${TERMIO} ${CFLAGS} -Wall"
diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1a.bb b/meta/recipes-connectivity/openssl/openssl_1.1.1a.bb
index 042e023de5..5c4e69cfb7 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.1.1a.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.1.1a.bb
@@ -35,6 +35,7 @@ do_configure[cleandirs] = "${B}"
35#| ./libcrypto.so: undefined reference to `setcontext' 35#| ./libcrypto.so: undefined reference to `setcontext'
36#| ./libcrypto.so: undefined reference to `makecontext' 36#| ./libcrypto.so: undefined reference to `makecontext'
37EXTRA_OECONF_append_libc-musl = " no-async" 37EXTRA_OECONF_append_libc-musl = " no-async"
38EXTRA_OECONF_append_libc-musl_powerpc64 = " no-asm"
38 39
39# This prevents openssl from using getrandom() which is not available on older glibc versions 40# This prevents openssl from using getrandom() which is not available on older glibc versions
40# (native versions can be built with newer glibc, but then relocated onto a system with older glibc) 41# (native versions can be built with newer glibc, but then relocated onto a system with older glibc)