diff options
-rw-r--r-- | meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-klibc-Kbuild-Accept-EXTRA_KLIBCAFLAGS.patch | 28 | ||||
-rw-r--r-- | meta-initramfs/recipes-devtools/klibc/klibc.inc | 9 |
2 files changed, 33 insertions, 4 deletions
diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-klibc-Kbuild-Accept-EXTRA_KLIBCAFLAGS.patch b/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-klibc-Kbuild-Accept-EXTRA_KLIBCAFLAGS.patch new file mode 100644 index 000000000..94818e366 --- /dev/null +++ b/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-klibc-Kbuild-Accept-EXTRA_KLIBCAFLAGS.patch | |||
@@ -0,0 +1,28 @@ | |||
1 | From cdc6edc2cfcd0ce88d6e66654d605dad303b1a75 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 11 Sep 2018 17:03:36 -0700 | ||
4 | Subject: [PATCH] klibc/Kbuild: Accept EXTRA_KLIBCAFLAGS | ||
5 | |||
6 | For passing additional assembler flags | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | |||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
11 | --- | ||
12 | usr/klibc/Kbuild | 3 ++- | ||
13 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/usr/klibc/Kbuild b/usr/klibc/Kbuild | ||
16 | index 98caf2e9..b34521e0 100644 | ||
17 | --- a/usr/klibc/Kbuild | ||
18 | +++ b/usr/klibc/Kbuild | ||
19 | @@ -168,7 +168,8 @@ $(SOHASH): $(SOLIB) $(SOLIB).hash | ||
20 | targets += interp.o | ||
21 | |||
22 | quiet_cmd_interp = BUILD $@ | ||
23 | - cmd_interp = $(KLIBCCC) $(klibccflags) -D__ASSEMBLY__ \ | ||
24 | + cmd_interp = $(KLIBCCC) $(klibccflags) $(EXTRA_KLIBCAFLAGS) \ | ||
25 | + -D__ASSEMBLY__ \ | ||
26 | -DLIBDIR=\"$(SHLIBDIR)\" \ | ||
27 | -DSOHASH=\"$(SOLIBHASH)\" \ | ||
28 | -c -o $@ $< | ||
diff --git a/meta-initramfs/recipes-devtools/klibc/klibc.inc b/meta-initramfs/recipes-devtools/klibc/klibc.inc index f0b20bc7f..3d25e96cd 100644 --- a/meta-initramfs/recipes-devtools/klibc/klibc.inc +++ b/meta-initramfs/recipes-devtools/klibc/klibc.inc | |||
@@ -21,9 +21,10 @@ SRC_URI = "git://git.kernel.org/pub/scm/libs/klibc/klibc.git \ | |||
21 | file://0001-Kbuild.klibc-Use-print-libgcc-file-name-instead-of-p.patch \ | 21 | file://0001-Kbuild.klibc-Use-print-libgcc-file-name-instead-of-p.patch \ |
22 | file://0001-Kbuild.klibc-Add-path-to-compiler-headers-via-isyste.patch \ | 22 | file://0001-Kbuild.klibc-Add-path-to-compiler-headers-via-isyste.patch \ |
23 | file://0001-arm-Do-not-set-a-fallback-march-and-mtune.patch \ | 23 | file://0001-arm-Do-not-set-a-fallback-march-and-mtune.patch \ |
24 | file://0001-klibc_2.0.4-add-kexec_file_load-syscall.patch \ | 24 | file://0001-klibc_2.0.4-add-kexec_file_load-syscall.patch \ |
25 | file://0001-klibc-add-getrandom-syscall.patch \ | 25 | file://0001-klibc-add-getrandom-syscall.patch \ |
26 | " | 26 | file://0001-klibc-Kbuild-Accept-EXTRA_KLIBCAFLAGS.patch \ |
27 | " | ||
27 | 28 | ||
28 | ARMPATCHES ?= "" | 29 | ARMPATCHES ?= "" |
29 | 30 | ||
@@ -31,7 +32,6 @@ ARMPATCHES_arm = "file://klibc-config-eabi.patch \ | |||
31 | file://armv4-fix-v4bx.patch \ | 32 | file://armv4-fix-v4bx.patch \ |
32 | " | 33 | " |
33 | 34 | ||
34 | |||
35 | S = "${WORKDIR}/git" | 35 | S = "${WORKDIR}/git" |
36 | 36 | ||
37 | PARALLEL_MAKE = "" | 37 | PARALLEL_MAKE = "" |
@@ -44,9 +44,10 @@ EXTRA_OEMAKE = "'KLIBCARCH=${KLIBC_ARCH}' \ | |||
44 | 'INSTALLDIR=${libdir}/klibc' \ | 44 | 'INSTALLDIR=${libdir}/klibc' \ |
45 | 'SHLIBDIR=${libdir}' \ | 45 | 'SHLIBDIR=${libdir}' \ |
46 | '${KLIBCTHUMB}' \ | 46 | '${KLIBCTHUMB}' \ |
47 | 'KLIBCOPTFLAGS=${TUNE_CCARGS} -Os' \ | 47 | 'KLIBCOPTFLAGS=${TUNE_CCARGS}' \ |
48 | V=1 \ | 48 | V=1 \ |
49 | " | 49 | " |
50 | EXTRA_OEMAKE += 'EXTRA_KLIBCAFLAGS="-Wa,--noexecstack" EXTRA_KLIBCLDFLAGS="-z noexecstack"' | ||
50 | 51 | ||
51 | export FIX_ARMV4_EABI_BX = "${FIX_V4BX}" | 52 | export FIX_ARMV4_EABI_BX = "${FIX_V4BX}" |
52 | KLIBCTHUMB = "${@['CONFIG_KLIBC_THUMB=n', 'CONFIG_KLIBC_THUMB=y'][(d.getVar('ARM_INSTRUCTION_SET') == 'thumb')]}" | 53 | KLIBCTHUMB = "${@['CONFIG_KLIBC_THUMB=n', 'CONFIG_KLIBC_THUMB=y'][(d.getVar('ARM_INSTRUCTION_SET') == 'thumb')]}" |