diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2016-11-12 18:35:04 +0000 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2016-11-26 01:07:03 +0100 |
| commit | 6e431331d18ded23a78e238ed40d03434e7719d9 (patch) | |
| tree | 7f497b52ae16f6a575ffc1e19961e0eed2908fd2 | |
| parent | bc0ea5b276629dcd1169374b8217087db2ded086 (diff) | |
| download | meta-openembedded-contrib-6e431331d18ded23a78e238ed40d03434e7719d9.tar.gz | |
ne10: Update to latest
* Patch to build with clang
* license checksum changed due to Copyright year change
https://github.com/kraj/Ne10/commit/fee112eb2278469e7cfe2516dffa2ecfa5ad4c9a
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta-oe/recipes-support/ne10/ne10/0001-CMakeLists.txt-Remove-mthumb-interwork.patch | 44 | ||||
| -rw-r--r-- | meta-oe/recipes-support/ne10/ne10_1.2.1.bb | 9 |
2 files changed, 50 insertions, 3 deletions
diff --git a/meta-oe/recipes-support/ne10/ne10/0001-CMakeLists.txt-Remove-mthumb-interwork.patch b/meta-oe/recipes-support/ne10/ne10/0001-CMakeLists.txt-Remove-mthumb-interwork.patch new file mode 100644 index 0000000000..9f2faaa529 --- /dev/null +++ b/meta-oe/recipes-support/ne10/ne10/0001-CMakeLists.txt-Remove-mthumb-interwork.patch @@ -0,0 +1,44 @@ +From 8a0d1cbfcc0649b2696c9cf20f877366de259ce3 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 12 Nov 2016 18:15:26 +0000 +Subject: [PATCH] CMakeLists.txt: Remove -mthumb-interwork + +This option is meaningless with aapcs ABI +which is the default for Linux and android +for armv7+ architectures + +As an aside it helps in compiling with clang +where this option is absent + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + CMakeLists.txt | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 784a5a8..68da920 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -117,7 +117,7 @@ if(ANDROID_PLATFORM) + + # Adding cflags for armv7. Aarch64 does not need such flags. + if(${NE10_TARGET_ARCH} STREQUAL "armv7") +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mthumb-interwork -mthumb -march=armv7-a -mfloat-abi=${FLOAT_ABI} -mfpu=vfp3") ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mthumb -march=armv7-a -mfloat-abi=${FLOAT_ABI} -mfpu=vfp3") + if(NE10_ARM_HARD_FLOAT) + # "--no-warn-mismatch" is needed for linker to suppress linker error about not all functions use VFP register to pass argument, eg. + # .../arm-linux-androideabi/bin/ld: error: ..../test-float.o +@@ -138,8 +138,8 @@ if(ANDROID_PLATFORM) + ${CMAKE_C_FLAGS}") + elseif(GNULINUX_PLATFORM) + 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_ASM_FLAGS "${CMAKE_C_FLAGS} -mthumb-interwork -mthumb -march=armv7-a -mfpu=neon") ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mthumb -march=armv7-a -mfpu=vfp3 -funsafe-math-optimizations") ++ set(CMAKE_ASM_FLAGS "${CMAKE_C_FLAGS} -mthumb -march=armv7-a -mfpu=neon") + # Turn on asm optimization for Linux on ARM v7. + set(NE10_ASM_OPTIMIZATION on) + endif() +-- +1.8.3.1 + diff --git a/meta-oe/recipes-support/ne10/ne10_1.2.1.bb b/meta-oe/recipes-support/ne10/ne10_1.2.1.bb index de979821ca..2fb9d64f59 100644 --- a/meta-oe/recipes-support/ne10/ne10_1.2.1.bb +++ b/meta-oe/recipes-support/ne10/ne10_1.2.1.bb @@ -1,13 +1,16 @@ DESCRIPTION = "Library containing NEON-optimized implementations for a common set of functions" HOMEPAGE = "http://projectne10.github.io/Ne10/" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=463ac0a7d64edc2b787c4206635ca2b1" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e7fe20c9be97be5579e3ab5d92d3a218" SECTION = "libs" -SRC_URI = "git://github.com/projectNe10/Ne10.git" -SRCREV = "a08b29d88e3c94d32b5b8f827e7fcf0bc2b34ac2" +SRC_URI = "git://github.com/projectNe10/Ne10.git \ + file://0001-CMakeLists.txt-Remove-mthumb-interwork.patch \ +" +SRCREV = "18c4c982a595dad069cd8df4932aefb1d257591f" S = "${WORKDIR}/git" +PV .= "gitr+${SRCPV}" inherit cmake |