Changeset 44618


Ignore:
Timestamp:
2015-03-06T08:57:10+01:00 (3 years ago)
Author:
blogic
Message:

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@…>
Signed-off-by: Daniel Drown <dan-openwrt@…>

Location:
trunk/package/libs/openssl
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/libs/openssl/Makefile

    r44364 r44618  
    1010PKG_NAME:=openssl 
    1111PKG_VERSION:=1.0.2 
    12 PKG_RELEASE:=2 
     12PKG_RELEASE:=3 
    1313PKG_USE_MIPS16:=0 
    1414 
     
    119119  ifeq ($(CONFIG_mips)$(CONFIG_mipsel),y) 
    120120    OPENSSL_TARGET:=linux-mips-openwrt 
     121  else ifeq ($(CONFIG_arm)$(CONFIG_armeb),y) 
     122    OPENSSL_TARGET:=linux-armv4-openwrt 
    121123  else 
    122124    OPENSSL_TARGET:=linux-generic-openwrt 
     
    157159        +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ 
    158160                CC="$(TARGET_CC)" \ 
    159                 ASFLAGS="$(TARGET_ASFLAGS) -c" \ 
     161                ASFLAGS="$(TARGET_ASFLAGS) -I$(PKG_BUILD_DIR)/crypto -c" \ 
    160162                AR="$(TARGET_CROSS)ar r" \ 
    161163                RANLIB="$(TARGET_CROSS)ranlib" \ 
     
    165167        +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ 
    166168                CC="$(TARGET_CC)" \ 
    167                 ASFLAGS="$(TARGET_ASFLAGS) -c" \ 
     169                ASFLAGS="$(TARGET_ASFLAGS) -I$(PKG_BUILD_DIR)/crypto -c" \ 
    168170                AR="$(TARGET_CROSS)ar r" \ 
    169171                RANLIB="$(TARGET_CROSS)ranlib" \ 
  • trunk/package/libs/openssl/patches/110-optimize-for-size.patch

    r44332 r44618  
    11--- a/Configure 
    22+++ b/Configure 
    3 @@ -443,6 +443,11 @@ my %table=( 
     3@@ -443,6 +443,12 @@ my %table=( 
    44 "linux-alpha-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}", 
    55 "linux-alpha+bwx-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}", 
    66  
    77+# OpenWrt targets 
     8+"linux-armv4-openwrt","gcc:-DTERMIOS \$(OPENWRT_OPTIMIZATION_FLAGS) -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${armv4_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 
    89+"linux-x86_64-openwrt",        "gcc:-m64 -DL_ENDIAN -DTERMIOS \$(OPENWRT_OPTIMIZATION_FLAGS) -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64", 
    910+"linux-mips-openwrt","gcc:-DTERMIOS \$(OPENWRT_OPTIMIZATION_FLAGS) -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${mips32_asm}:o32:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 
Note: See TracChangeset for help on using the changeset viewer.