diff options
author | Khem Raj <raj.khem@gmail.com> | 2017-10-02 09:06:53 -0700 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-10-04 14:53:37 +0000 |
commit | c296fb707ae3252b4bf2ffa3bf647a9249f126c4 (patch) | |
tree | 1f407d9419dce0d79de9e73b9369189118ccc032 | |
parent | 1ca33a5677d8452c568130989fdd29191453c61d (diff) | |
download | meta-openembedded-c296fb707ae3252b4bf2ffa3bf647a9249f126c4.tar.gz |
klibc: Pass Optimization with KLIBCOPTFLAGS
Overriding KLIBCOPTFLAGS also meant that -Ox flags
were taken off. Which results in errors like
| usr/dash/shell.h: In function 'max_int_length':
| usr/dash/shell.h:103:25: error: '-mgeneral-regs-only' is incompatible with floating-point code
| return (bytes * 8 - 1) * 0.30102999566398119521 + 14;
| ~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~
| usr/dash/shell.h:103:25: error: '-mgeneral-regs-only' is incompatible with floating-point argument
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r-- | meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-arm-Do-not-set-a-fallback-march-and-mtune.patch | 33 | ||||
-rw-r--r-- | meta-initramfs/recipes-devtools/klibc/klibc.inc | 4 |
2 files changed, 36 insertions, 1 deletions
diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-arm-Do-not-set-a-fallback-march-and-mtune.patch b/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-arm-Do-not-set-a-fallback-march-and-mtune.patch new file mode 100644 index 000000000..9c0ea6397 --- /dev/null +++ b/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-arm-Do-not-set-a-fallback-march-and-mtune.patch | |||
@@ -0,0 +1,33 @@ | |||
1 | From a46a144ac883898d9cedf7a0b13aec6d10116125 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 29 Sep 2017 23:11:53 -0700 | ||
4 | Subject: [PATCH] arm: Do not set a fallback march and mtune | ||
5 | |||
6 | In OE we pass the options explicitly, there is | ||
7 | no need to set it inside the makefiles, we will | ||
8 | need to compute values for CPU_ARCH and CPU_TUNE | ||
9 | which is a bit harder in OE | ||
10 | |||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
12 | --- | ||
13 | Upstream-Status: Pending | ||
14 | |||
15 | usr/klibc/arch/arm/MCONFIG | 2 +- | ||
16 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
17 | |||
18 | diff --git a/usr/klibc/arch/arm/MCONFIG b/usr/klibc/arch/arm/MCONFIG | ||
19 | index 53bc1dc3..857e2f2d 100644 | ||
20 | --- a/usr/klibc/arch/arm/MCONFIG | ||
21 | +++ b/usr/klibc/arch/arm/MCONFIG | ||
22 | @@ -10,7 +10,7 @@ | ||
23 | CPU_ARCH ?= armv4 | ||
24 | CPU_TUNE ?= strongarm | ||
25 | |||
26 | -KLIBCOPTFLAGS += -Os -march=$(CPU_ARCH) -mtune=$(CPU_TUNE) | ||
27 | +KLIBCOPTFLAGS += -Os | ||
28 | KLIBCBITSIZE = 32 | ||
29 | KLIBCREQFLAGS += -fno-exceptions | ||
30 | KLIBCSTRIPFLAGS += -R .ARM.exidx | ||
31 | -- | ||
32 | 2.14.2 | ||
33 | |||
diff --git a/meta-initramfs/recipes-devtools/klibc/klibc.inc b/meta-initramfs/recipes-devtools/klibc/klibc.inc index dec3d3704..30294b19a 100644 --- a/meta-initramfs/recipes-devtools/klibc/klibc.inc +++ b/meta-initramfs/recipes-devtools/klibc/klibc.inc | |||
@@ -19,6 +19,7 @@ SRC_URI = "git://git.kernel.org/pub/scm/libs/klibc/klibc.git \ | |||
19 | file://0001-always-use-bfd-linker.patch \ | 19 | file://0001-always-use-bfd-linker.patch \ |
20 | file://0001-Kbuild.klibc-Use-print-libgcc-file-name-instead-of-p.patch \ | 20 | file://0001-Kbuild.klibc-Use-print-libgcc-file-name-instead-of-p.patch \ |
21 | file://0001-Kbuild.klibc-Add-path-to-compiler-headers-via-isyste.patch \ | 21 | file://0001-Kbuild.klibc-Add-path-to-compiler-headers-via-isyste.patch \ |
22 | file://0001-arm-Do-not-set-a-fallback-march-and-mtune.patch \ | ||
22 | " | 23 | " |
23 | 24 | ||
24 | ARMPATCHES ?= "" | 25 | ARMPATCHES ?= "" |
@@ -40,7 +41,8 @@ EXTRA_OEMAKE = "'KLIBCARCH=${KLIBC_ARCH}' \ | |||
40 | 'INSTALLDIR=${libdir}/klibc' \ | 41 | 'INSTALLDIR=${libdir}/klibc' \ |
41 | 'SHLIBDIR=${libdir}' \ | 42 | 'SHLIBDIR=${libdir}' \ |
42 | '${KLIBCTHUMB}' \ | 43 | '${KLIBCTHUMB}' \ |
43 | 'KLIBCOPTFLAGS=${TUNE_CCARGS}' \ | 44 | 'KLIBCOPTFLAGS=${TUNE_CCARGS} -Os' \ |
45 | V=1 \ | ||
44 | " | 46 | " |
45 | 47 | ||
46 | export FIX_ARMV4_EABI_BX = "${FIX_V4BX}" | 48 | export FIX_ARMV4_EABI_BX = "${FIX_V4BX}" |