ne10: bump to v1.2.1

Signed-off-by: Cody Guldner <cody.guldner@rockwellcollins.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>

diff --git a/package/ne10/0001-CMakeLists-don-t-hard-code-thumb-code-generation.patch b/package/ne10/0001-CMakeLists-don-t-hard-code-thumb-code-generation.patch
index f140a604416f17f1e2e6ed4ec88e57184cc58bd5..0aa6fd2ba123eb69f72ca513ff2fe5ffce16ef0c 100644 (file)
--- a/package/ne10/0001-CMakeLists-don-t-hard-code-thumb-code-generation.patch
+++ b/package/ne10/0001-CMakeLists-don-t-hard-code-thumb-code-generation.patch
@@ -1,29 +1,30 @@
-From 9ff39800cec5f1dabba246b253794582d611bc6d Mon Sep 17 00:00:00 2001
-From: Baruch Siach <baruch@tkos.co.il>
-Date: Fri, 20 Feb 2015 10:44:15 -0600
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Cody Guldner <cody.guldner@rockwellcollins.com>
+Date: Tue, 14 Apr 2020 09:12:01 -0500
 Subject: [PATCH] CMakeLists: don't hard code thumb code generation
 
-Migrating to version 1.2.0
+Migrating to version 1.2.1
 
 Signed-off-by: Baruch Siach <baruch@tkos.co.il>
 Signed-off-by: Clayton Shotwell <clayton.shotwell@rockwellcollins.com>
+Signed-off-by: Cody Guldner <cody.guldner@rockwellcollins.com>
 ---
  CMakeLists.txt | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fdf01ec..34ae26e 100644
+index fc2a5e3..25da215 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -84,7 +84,7 @@ if(ANDROID_PLATFORM)
-     ${ANDROID_TOOLCHAIN_PATH}/arm-linux-androideabi-ar
-     ${ANDROID_TOOLCHAIN_PATH}/arm-linux-androideabi-ranlib")
+@@ -135,7 +135,7 @@ if(ANDROID_PLATFORM)
+     ${CMAKE_C_FLAGS}")
  elseif(GNULINUX_PLATFORM)
--    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mthumb-interwork -mthumb -march=armv7-a -mfpu=vfp3")
-+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mthumb-interwork -march=armv7-a -mfpu=vfp3")
-     set(CMAKE_ASM_FLAGS "${CMAKE_C_FLAGS} -mthumb-interwork -mthumb -march=armv7-a -mfpu=neon")
- elseif(IOS_PLATFORM)
-     #set minimal target ios version.If not provided this option, Xcode
+     if(${NE10_TARGET_ARCH} STREQUAL "armv7")
+-      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mthumb-interwork -mthumb -march=armv7-a -mfpu=vfp3 -funsafe-math-optimizations")
++      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mthumb-interwork -march=armv7-a -mfpu=vfp3 -funsafe-math-optimizations")
+       set(CMAKE_ASM_FLAGS "${CMAKE_C_FLAGS} -mthumb-interwork -mthumb -march=armv7-a -mfpu=neon")
+       # Turn on asm optimization for Linux on ARM v7.
+       set(NE10_ASM_OPTIMIZATION on)
 -- 
-1.9.1
+2.23.0
 

diff --git a/package/ne10/Config.in b/package/ne10/Config.in
index 8d375793dbabc9d8632ef1f61cc628f0c3265e5d..68cb7f4cb38954d573653d5eba0f2a194734c8a1 100644 (file)
--- a/package/ne10/Config.in
+++ b/package/ne10/Config.in
@@ -1,17 +1,20 @@
+config BR2_PACKAGE_NE10_ARCH_SUPPORTS
+       bool
+       default y if BR2_aarch64
+       default y if BR2_arm && (BR2_ARM_FPU_NEON || BR2_ARM_FPU_NEON_VFPV4)
+
 config BR2_PACKAGE_NE10
        bool "ne10"
-       depends on BR2_arm
-       depends on BR2_ARM_FPU_NEON || BR2_ARM_FPU_NEON_VFPV4
+       depends on BR2_PACKAGE_NE10_ARCH_SUPPORTS
        help
          The Ne10 project has been set up to provide a set of common,
          useful functions which have been heavily optimized for the
-         ARM Architecture and provide consistent well tested behavior
-         that can be easily incorporated into applications. C
-         interfaces to the functions are provided for both assembler
-         and NEON implementations.
+         ARM and AArch64 Architecture and provide consistent well
+         tested behavior that can be easily incorporated into
+         applications. C interfaces to the functions are provided for
+         both assembler and NEON implementations.
 
          http://projectne10.github.io/Ne10/
 
 comment "ne10 needs a toolchain w/ neon"
-       depends on BR2_arm
-       depends on !(BR2_ARM_FPU_NEON || BR2_ARM_FPU_NEON_VFPV4)
+       depends on !BR2_PACKAGE_NE10_ARCH_SUPPORTS

diff --git a/package/ne10/ne10.hash b/package/ne10/ne10.hash
index 2c56215c1c8463a51f5a04a10f8eacba7e531417..cdb6e013a157d4c1c75b3dbefd0061b96c89f7d4 100644 (file)
--- a/package/ne10/ne10.hash
+++ b/package/ne10/ne10.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  450dac5bb3a2351019ae23792e97c3bf965d16a21c0598b73cea9fbc3b3a56af  ne10-1.2.0.tar.gz
+sha256  dd1a96610c0692cc80154ae123edd5d25e6e0a3f81d0c16a96425f3ef57b9929  ne10-1.2.1.tar.gz
 sha256  eb48041c8e0ad556cf72f2a6eff89c893aa5702bba4e163ca7798cce07e6c55e  doc/LICENSE

diff --git a/package/ne10/ne10.mk b/package/ne10/ne10.mk
index 2af664be39488f0676c5fe08fe091ead0384bfed..58652c0459e577cc5e23188e728cb0efc257559b 100644 (file)
--- a/package/ne10/ne10.mk
+++ b/package/ne10/ne10.mk
@@ -4,13 +4,15 @@
 #
 ################################################################################
 
-NE10_VERSION = 1.2.0
+NE10_VERSION = 1.2.1
 NE10_SITE = $(call github,projectNe10,Ne10,v$(NE10_VERSION))
 NE10_LICENSE = BSD-3-Clause or Apache-2.0
 NE10_LICENSE_FILES = doc/LICENSE
 NE10_INSTALL_STAGING = YES
 
-NE10_CONF_OPTS = -DGNULINUX_PLATFORM=ON
+NE10_CONF_OPTS = \
+       -DGNULINUX_PLATFORM=ON \
+       -DNE10_LINUX_TARGET_ARCH=$(if $(BR2_aarch64),aarch64,armv7)
 
 ifeq ($(BR2_STATIC_LIBS),)
 NE10_CONF_OPTS += \