diff options
| author | John Crispin <blogic@openwrt.org> | 2015-03-06 07:57:10 +0000 |
|---|---|---|
| committer | John Crispin <blogic@openwrt.org> | 2015-03-06 07:57:10 +0000 |
| commit | 2689997fe4eb5d6e891059179657b4afffde87e7 (patch) | |
| tree | bd7e0a4d5446aef14695e0d82bd65c6422a8fe65 /package/libs/openssl/Makefile | |
| parent | 5a24f85217cec6c03e3cb3d2da75ff050bcaaa0d (diff) | |
| download | upstream-2689997fe4eb5d6e891059179657b4afffde87e7.tar.gz upstream-2689997fe4eb5d6e891059179657b4afffde87e7.tar.bz2 upstream-2689997fe4eb5d6e891059179657b4afffde87e7.zip | |
openssl: enable ARM assembly acceleration
Tested myself on ixp4xx and mvebu, and (originally)
by Daniel on i.MX6. Also tested on a MIPS target,
to make sure the change to ASFLAGS does not break things.
Based on a patch submitted by Daniel Drown:
https://lists.openwrt.org/pipermail/openwrt-devel/2014-July/026639.html
Signed-off-by: Claudio Leite <leitec@staticky.com>
Signed-off-by: Daniel Drown <dan-openwrt@drown.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44618 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/libs/openssl/Makefile')
| -rw-r--r-- | package/libs/openssl/Makefile | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/package/libs/openssl/Makefile b/package/libs/openssl/Makefile index 42165a733c..40f4061a2a 100644 --- a/package/libs/openssl/Makefile +++ b/package/libs/openssl/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openssl PKG_VERSION:=1.0.2 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_USE_MIPS16:=0 PKG_BUILD_PARALLEL:=1 @@ -118,6 +118,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 OPENSSL_TARGET:=linux-generic-openwrt OPENSSL_OPTIONS+=no-perlasm @@ -156,7 +158,7 @@ TARGET_CFLAGS += $(FPIC) define Build/Compile +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ CC="$(TARGET_CC)" \ - ASFLAGS="$(TARGET_ASFLAGS) -c" \ + ASFLAGS="$(TARGET_ASFLAGS) -I$(PKG_BUILD_DIR)/crypto -c" \ AR="$(TARGET_CROSS)ar r" \ RANLIB="$(TARGET_CROSS)ranlib" \ OPENWRT_OPTIMIZATION_FLAGS="$(TARGET_CFLAGS)" \ @@ -164,7 +166,7 @@ define Build/Compile all +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ CC="$(TARGET_CC)" \ - ASFLAGS="$(TARGET_ASFLAGS) -c" \ + ASFLAGS="$(TARGET_ASFLAGS) -I$(PKG_BUILD_DIR)/crypto -c" \ AR="$(TARGET_CROSS)ar r" \ RANLIB="$(TARGET_CROSS)ranlib" \ OPENWRT_OPTIMIZATION_FLAGS="$(TARGET_CFLAGS)" \ |