aboutsummaryrefslogtreecommitdiffstats
path: root/package/libs
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2016-08-31 13:31:38 +0200
committerFelix Fietkau <nbd@nbd.name>2016-08-31 13:57:05 +0200
commit00a1056c3f366ee27cb86da8e521a827ad5d5b8f (patch)
tree21cd84762c1fbe64a98fcdc4899bd06fe9fb2552 /package/libs
parentd3730c9aca54712e64ee31c7587c3e35809e47bd (diff)
downloadupstream-00a1056c3f366ee27cb86da8e521a827ad5d5b8f.tar.gz
upstream-00a1056c3f366ee27cb86da8e521a827ad5d5b8f.tar.bz2
upstream-00a1056c3f366ee27cb86da8e521a827ad5d5b8f.zip
openssl: re-enable ARM assembly
The original reason for disabling it seems to have been fixed Related discussion: https://github.com/lede-project/source/pull/307 Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'package/libs')
-rw-r--r--package/libs/openssl/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/package/libs/openssl/Makefile b/package/libs/openssl/Makefile
index e73cd759b1..76a907b6bb 100644
--- a/package/libs/openssl/Makefile
+++ b/package/libs/openssl/Makefile
@@ -154,8 +154,8 @@ else
OPENSSL_OPTIONS+=no-sse2
ifeq ($(CONFIG_mips)$(CONFIG_mipsel),y)
OPENSSL_TARGET:=linux-mips-openwrt
-# else ifeq ($(CONFIG_arm)$(CONFIG_armeb),y)
-# OPENSSL_TARGET:=linux-armv4-openwrt
+ else ifeq ($(CONFIG_arm)$(CONFIG_armeb),y)
+ OPENSSL_TARGET:=linux-armv4-openwrt
else
OPENSSL_TARGET:=linux-generic-openwrt
OPENSSL_OPTIONS+=no-perlasm