Misc fixes

PATCH In review Khem Raj 1 participant 5 messages Jul 20, 2016

lore

Share & tools

lore

Khem Raj

author

2016-07-20 19:38 UTC #0 lore raw

cover Misc fixes

General fixes for gcc and webkitgtk found on musl/clang Update glibc to latest on master

Khem Raj (3):
glibc: Update to 2.24 after hard-freeze
webkitgtk: Do not use gold with clang
gcc: Fix libgcc unresolved symbols with PIE on musl

 .../glibc/cross-localedef-native_2.24.bb           |  2 +-
 meta/recipes-core/glibc/glibc/elf-meta.patch       | 32 --------
 meta/recipes-core/glibc/glibc_2.24.bb              |  3 +-
 meta/recipes-devtools/gcc/gcc-6.1.inc              |  1 +
 ...e-alias-for-__cpu_indicator_init-instead-.patch | 85 ++++++++++++++++++++++
 meta/recipes-sato/webkit/webkitgtk_2.12.3.bb       |  2 +
 6 files changed, 90 insertions(+), 35 deletions(-)
 delete mode 100644 meta/recipes-core/glibc/glibc/elf-meta.patch
 create mode 100644 meta/recipes-devtools/gcc/gcc-6.1/0047-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch

Signature · 1 line

2.9.0

Khem Raj

author

2016-07-20 19:38 UTC #1 lore raw

PATCH 1/3 glibc: Update to 2.24 after hard-freeze

Drop upstreamed patch

Signed-off-by Khem Raj <[email protected]>

---
 .../glibc/cross-localedef-native_2.24.bb           |  2 +-
 meta/recipes-core/glibc/glibc/elf-meta.patch       | 32 ----------------------
 meta/recipes-core/glibc/glibc_2.24.bb              |  3 +-
 3 files changed, 2 insertions(+), 35 deletions(-)
 delete mode 100644 meta/recipes-core/glibc/glibc/elf-meta.patch

meta/recipes-core/glibc/cross-localedef-native_2.24.bb +1 -1

index 104e38b..650c6c3 100644
@@ -22,7 +22,7 @@ GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git"
 SRCBRANCH ?= "master"
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.\d+(\.\d+)*)"
 
-SRCREV_glibc ?= "d461c9682d4954076f9ee9e07be903c2eef8e73b"
+SRCREV_glibc ?= "d957c4d3fa48d685ff2726c605c988127ef99395"
 SRCREV_localedef ?= "29869b6dc11427c5bab839bdb155c85a7c644c71"
 
 SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \

meta/recipes-core/glibc/glibc/elf-meta.patch deleted +0 ~~-32~~

deleted file mode 100644
index fab66d7..0000000
@@ -1,32 +0,0 @@
-Upstream-Status: Pending
-Signed-off-by: Ross Burton <[email protected]>
-
-From a495656665cd4a4f97744741a4741eafa621d65b Mon Sep 17 00:00:00 2001
-From: Ross Burton <[email protected]>
-Date: Mon, 11 Jul 2016 16:57:38 +0100
-Subject: [PATCH] elf.h: add relocations for Imagination META
-
-Adding EM_METAG but not the relocations means the kernel doesn't compile as it
-guards its own declarations on the presence of EM_METAG.
----
- elf/elf.h | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/elf/elf.h b/elf/elf.h
-index b6112d9..69e85a7 100644
---- a/elf/elf.h
-+++ b/elf/elf.h
-@@ -3677,6 +3677,10 @@ enum
- 
- #define R_TILEGX_NUM		130
- 
-+/* Imagination META relocs */
-+#define R_METAG_ADDR32		2
-+#define R_METAG_NONE		3
-+
- /* BPF specific declarations.  */
- 
- #define R_BPF_NONE		0	/* No reloc */
--- 
-2.8.1
-

meta/recipes-core/glibc/glibc_2.24.bb +1 -2

index 4bc6443..f023272 100644
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSES;md5=e9a558e243b36d3209f380deb394b213 \
 
 DEPENDS += "gperf-native"
 
-SRCREV ?= "d461c9682d4954076f9ee9e07be903c2eef8e73b"
+SRCREV ?= "d957c4d3fa48d685ff2726c605c988127ef99395"
 
 #SRCBRANCH ?= "release/${PV}/master"
 SRCBRANCH ?= "master"

@@ -37,7 +37,6 @@ SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
            file://0023-eglibc-Install-PIC-archives.patch \
            file://0024-eglibc-Forward-port-cross-locale-generation-support.patch \
            file://0025-Define-DUMMY_LOCALE_T-if-not-defined.patch \
-           file://elf-meta.patch \
 "
 
 SRC_URI += "\

Signature · 1 line

2.9.0

Khem Raj

author

2016-07-20 19:38 UTC #2 lore raw

PATCH 2/3 webkitgtk: Do not use gold with clang

clang cross compiler fails to detect gold linker from cross-binutils, instead it defaults to ld.gold from build host, lets disable using gold when clang is active to avoid this issue

Signed-off-by Khem Raj <[email protected]>

---
 meta/recipes-sato/webkit/webkitgtk_2.12.3.bb | 2 ++
 1 file changed, 2 insertions(+)

meta/recipes-sato/webkit/webkitgtk_2.12.3.bb +2 -0

index 28517c4..2e5a1e4 100644
@@ -79,6 +79,8 @@ EXTRA_OECMAKE_append_armv7a = " -DENABLE_JIT=OFF "
 # binutils 2.25.1 has a bug on aarch64:
 # https://sourceware.org/bugzilla/show_bug.cgi?id=18430
 EXTRA_OECMAKE_append_aarch64 = " -DUSE_LD_GOLD=OFF "
+EXTRA_OECMAKE_append_toolchain-clang = " -DUSE_LD_GOLD=OFF "
+EXTRA_OECMAKE_append_toolchain-clang = " -DUSE_LD_GOLD=OFF "
 
 # JIT not supported on MIPS either
 EXTRA_OECMAKE_append_mips = " -DENABLE_JIT=OFF "

Signature · 1 line

2.9.0

Khem Raj

author

2016-07-20 19:41 UTC #3 lore raw

Re: [PATCH 2/3] webkitgtk: Do not use gold with clang

Quoted 21 lines · Khem Raj

clang cross compiler fails to detect gold linker from cross-binutils, instead it defaults to ld.gold from build host, lets disable using gold when clang is active to avoid this issue
Signed-off-by Khem Raj <[email protected]>
---
meta/recipes-sato/webkit/webkitgtk_2.12.3.bb | 2 ++
1 file changed, 2 insertions(+)
meta/recipes-sato/webkit/webkitgtk_2.12.3.bb +0 -0
index 28517c4..2e5a1e4 100644
@@ -79,6 +79,8 @@ EXTRA_OECMAKE_append_armv7a = " -DENABLE_JIT=OFF "
 # binutils 2.25.1 has a bug on aarch64:
 # https://sourceware.org/bugzilla/show_bug.cgi?id=18430
EXTRA_OECMAKE_append_aarch64 = " -DUSE_LD_GOLD=OFF "

meta/recipes-sato/webkit/webkitgtk_2.12.3.bb

Quoted 2 lines

meta/recipes-sato/webkit/webkitgtk_2.12.3.bb +2 -0

+EXTRA_OECMAKE_append_toolchain-clang = " -DUSE_LD_GOLD=OFF "
+EXTRA_OECMAKE_append_toolchain-clang = " -DUSE_LD_GOLD=OFF “

redundant line. It has been fixed in pull tree.

Quoted 6 lines

# JIT not supported on MIPS either EXTRA_OECMAKE_append_mips = " -DENABLE_JIT=OFF " --
2.9.0

Khem Raj

author

2016-07-20 19:38 UTC #4 lore raw

PATCH 3/3 gcc: Fix libgcc unresolved symbols with PIE on musl

In reply to Khem Raj

Fixes

[YOCTO #9772]

Signed-off-by Khem Raj <[email protected]>

---
 meta/recipes-devtools/gcc/gcc-6.1.inc              |  1 +
 ...e-alias-for-__cpu_indicator_init-instead-.patch | 85 ++++++++++++++++++++++
 2 files changed, 86 insertions(+)
 create mode 100644 meta/recipes-devtools/gcc/gcc-6.1/0047-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch

meta/recipes-devtools/gcc/gcc-6.1.inc +1 -0

index afeeff4..0426028 100644
@@ -78,6 +78,7 @@ SRC_URI = "\
            file://0044-gcc-final.c-fdebug-prefix-map-support-to-remap-sourc.patch \
            file://0045-libgcc-Add-knob-to-use-ldbl-128-on-ppc.patch \
            file://0046-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch \
+           file://0047-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch \
            ${BACKPORTS} \
            file://CVE-2016-4490.patch \
 "

meta/recipes-devtools/gcc/gcc-6.1/0047-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch new file +85 -0

85 lines not on this page · raw message

Signature · 1 line

2.9.0