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-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 @@ | |||
| 1 | From 8a0d1cbfcc0649b2696c9cf20f877366de259ce3 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Sat, 12 Nov 2016 18:15:26 +0000 | ||
| 4 | Subject: [PATCH] CMakeLists.txt: Remove -mthumb-interwork | ||
| 5 | |||
| 6 | This option is meaningless with aapcs ABI | ||
| 7 | which is the default for Linux and android | ||
| 8 | for armv7+ architectures | ||
| 9 | |||
| 10 | As an aside it helps in compiling with clang | ||
| 11 | where this option is absent | ||
| 12 | |||
| 13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 14 | --- | ||
| 15 | CMakeLists.txt | 6 +++--- | ||
| 16 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
| 17 | |||
| 18 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| 19 | index 784a5a8..68da920 100644 | ||
| 20 | --- a/CMakeLists.txt | ||
| 21 | +++ b/CMakeLists.txt | ||
| 22 | @@ -117,7 +117,7 @@ if(ANDROID_PLATFORM) | ||
| 23 | |||
| 24 | # Adding cflags for armv7. Aarch64 does not need such flags. | ||
| 25 | if(${NE10_TARGET_ARCH} STREQUAL "armv7") | ||
| 26 | - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mthumb-interwork -mthumb -march=armv7-a -mfloat-abi=${FLOAT_ABI} -mfpu=vfp3") | ||
| 27 | + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mthumb -march=armv7-a -mfloat-abi=${FLOAT_ABI} -mfpu=vfp3") | ||
| 28 | if(NE10_ARM_HARD_FLOAT) | ||
| 29 | # "--no-warn-mismatch" is needed for linker to suppress linker error about not all functions use VFP register to pass argument, eg. | ||
| 30 | # .../arm-linux-androideabi/bin/ld: error: ..../test-float.o | ||
| 31 | @@ -138,8 +138,8 @@ if(ANDROID_PLATFORM) | ||
| 32 | ${CMAKE_C_FLAGS}") | ||
| 33 | elseif(GNULINUX_PLATFORM) | ||
| 34 | if("${NE10_TARGET_ARCH}" STREQUAL "armv7") | ||
| 35 | - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mthumb-interwork -mthumb -march=armv7-a -mfpu=vfp3 -funsafe-math-optimizations") | ||
| 36 | - set(CMAKE_ASM_FLAGS "${CMAKE_C_FLAGS} -mthumb-interwork -mthumb -march=armv7-a -mfpu=neon") | ||
| 37 | + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mthumb -march=armv7-a -mfpu=vfp3 -funsafe-math-optimizations") | ||
| 38 | + set(CMAKE_ASM_FLAGS "${CMAKE_C_FLAGS} -mthumb -march=armv7-a -mfpu=neon") | ||
| 39 | # Turn on asm optimization for Linux on ARM v7. | ||
| 40 | set(NE10_ASM_OPTIMIZATION on) | ||
| 41 | endif() | ||
| 42 | -- | ||
| 43 | 1.8.3.1 | ||
| 44 | |||
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 @@ | |||
| 1 | DESCRIPTION = "Library containing NEON-optimized implementations for a common set of functions" | 1 | DESCRIPTION = "Library containing NEON-optimized implementations for a common set of functions" |
| 2 | HOMEPAGE = "http://projectne10.github.io/Ne10/" | 2 | HOMEPAGE = "http://projectne10.github.io/Ne10/" |
| 3 | LICENSE = "BSD-3-Clause" | 3 | LICENSE = "BSD-3-Clause" |
| 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=463ac0a7d64edc2b787c4206635ca2b1" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=e7fe20c9be97be5579e3ab5d92d3a218" |
| 5 | SECTION = "libs" | 5 | SECTION = "libs" |
| 6 | 6 | ||
| 7 | SRC_URI = "git://github.com/projectNe10/Ne10.git" | 7 | SRC_URI = "git://github.com/projectNe10/Ne10.git \ |
| 8 | SRCREV = "a08b29d88e3c94d32b5b8f827e7fcf0bc2b34ac2" | 8 | file://0001-CMakeLists.txt-Remove-mthumb-interwork.patch \ |
| 9 | " | ||
| 10 | SRCREV = "18c4c982a595dad069cd8df4932aefb1d257591f" | ||
| 9 | 11 | ||
| 10 | S = "${WORKDIR}/git" | 12 | S = "${WORKDIR}/git" |
| 13 | PV .= "gitr+${SRCPV}" | ||
| 11 | 14 | ||
| 12 | inherit cmake | 15 | inherit cmake |
| 13 | 16 | ||
