* [PATCH 00/19] Rework GCC PIE and security flags (take 3)
@ 2017-07-01 14:23 Khem Raj
2017-07-01 14:23 ` [PATCH 01/19] glibc: Upgrade to 2.25.90 Khem Raj
` (18 more replies)
0 siblings, 19 replies; 20+ messages in thread
From: Khem Raj @ 2017-07-01 14:23 UTC (permalink / raw)
To: openembedded-core
* This patchset add a switch to configure gcc driver with PIE defaults
* Add support for generating static PIE in gcc
* Gets rid of lot of bandaids from distro security flags file
* Adjust recipes for new way of specifying pie
v1->v2:
* apply linking spec changes libssp_nonshared.a to musl alone
* icu/iptable/gstreamer1.0-plugins-bad fixes are done on top not really depend on pie rework
v2->v3:
* Add glibc 2.25.90 upgrade patches to this pull request as it has few depending gcc patches with hardening
* Fixes for recipes to build against glibc 2.26
* Add fixes to sysklogd
* Dont compile sysklogd with PIE
The following changes since commit de7914954571ea8e717f56b6d6df13157b0973bc:
scripts/contrib/patchreview: add new script (2017-06-29 13:01:32 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib kraj/hardening-fixes
http://cgit.openembedded.org/openembedded-core-contrib/log/?h=kraj/hardening-fixes
Khem Raj (19):
glibc: Upgrade to 2.25.90
glibc: Drop obsoleted bits/string.h from multilibbing
glibc: Enable obsoleted nsl
gcc: Introduce a knob to configure gcc to default to PIE
security_flags.inc: Delete pinnings for SECURITY_NO_PIE_CFLAGS
distutils,setuptools: Delete use of SECURITY_NO_PIE_CFLAGS
gcc7: Enable static PIE
gcc: Link libssp_nonshared.a only on musl targets
sysklogd: Improve build and fix runtime crash
libunwind: We set -fPIE in security flags now if gcc is not configured
for default PIE
valgrind: Remove -no-pie from cflags
icu: Fix build with glibc 2.26
gstreamer1.0-plugins-bad: Fix missing library with bcm egl
gcc-sanitizer: Fix build with glibc 2.26
gcc: Use ucontext_t instead of ucontext
valgrind: Fix build with glibc 2.26
strace: upgrade to 4.17
qemu: Replace use of struct ucontext with ucontext_t
epiphany: Fix build errors when compiling with security flags
meta/classes/distutils-common-base.bbclass | 2 -
meta/classes/setuptools.bbclass | 2 -
meta/conf/distro/include/security_flags.inc | 85 ++-----
meta/conf/distro/include/tcmode-default.inc | 2 +-
...e_2.25.bb => cross-localedef-native_2.25.90.bb} | 27 ++-
...bc-initial_2.25.bb => glibc-initial_2.25.90.bb} | 0
...libc-locale_2.25.bb => glibc-locale_2.25.90.bb} | 0
...libc-mtrace_2.25.bb => glibc-mtrace_2.25.90.bb} | 0
meta/recipes-core/glibc/glibc-package.inc | 2 +-
...bc-scripts_2.25.bb => glibc-scripts_2.25.90.bb} | 0
...libc-Look-for-host-system-ld.so.cache-as-.patch | 6 +-
...libc-Fix-buffer-overrun-with-a-relocated-.patch | 6 +-
...libc-Raise-the-size-of-arrays-containing-.patch | 34 +--
...ivesdk-glibc-Allow-64-bit-atomics-for-x86.patch | 11 +-
...500-e5500-e6500-603e-fsqrt-implementation.patch | 42 ++--
...-OECORE_KNOWN_INTERPRETER_NAMES-to-known-.patch | 6 +-
...-Fix-undefined-reference-to-__sqrt_finite.patch | 28 +--
...qrt-f-are-now-inline-functions-and-call-o.patch | 28 +--
...bug-1443-which-explains-what-the-patch-do.patch | 8 +-
...n-libm-err-tab.pl-with-specific-dirs-in-S.patch | 6 +-
...qrt-f-are-now-inline-functions-and-call-o.patch | 8 +-
...ersion-output-matching-grok-gold-s-output.patch | 44 ----
...configure.ac-handle-correctly-libc_cv_ro.patch} | 10 +-
...ibute.patch => 0013-Add-unused-attribute.patch} | 8 +-
...hin-the-path-sets-wrong-config-variables.patch} | 30 +--
...timezone-re-written-tzselect-as-posix-sh.patch} | 12 +-
...ove-bash-dependency-for-nscd-init-script.patch} | 11 +-
...-Cross-building-and-testing-instructions.patch} | 10 +-
...18-eglibc-Help-bootstrap-cross-toolchain.patch} | 10 +-
... 0019-eglibc-Clear-cache-lines-on-ppc8xx.patch} | 10 +-
...020-eglibc-Resolve-__fpscr_values-on-SH4.patch} | 10 +-
...atch => 0021-eglibc-Install-PIC-archives.patch} | 20 +-
...ard-port-cross-locale-generation-support.patch} | 36 +--
...023-Define-DUMMY_LOCALE_T-if-not-defined.patch} | 8 +-
...m.patch => 0024-local-dynamic-resolvconf.patch} | 57 +++--
...c-Make-_dl_build_local_scope-breadth-fir.patch} | 8 +-
...locale-fix-hard-coded-reference-to-gcc-E.patch} | 10 +-
.../glibc/{glibc_2.25.bb => glibc_2.25.90.bb} | 37 +--
meta/recipes-devtools/gcc/gcc-7.1.inc | 5 +-
...shared-to-link-commandline-for-musl-targe.patch | 42 ++++
.../gcc/gcc-7.1/0040-ssp_nonshared.patch | 28 ---
.../gcc/gcc-7.1/0048-gcc-Enable-static-PIE.patch | 37 +++
...r-Use-stack_t-instead-of-struct-sigaltsta.patch | 160 +++++++++++++
...0-replace-struct-ucontext-with-ucontext_t.patch | 149 ++++++++++++
meta/recipes-devtools/gcc/gcc-configure-common.inc | 3 +
...lace-struct-ucontext-with-ucontext_t-type.patch | 265 +++++++++++++++++++++
meta/recipes-devtools/qemu/qemu_2.8.1.1.bb | 46 ++--
...8-replace-struct-ucontext-with-ucontext_t.patch | 31 +++
.../strace/strace/Makefile-ptest.patch | 19 +-
.../strace/{strace_4.16.bb => strace_4.17.bb} | 5 +-
...sts-Use-ucontext_t-instead-of-struct-ucon.patch | 30 +++
meta/recipes-devtools/valgrind/valgrind_3.12.0.bb | 3 +-
...s-that-causes-a-segmentation-fault-under-.patch | 28 +++
...way-for-respecting-flags-from-environment.patch | 35 +++
meta/recipes-extended/sysklogd/sysklogd.inc | 6 +-
meta/recipes-gnome/epiphany/epiphany_3.24.2.bb | 6 +-
...bookmarks-Check-for-return-value-of-fread.patch | 32 +++
.../link-with-libvchostif.patch | 35 +++
.../gstreamer/gstreamer1.0-plugins-bad_1.10.4.bb | 1 +
.../icu/icu/0001-i18n-Drop-include-xlocale.h.patch | 31 +++
meta/recipes-support/icu/icu_58.2.bb | 3 +-
meta/recipes-support/libunwind/libunwind_1.2.bb | 4 -
62 files changed, 1209 insertions(+), 429 deletions(-)
rename meta/recipes-core/glibc/{cross-localedef-native_2.25.bb => cross-localedef-native_2.25.90.bb} (61%)
rename meta/recipes-core/glibc/{glibc-initial_2.25.bb => glibc-initial_2.25.90.bb} (100%)
rename meta/recipes-core/glibc/{glibc-locale_2.25.bb => glibc-locale_2.25.90.bb} (100%)
rename meta/recipes-core/glibc/{glibc-mtrace_2.25.bb => glibc-mtrace_2.25.90.bb} (100%)
rename meta/recipes-core/glibc/{glibc-scripts_2.25.bb => glibc-scripts_2.25.90.bb} (100%)
delete mode 100644 meta/recipes-core/glibc/glibc/0012-Make-ld-version-output-matching-grok-gold-s-output.patch
rename meta/recipes-core/glibc/glibc/{0013-sysdeps-gnu-configure.ac-handle-correctly-libc_cv_ro.patch => 0012-sysdeps-gnu-configure.ac-handle-correctly-libc_cv_ro.patch} (82%)
rename meta/recipes-core/glibc/glibc/{0014-Add-unused-attribute.patch => 0013-Add-unused-attribute.patch} (82%)
rename meta/recipes-core/glibc/glibc/{0015-yes-within-the-path-sets-wrong-config-variables.patch => 0014-yes-within-the-path-sets-wrong-config-variables.patch} (94%)
rename meta/recipes-core/glibc/glibc/{0016-timezone-re-written-tzselect-as-posix-sh.patch => 0015-timezone-re-written-tzselect-as-posix-sh.patch} (81%)
rename meta/recipes-core/glibc/glibc/{0017-Remove-bash-dependency-for-nscd-init-script.patch => 0016-Remove-bash-dependency-for-nscd-init-script.patch} (89%)
rename meta/recipes-core/glibc/glibc/{0018-eglibc-Cross-building-and-testing-instructions.patch => 0017-eglibc-Cross-building-and-testing-instructions.patch} (99%)
rename meta/recipes-core/glibc/glibc/{0019-eglibc-Help-bootstrap-cross-toolchain.patch => 0018-eglibc-Help-bootstrap-cross-toolchain.patch} (94%)
rename meta/recipes-core/glibc/glibc/{0021-eglibc-Clear-cache-lines-on-ppc8xx.patch => 0019-eglibc-Clear-cache-lines-on-ppc8xx.patch} (94%)
rename meta/recipes-core/glibc/glibc/{0022-eglibc-Resolve-__fpscr_values-on-SH4.patch => 0020-eglibc-Resolve-__fpscr_values-on-SH4.patch} (88%)
rename meta/recipes-core/glibc/glibc/{0023-eglibc-Install-PIC-archives.patch => 0021-eglibc-Install-PIC-archives.patch} (90%)
rename meta/recipes-core/glibc/glibc/{0024-eglibc-Forward-port-cross-locale-generation-support.patch => 0022-eglibc-Forward-port-cross-locale-generation-support.patch} (96%)
rename meta/recipes-core/glibc/glibc/{0025-Define-DUMMY_LOCALE_T-if-not-defined.patch => 0023-Define-DUMMY_LOCALE_T-if-not-defined.patch} (80%)
rename meta/recipes-core/glibc/glibc/{0020-eglibc-cherry-picked-from.patch => 0024-local-dynamic-resolvconf.patch} (49%)
rename meta/recipes-core/glibc/glibc/{0026-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch => 0025-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch} (89%)
rename meta/recipes-core/glibc/glibc/{0027-locale-fix-hard-coded-reference-to-gcc-E.patch => 0026-locale-fix-hard-coded-reference-to-gcc-E.patch} (82%)
rename meta/recipes-core/glibc/{glibc_2.25.bb => glibc_2.25.90.bb} (80%)
create mode 100644 meta/recipes-devtools/gcc/gcc-7.1/0040-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch
delete mode 100644 meta/recipes-devtools/gcc/gcc-7.1/0040-ssp_nonshared.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-7.1/0048-gcc-Enable-static-PIE.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-7.1/0049-libsanitizer-Use-stack_t-instead-of-struct-sigaltsta.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-7.1/0050-replace-struct-ucontext-with-ucontext_t.patch
create mode 100644 meta/recipes-devtools/qemu/qemu/0001-replace-struct-ucontext-with-ucontext_t-type.patch
create mode 100644 meta/recipes-devtools/strace/strace/0008-replace-struct-ucontext-with-ucontext_t.patch
rename meta/recipes-devtools/strace/{strace_4.16.bb => strace_4.17.bb} (87%)
create mode 100644 meta/recipes-devtools/valgrind/valgrind/0001-memcheck-tests-Use-ucontext_t-instead-of-struct-ucon.patch
create mode 100644 meta/recipes-extended/sysklogd/files/0001-fix-problems-that-causes-a-segmentation-fault-under-.patch
create mode 100644 meta/recipes-extended/sysklogd/files/0002-Make-way-for-respecting-flags-from-environment.patch
create mode 100644 meta/recipes-gnome/epiphany/files/0001-bookmarks-Check-for-return-value-of-fread.patch
create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/link-with-libvchostif.patch
create mode 100644 meta/recipes-support/icu/icu/0001-i18n-Drop-include-xlocale.h.patch
--
2.13.2
^ permalink raw reply [flat|nested] 20+ messages in thread* [PATCH 01/19] glibc: Upgrade to 2.25.90 2017-07-01 14:23 [PATCH 00/19] Rework GCC PIE and security flags (take 3) Khem Raj @ 2017-07-01 14:23 ` Khem Raj 2017-07-01 14:23 ` [PATCH 02/19] glibc: Drop obsoleted bits/string.h from multilibbing Khem Raj ` (17 subsequent siblings) 18 siblings, 0 replies; 20+ messages in thread From: Khem Raj @ 2017-07-01 14:23 UTC (permalink / raw) To: openembedded-core Eventually it will be released as 2.26 final Signed-off-by: Khem Raj <raj.khem@gmail.com> --- meta/conf/distro/include/tcmode-default.inc | 2 +- ...e_2.25.bb => cross-localedef-native_2.25.90.bb} | 27 +++++----- ...bc-initial_2.25.bb => glibc-initial_2.25.90.bb} | 0 ...libc-locale_2.25.bb => glibc-locale_2.25.90.bb} | 0 ...libc-mtrace_2.25.bb => glibc-mtrace_2.25.90.bb} | 0 ...bc-scripts_2.25.bb => glibc-scripts_2.25.90.bb} | 0 ...libc-Look-for-host-system-ld.so.cache-as-.patch | 6 +-- ...libc-Fix-buffer-overrun-with-a-relocated-.patch | 6 +-- ...libc-Raise-the-size-of-arrays-containing-.patch | 34 ++++++------- ...ivesdk-glibc-Allow-64-bit-atomics-for-x86.patch | 11 +++-- ...500-e5500-e6500-603e-fsqrt-implementation.patch | 42 ++++++++-------- ...-OECORE_KNOWN_INTERPRETER_NAMES-to-known-.patch | 6 +-- ...-Fix-undefined-reference-to-__sqrt_finite.patch | 28 +++++------ ...qrt-f-are-now-inline-functions-and-call-o.patch | 28 +++++------ ...bug-1443-which-explains-what-the-patch-do.patch | 8 +-- ...n-libm-err-tab.pl-with-specific-dirs-in-S.patch | 6 +-- ...qrt-f-are-now-inline-functions-and-call-o.patch | 8 +-- ...ersion-output-matching-grok-gold-s-output.patch | 44 ----------------- ...configure.ac-handle-correctly-libc_cv_ro.patch} | 10 ++-- ...ibute.patch => 0013-Add-unused-attribute.patch} | 8 +-- ...hin-the-path-sets-wrong-config-variables.patch} | 30 ++++++------ ...timezone-re-written-tzselect-as-posix-sh.patch} | 12 ++--- ...ove-bash-dependency-for-nscd-init-script.patch} | 11 +++-- ...-Cross-building-and-testing-instructions.patch} | 10 ++-- ...18-eglibc-Help-bootstrap-cross-toolchain.patch} | 10 ++-- ... 0019-eglibc-Clear-cache-lines-on-ppc8xx.patch} | 10 ++-- ...020-eglibc-Resolve-__fpscr_values-on-SH4.patch} | 10 ++-- ...atch => 0021-eglibc-Install-PIC-archives.patch} | 20 ++++---- ...ard-port-cross-locale-generation-support.patch} | 36 +++++++------- ...023-Define-DUMMY_LOCALE_T-if-not-defined.patch} | 8 +-- ...m.patch => 0024-local-dynamic-resolvconf.patch} | 57 ++++++++++++---------- ...c-Make-_dl_build_local_scope-breadth-fir.patch} | 8 +-- ...locale-fix-hard-coded-reference-to-gcc-E.patch} | 10 ++-- .../glibc/{glibc_2.25.bb => glibc_2.25.90.bb} | 36 +++++++------- 34 files changed, 253 insertions(+), 289 deletions(-) rename meta/recipes-core/glibc/{cross-localedef-native_2.25.bb => cross-localedef-native_2.25.90.bb} (61%) rename meta/recipes-core/glibc/{glibc-initial_2.25.bb => glibc-initial_2.25.90.bb} (100%) rename meta/recipes-core/glibc/{glibc-locale_2.25.bb => glibc-locale_2.25.90.bb} (100%) rename meta/recipes-core/glibc/{glibc-mtrace_2.25.bb => glibc-mtrace_2.25.90.bb} (100%) rename meta/recipes-core/glibc/{glibc-scripts_2.25.bb => glibc-scripts_2.25.90.bb} (100%) delete mode 100644 meta/recipes-core/glibc/glibc/0012-Make-ld-version-output-matching-grok-gold-s-output.patch rename meta/recipes-core/glibc/glibc/{0013-sysdeps-gnu-configure.ac-handle-correctly-libc_cv_ro.patch => 0012-sysdeps-gnu-configure.ac-handle-correctly-libc_cv_ro.patch} (82%) rename meta/recipes-core/glibc/glibc/{0014-Add-unused-attribute.patch => 0013-Add-unused-attribute.patch} (82%) rename meta/recipes-core/glibc/glibc/{0015-yes-within-the-path-sets-wrong-config-variables.patch => 0014-yes-within-the-path-sets-wrong-config-variables.patch} (94%) rename meta/recipes-core/glibc/glibc/{0016-timezone-re-written-tzselect-as-posix-sh.patch => 0015-timezone-re-written-tzselect-as-posix-sh.patch} (81%) rename meta/recipes-core/glibc/glibc/{0017-Remove-bash-dependency-for-nscd-init-script.patch => 0016-Remove-bash-dependency-for-nscd-init-script.patch} (89%) rename meta/recipes-core/glibc/glibc/{0018-eglibc-Cross-building-and-testing-instructions.patch => 0017-eglibc-Cross-building-and-testing-instructions.patch} (99%) rename meta/recipes-core/glibc/glibc/{0019-eglibc-Help-bootstrap-cross-toolchain.patch => 0018-eglibc-Help-bootstrap-cross-toolchain.patch} (94%) rename meta/recipes-core/glibc/glibc/{0021-eglibc-Clear-cache-lines-on-ppc8xx.patch => 0019-eglibc-Clear-cache-lines-on-ppc8xx.patch} (94%) rename meta/recipes-core/glibc/glibc/{0022-eglibc-Resolve-__fpscr_values-on-SH4.patch => 0020-eglibc-Resolve-__fpscr_values-on-SH4.patch} (88%) rename meta/recipes-core/glibc/glibc/{0023-eglibc-Install-PIC-archives.patch => 0021-eglibc-Install-PIC-archives.patch} (90%) rename meta/recipes-core/glibc/glibc/{0024-eglibc-Forward-port-cross-locale-generation-support.patch => 0022-eglibc-Forward-port-cross-locale-generation-support.patch} (96%) rename meta/recipes-core/glibc/glibc/{0025-Define-DUMMY_LOCALE_T-if-not-defined.patch => 0023-Define-DUMMY_LOCALE_T-if-not-defined.patch} (80%) rename meta/recipes-core/glibc/glibc/{0020-eglibc-cherry-picked-from.patch => 0024-local-dynamic-resolvconf.patch} (49%) rename meta/recipes-core/glibc/glibc/{0026-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch => 0025-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch} (89%) rename meta/recipes-core/glibc/glibc/{0027-locale-fix-hard-coded-reference-to-gcc-E.patch => 0026-locale-fix-hard-coded-reference-to-gcc-E.patch} (82%) rename meta/recipes-core/glibc/{glibc_2.25.bb => glibc_2.25.90.bb} (80%) diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index 424b8887cc..8ffb8ad046 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc @@ -26,7 +26,7 @@ GCCVERSION ?= "7.%" SDKGCCVERSION ?= "${GCCVERSION}" BINUVERSION ?= "2.28%" GDBVERSION ?= "8.0%" -GLIBCVERSION ?= "2.25" +GLIBCVERSION ?= "2.25%" LINUXLIBCVERSION ?= "4.10%" PREFERRED_VERSION_gcc ?= "${GCCVERSION}" diff --git a/meta/recipes-core/glibc/cross-localedef-native_2.25.bb b/meta/recipes-core/glibc/cross-localedef-native_2.25.90.bb similarity index 61% rename from meta/recipes-core/glibc/cross-localedef-native_2.25.bb rename to meta/recipes-core/glibc/cross-localedef-native_2.25.90.bb index cbd16f7263..fbb77f039a 100644 --- a/meta/recipes-core/glibc/cross-localedef-native_2.25.bb +++ b/meta/recipes-core/glibc/cross-localedef-native_2.25.90.bb @@ -17,25 +17,26 @@ inherit autotools FILESEXTRAPATHS =. "${FILE_DIRNAME}/${PN}:${FILE_DIRNAME}/glibc:" -SRCBRANCH ?= "release/${PV}/master" +#SRCBRANCH ?= "release/${PV}/master" +SRCBRANCH ?= "master" GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.\d+(\.\d+)*)" -SRCREV_glibc ?= "db0242e3023436757bbc7c488a779e6e3343db04" -SRCREV_localedef ?= "29869b6dc11427c5bab839bdb155c85a7c644c71" +SRCREV_glibc ?= "8466ee1cb7c2041d8471dad0aa53af35ab599012" +SRCREV_localedef ?= "dfb4afe551c6c6e94f9cc85417bd1f582168c843" SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \ git://github.com/kraj/localedef;branch=master;name=localedef;destsuffix=git/localedef \ - file://0016-timezone-re-written-tzselect-as-posix-sh.patch \ - file://0017-Remove-bash-dependency-for-nscd-init-script.patch \ - file://0018-eglibc-Cross-building-and-testing-instructions.patch \ - file://0019-eglibc-Help-bootstrap-cross-toolchain.patch \ - file://0020-eglibc-cherry-picked-from.patch \ - file://0021-eglibc-Clear-cache-lines-on-ppc8xx.patch \ - file://0022-eglibc-Resolve-__fpscr_values-on-SH4.patch \ - 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://0015-timezone-re-written-tzselect-as-posix-sh.patch \ + file://0016-Remove-bash-dependency-for-nscd-init-script.patch \ + file://0017-eglibc-Cross-building-and-testing-instructions.patch \ + file://0018-eglibc-Help-bootstrap-cross-toolchain.patch \ + file://0019-eglibc-Clear-cache-lines-on-ppc8xx.patch \ + file://0020-eglibc-Resolve-__fpscr_values-on-SH4.patch \ + file://0021-eglibc-Install-PIC-archives.patch \ + file://0022-eglibc-Forward-port-cross-locale-generation-support.patch \ + file://0023-Define-DUMMY_LOCALE_T-if-not-defined.patch \ + file://0024-local-dynamic-resolvconf.patch \ " # Makes for a rather long rev (22 characters), but... # diff --git a/meta/recipes-core/glibc/glibc-initial_2.25.bb b/meta/recipes-core/glibc/glibc-initial_2.25.90.bb similarity index 100% rename from meta/recipes-core/glibc/glibc-initial_2.25.bb rename to meta/recipes-core/glibc/glibc-initial_2.25.90.bb diff --git a/meta/recipes-core/glibc/glibc-locale_2.25.bb b/meta/recipes-core/glibc/glibc-locale_2.25.90.bb similarity index 100% rename from meta/recipes-core/glibc/glibc-locale_2.25.bb rename to meta/recipes-core/glibc/glibc-locale_2.25.90.bb diff --git a/meta/recipes-core/glibc/glibc-mtrace_2.25.bb b/meta/recipes-core/glibc/glibc-mtrace_2.25.90.bb similarity index 100% rename from meta/recipes-core/glibc/glibc-mtrace_2.25.bb rename to meta/recipes-core/glibc/glibc-mtrace_2.25.90.bb diff --git a/meta/recipes-core/glibc/glibc-scripts_2.25.bb b/meta/recipes-core/glibc/glibc-scripts_2.25.90.bb similarity index 100% rename from meta/recipes-core/glibc/glibc-scripts_2.25.bb rename to meta/recipes-core/glibc/glibc-scripts_2.25.90.bb diff --git a/meta/recipes-core/glibc/glibc/0001-nativesdk-glibc-Look-for-host-system-ld.so.cache-as-.patch b/meta/recipes-core/glibc/glibc/0001-nativesdk-glibc-Look-for-host-system-ld.so.cache-as-.patch index 0553f8a472..4493d07238 100644 --- a/meta/recipes-core/glibc/glibc/0001-nativesdk-glibc-Look-for-host-system-ld.so.cache-as-.patch +++ b/meta/recipes-core/glibc/glibc/0001-nativesdk-glibc-Look-for-host-system-ld.so.cache-as-.patch @@ -1,4 +1,4 @@ -From 2727e58d1d269994de17cadb12195001b14585e7 Mon Sep 17 00:00:00 2001 +From 7ded71c14e1778b7f275b0cf396cc5e2b4c66835 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 18 Mar 2015 01:48:24 +0000 Subject: [PATCH 01/26] nativesdk-glibc: Look for host system ld.so.cache as @@ -31,7 +31,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/elf/dl-load.c b/elf/dl-load.c -index 51fb0d0..f503dbc 100644 +index c1b6d4ba0f..d7af9ebcbc 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c @@ -2054,6 +2054,14 @@ _dl_map_object (struct link_map *loader, const char *name, @@ -65,5 +65,5 @@ index 51fb0d0..f503dbc 100644 if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_LIBS)) _dl_debug_printf ("\n"); -- -2.10.2 +2.13.2 diff --git a/meta/recipes-core/glibc/glibc/0002-nativesdk-glibc-Fix-buffer-overrun-with-a-relocated-.patch b/meta/recipes-core/glibc/glibc/0002-nativesdk-glibc-Fix-buffer-overrun-with-a-relocated-.patch index e5ef3410e9..e50e276ffb 100644 --- a/meta/recipes-core/glibc/glibc/0002-nativesdk-glibc-Fix-buffer-overrun-with-a-relocated-.patch +++ b/meta/recipes-core/glibc/glibc/0002-nativesdk-glibc-Fix-buffer-overrun-with-a-relocated-.patch @@ -1,4 +1,4 @@ -From 1578f52647ec8804186d1944d4cd2095132efc39 Mon Sep 17 00:00:00 2001 +From 61efe175180a92ad7b0a173c3ac2eab0fd459ecb Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 18 Mar 2015 01:50:00 +0000 Subject: [PATCH 02/26] nativesdk-glibc: Fix buffer overrun with a relocated @@ -22,7 +22,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 12 insertions(+) diff --git a/elf/dl-load.c b/elf/dl-load.c -index f503dbc..3a3d112 100644 +index d7af9ebcbc..19c1db9948 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c @@ -1753,7 +1753,19 @@ open_path (const char *name, size_t namelen, int mode, @@ -46,5 +46,5 @@ index f503dbc..3a3d112 100644 { struct r_search_path_elem *this_dir = *dirs; -- -2.10.2 +2.13.2 diff --git a/meta/recipes-core/glibc/glibc/0003-nativesdk-glibc-Raise-the-size-of-arrays-containing-.patch b/meta/recipes-core/glibc/glibc/0003-nativesdk-glibc-Raise-the-size-of-arrays-containing-.patch index 9e207e44d9..f2952fd089 100644 --- a/meta/recipes-core/glibc/glibc/0003-nativesdk-glibc-Raise-the-size-of-arrays-containing-.patch +++ b/meta/recipes-core/glibc/glibc/0003-nativesdk-glibc-Raise-the-size-of-arrays-containing-.patch @@ -1,4 +1,4 @@ -From e53968d61804b6bab32ec6e13cc0b3cd57214796 Mon Sep 17 00:00:00 2001 +From d658dcbc36e392007643b4fcd167683676d42963 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 18 Mar 2015 01:51:38 +0000 Subject: [PATCH 03/26] nativesdk-glibc: Raise the size of arrays containing dl @@ -26,10 +26,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 7 files changed, 14 insertions(+), 10 deletions(-) diff --git a/elf/dl-cache.c b/elf/dl-cache.c -index cfa335e..daa12ec 100644 +index e9632da0b3..4de529d2cf 100644 --- a/elf/dl-cache.c +++ b/elf/dl-cache.c -@@ -132,6 +132,10 @@ do \ +@@ -133,6 +133,10 @@ do \ while (0) @@ -41,7 +41,7 @@ index cfa335e..daa12ec 100644 internal_function _dl_cache_libcmp (const char *p1, const char *p2) diff --git a/elf/dl-load.c b/elf/dl-load.c -index 3a3d112..a1410e4 100644 +index 19c1db9948..70c259b400 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c @@ -106,8 +106,8 @@ static size_t max_capstrlen attribute_relro; @@ -56,7 +56,7 @@ index 3a3d112..a1410e4 100644 SYSTEM_DIRS_LEN }; diff --git a/elf/interp.c b/elf/interp.c -index 9448802..e7e8c70 100644 +index b6e8f04444..47c20415bc 100644 --- a/elf/interp.c +++ b/elf/interp.c @@ -18,5 +18,5 @@ @@ -67,7 +67,7 @@ index 9448802..e7e8c70 100644 +const char __invoke_dynamic_linker__[4096] __attribute__ ((section (".interp"))) = RUNTIME_LINKER; diff --git a/elf/ldconfig.c b/elf/ldconfig.c -index 467ca82..631a2a9 100644 +index 99caf9e9bb..36ea5df5f1 100644 --- a/elf/ldconfig.c +++ b/elf/ldconfig.c @@ -168,6 +168,9 @@ static struct argp argp = @@ -81,18 +81,18 @@ index 467ca82..631a2a9 100644 a platform. */ static int diff --git a/elf/rtld.c b/elf/rtld.c -index 4ec25d7..e159c12 100644 +index 65647fb1c8..cd8381cb33 100644 --- a/elf/rtld.c +++ b/elf/rtld.c -@@ -99,6 +99,7 @@ uintptr_t __pointer_chk_guard_local - strong_alias (__pointer_chk_guard_local, __pointer_chk_guard) - #endif - +@@ -128,6 +128,7 @@ dso_name_valid_for_suid (const char *p) + } + return *p != '\0'; + } +extern const char LD_SO_CACHE[4096] __attribute__ ((section (".ldsocache"))); - /* List of auditing DSOs. */ - static struct audit_list -@@ -854,12 +855,12 @@ of this helper program; chances are you did not intend to run this program.\n\ + /* LD_AUDIT variable contents. Must be processed before the + audit_list below. */ +@@ -999,12 +1000,12 @@ of this helper program; chances are you did not intend to run this program.\n\ --list list all dependencies and how they are resolved\n\ --verify verify that given object really is a dynamically linked\n\ object we can handle\n\ @@ -108,7 +108,7 @@ index 4ec25d7..e159c12 100644 ++_dl_skip_args; --_dl_argc; diff --git a/iconv/gconv_conf.c b/iconv/gconv_conf.c -index e235188..569f72e 100644 +index 5aa055de6e..b9a14b9bd3 100644 --- a/iconv/gconv_conf.c +++ b/iconv/gconv_conf.c @@ -36,7 +36,7 @@ @@ -121,7 +121,7 @@ index e235188..569f72e 100644 /* The path elements, as determined by the __gconv_get_path function. All path elements end in a slash. */ diff --git a/sysdeps/generic/dl-cache.h b/sysdeps/generic/dl-cache.h -index eb2f900..505804e 100644 +index 1f0b8f629d..acbe68399d 100644 --- a/sysdeps/generic/dl-cache.h +++ b/sysdeps/generic/dl-cache.h @@ -27,10 +27,6 @@ @@ -136,5 +136,5 @@ index eb2f900..505804e 100644 # define add_system_dir(dir) add_dir (dir) #endif -- -2.10.2 +2.13.2 diff --git a/meta/recipes-core/glibc/glibc/0004-nativesdk-glibc-Allow-64-bit-atomics-for-x86.patch b/meta/recipes-core/glibc/glibc/0004-nativesdk-glibc-Allow-64-bit-atomics-for-x86.patch index 0926a110e0..2fd62ecacb 100644 --- a/meta/recipes-core/glibc/glibc/0004-nativesdk-glibc-Allow-64-bit-atomics-for-x86.patch +++ b/meta/recipes-core/glibc/glibc/0004-nativesdk-glibc-Allow-64-bit-atomics-for-x86.patch @@ -1,4 +1,4 @@ -From 0b95f34207ffed3aa53fa949662bfbccc7c864a4 Mon Sep 17 00:00:00 2001 +From 940be2630be0b2fe0efa84abf05fb7a8db910ee4 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Thu, 31 Dec 2015 14:35:35 -0800 Subject: [PATCH 04/26] nativesdk-glibc: Allow 64 bit atomics for x86 @@ -10,13 +10,14 @@ It also makes the synchronization more efficient. Signed-off-by: Juro Bystricky <juro.bystricky@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Khem Raj <raj.khem@gmail.com> -Upstream-Status: Pending --- +Upstream-Status: Inappropriate [OE specific] + sysdeps/i386/atomic-machine.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sysdeps/i386/atomic-machine.h b/sysdeps/i386/atomic-machine.h -index ce62b33..4fe44ea 100644 +index 0e24200617..1532f52dec 100644 --- a/sysdeps/i386/atomic-machine.h +++ b/sysdeps/i386/atomic-machine.h @@ -54,7 +54,7 @@ typedef uintmax_t uatomic_max_t; @@ -26,8 +27,8 @@ index ce62b33..4fe44ea 100644 -#define __HAVE_64B_ATOMICS 0 +#define __HAVE_64B_ATOMICS 1 #define USE_ATOMIC_COMPILER_BUILTINS 0 - + #define ATOMIC_EXCHANGE_USES_CAS 0 -- -2.10.2 +2.13.2 diff --git a/meta/recipes-core/glibc/glibc/0005-fsl-e500-e5500-e6500-603e-fsqrt-implementation.patch b/meta/recipes-core/glibc/glibc/0005-fsl-e500-e5500-e6500-603e-fsqrt-implementation.patch index ee50000319..836a02a6b9 100644 --- a/meta/recipes-core/glibc/glibc/0005-fsl-e500-e5500-e6500-603e-fsqrt-implementation.patch +++ b/meta/recipes-core/glibc/glibc/0005-fsl-e500-e5500-e6500-603e-fsqrt-implementation.patch @@ -1,4 +1,4 @@ -From 77a7495376c7d0c5507c0ec99bf1568150339ef4 Mon Sep 17 00:00:00 2001 +From 18df7a38015400695bbda47648afb3ad8f2a36a5 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 18 Mar 2015 00:01:50 +0000 Subject: [PATCH 05/26] fsl e500/e5500/e6500/603e fsqrt implementation @@ -49,7 +49,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> diff --git a/sysdeps/powerpc/powerpc32/603e/fpu/e_sqrt.c b/sysdeps/powerpc/powerpc32/603e/fpu/e_sqrt.c new file mode 100644 -index 0000000..71e516d +index 0000000000..71e516d1c8 --- /dev/null +++ b/sysdeps/powerpc/powerpc32/603e/fpu/e_sqrt.c @@ -0,0 +1,134 @@ @@ -189,7 +189,7 @@ index 0000000..71e516d +} diff --git a/sysdeps/powerpc/powerpc32/603e/fpu/e_sqrtf.c b/sysdeps/powerpc/powerpc32/603e/fpu/e_sqrtf.c new file mode 100644 -index 0000000..26fa067 +index 0000000000..26fa067abf --- /dev/null +++ b/sysdeps/powerpc/powerpc32/603e/fpu/e_sqrtf.c @@ -0,0 +1,101 @@ @@ -296,7 +296,7 @@ index 0000000..26fa067 +} diff --git a/sysdeps/powerpc/powerpc32/e500mc/fpu/e_sqrt.c b/sysdeps/powerpc/powerpc32/e500mc/fpu/e_sqrt.c new file mode 100644 -index 0000000..71e516d +index 0000000000..71e516d1c8 --- /dev/null +++ b/sysdeps/powerpc/powerpc32/e500mc/fpu/e_sqrt.c @@ -0,0 +1,134 @@ @@ -436,7 +436,7 @@ index 0000000..71e516d +} diff --git a/sysdeps/powerpc/powerpc32/e500mc/fpu/e_sqrtf.c b/sysdeps/powerpc/powerpc32/e500mc/fpu/e_sqrtf.c new file mode 100644 -index 0000000..26fa067 +index 0000000000..26fa067abf --- /dev/null +++ b/sysdeps/powerpc/powerpc32/e500mc/fpu/e_sqrtf.c @@ -0,0 +1,101 @@ @@ -543,7 +543,7 @@ index 0000000..26fa067 +} diff --git a/sysdeps/powerpc/powerpc32/e5500/fpu/e_sqrt.c b/sysdeps/powerpc/powerpc32/e5500/fpu/e_sqrt.c new file mode 100644 -index 0000000..71e516d +index 0000000000..71e516d1c8 --- /dev/null +++ b/sysdeps/powerpc/powerpc32/e5500/fpu/e_sqrt.c @@ -0,0 +1,134 @@ @@ -683,7 +683,7 @@ index 0000000..71e516d +} diff --git a/sysdeps/powerpc/powerpc32/e5500/fpu/e_sqrtf.c b/sysdeps/powerpc/powerpc32/e5500/fpu/e_sqrtf.c new file mode 100644 -index 0000000..26fa067 +index 0000000000..26fa067abf --- /dev/null +++ b/sysdeps/powerpc/powerpc32/e5500/fpu/e_sqrtf.c @@ -0,0 +1,101 @@ @@ -790,7 +790,7 @@ index 0000000..26fa067 +} diff --git a/sysdeps/powerpc/powerpc32/e6500/fpu/e_sqrt.c b/sysdeps/powerpc/powerpc32/e6500/fpu/e_sqrt.c new file mode 100644 -index 0000000..71e516d +index 0000000000..71e516d1c8 --- /dev/null +++ b/sysdeps/powerpc/powerpc32/e6500/fpu/e_sqrt.c @@ -0,0 +1,134 @@ @@ -930,7 +930,7 @@ index 0000000..71e516d +} diff --git a/sysdeps/powerpc/powerpc32/e6500/fpu/e_sqrtf.c b/sysdeps/powerpc/powerpc32/e6500/fpu/e_sqrtf.c new file mode 100644 -index 0000000..26fa067 +index 0000000000..26fa067abf --- /dev/null +++ b/sysdeps/powerpc/powerpc32/e6500/fpu/e_sqrtf.c @@ -0,0 +1,101 @@ @@ -1037,7 +1037,7 @@ index 0000000..26fa067 +} diff --git a/sysdeps/powerpc/powerpc64/e5500/fpu/e_sqrt.c b/sysdeps/powerpc/powerpc64/e5500/fpu/e_sqrt.c new file mode 100644 -index 0000000..71e516d +index 0000000000..71e516d1c8 --- /dev/null +++ b/sysdeps/powerpc/powerpc64/e5500/fpu/e_sqrt.c @@ -0,0 +1,134 @@ @@ -1177,7 +1177,7 @@ index 0000000..71e516d +} diff --git a/sysdeps/powerpc/powerpc64/e5500/fpu/e_sqrtf.c b/sysdeps/powerpc/powerpc64/e5500/fpu/e_sqrtf.c new file mode 100644 -index 0000000..26fa067 +index 0000000000..26fa067abf --- /dev/null +++ b/sysdeps/powerpc/powerpc64/e5500/fpu/e_sqrtf.c @@ -0,0 +1,101 @@ @@ -1284,7 +1284,7 @@ index 0000000..26fa067 +} diff --git a/sysdeps/powerpc/powerpc64/e6500/fpu/e_sqrt.c b/sysdeps/powerpc/powerpc64/e6500/fpu/e_sqrt.c new file mode 100644 -index 0000000..71e516d +index 0000000000..71e516d1c8 --- /dev/null +++ b/sysdeps/powerpc/powerpc64/e6500/fpu/e_sqrt.c @@ -0,0 +1,134 @@ @@ -1424,7 +1424,7 @@ index 0000000..71e516d +} diff --git a/sysdeps/powerpc/powerpc64/e6500/fpu/e_sqrtf.c b/sysdeps/powerpc/powerpc64/e6500/fpu/e_sqrtf.c new file mode 100644 -index 0000000..26fa067 +index 0000000000..26fa067abf --- /dev/null +++ b/sysdeps/powerpc/powerpc64/e6500/fpu/e_sqrtf.c @@ -0,0 +1,101 @@ @@ -1531,14 +1531,14 @@ index 0000000..26fa067 +} diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/603e/fpu/Implies b/sysdeps/unix/sysv/linux/powerpc/powerpc32/603e/fpu/Implies new file mode 100644 -index 0000000..b103b4d +index 0000000000..b103b4dea5 --- /dev/null +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/603e/fpu/Implies @@ -0,0 +1 @@ +powerpc/powerpc32/603e/fpu diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/e300c3/fpu/Implies b/sysdeps/unix/sysv/linux/powerpc/powerpc32/e300c3/fpu/Implies new file mode 100644 -index 0000000..64db17f +index 0000000000..64db17fada --- /dev/null +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/e300c3/fpu/Implies @@ -0,0 +1,2 @@ @@ -1546,39 +1546,39 @@ index 0000000..64db17f +powerpc/powerpc32/603e/fpu diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500mc/fpu/Implies b/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500mc/fpu/Implies new file mode 100644 -index 0000000..7eac5fc +index 0000000000..7eac5fcf02 --- /dev/null +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500mc/fpu/Implies @@ -0,0 +1 @@ +powerpc/powerpc32/e500mc/fpu diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/e5500/fpu/Implies b/sysdeps/unix/sysv/linux/powerpc/powerpc32/e5500/fpu/Implies new file mode 100644 -index 0000000..264b2a7 +index 0000000000..264b2a7700 --- /dev/null +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/e5500/fpu/Implies @@ -0,0 +1 @@ +powerpc/powerpc32/e5500/fpu diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/e6500/fpu/Implies b/sysdeps/unix/sysv/linux/powerpc/powerpc32/e6500/fpu/Implies new file mode 100644 -index 0000000..a259344 +index 0000000000..a25934467b --- /dev/null +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/e6500/fpu/Implies @@ -0,0 +1 @@ +powerpc/powerpc32/e6500/fpu diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/e5500/fpu/Implies b/sysdeps/unix/sysv/linux/powerpc/powerpc64/e5500/fpu/Implies new file mode 100644 -index 0000000..a7bc854 +index 0000000000..a7bc854be8 --- /dev/null +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/e5500/fpu/Implies @@ -0,0 +1 @@ +powerpc/powerpc64/e5500/fpu diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/e6500/fpu/Implies b/sysdeps/unix/sysv/linux/powerpc/powerpc64/e6500/fpu/Implies new file mode 100644 -index 0000000..04ff8cc +index 0000000000..04ff8cc181 --- /dev/null +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/e6500/fpu/Implies @@ -0,0 +1 @@ +powerpc/powerpc64/e6500/fpu -- -2.10.2 +2.13.2 diff --git a/meta/recipes-core/glibc/glibc/0006-readlib-Add-OECORE_KNOWN_INTERPRETER_NAMES-to-known-.patch b/meta/recipes-core/glibc/glibc/0006-readlib-Add-OECORE_KNOWN_INTERPRETER_NAMES-to-known-.patch index 9088d29c4a..40179eac4f 100644 --- a/meta/recipes-core/glibc/glibc/0006-readlib-Add-OECORE_KNOWN_INTERPRETER_NAMES-to-known-.patch +++ b/meta/recipes-core/glibc/glibc/0006-readlib-Add-OECORE_KNOWN_INTERPRETER_NAMES-to-known-.patch @@ -1,4 +1,4 @@ -From 520cb9e746af637cf01fea385b7f4ee4aadbdfdd Mon Sep 17 00:00:00 2001 +From 2f33f2bf967fac3836ba3f2d5d301515f0313f5e Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 18 Mar 2015 00:11:22 +0000 Subject: [PATCH 06/26] readlib: Add OECORE_KNOWN_INTERPRETER_NAMES to known @@ -17,7 +17,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 1 insertion(+) diff --git a/elf/readlib.c b/elf/readlib.c -index 8a66ffe..08d56fc 100644 +index d278a189b2..a84cb85158 100644 --- a/elf/readlib.c +++ b/elf/readlib.c @@ -51,6 +51,7 @@ static struct known_names interpreters[] = @@ -29,5 +29,5 @@ index 8a66ffe..08d56fc 100644 static struct known_names known_libs[] = -- -2.10.2 +2.13.2 diff --git a/meta/recipes-core/glibc/glibc/0007-ppc-sqrt-Fix-undefined-reference-to-__sqrt_finite.patch b/meta/recipes-core/glibc/glibc/0007-ppc-sqrt-Fix-undefined-reference-to-__sqrt_finite.patch index f33defe075..06031608d8 100644 --- a/meta/recipes-core/glibc/glibc/0007-ppc-sqrt-Fix-undefined-reference-to-__sqrt_finite.patch +++ b/meta/recipes-core/glibc/glibc/0007-ppc-sqrt-Fix-undefined-reference-to-__sqrt_finite.patch @@ -1,4 +1,4 @@ -From 64130262787d54e2e6695ae4ed8783bfec14ffef Mon Sep 17 00:00:00 2001 +From c88e79dbc8c2684a1f5e2023ce4e4a5ec5b17292 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 18 Mar 2015 00:15:07 +0000 Subject: [PATCH 07/26] ppc/sqrt: Fix undefined reference to `__sqrt_finite' @@ -36,7 +36,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 12 files changed, 12 insertions(+), 24 deletions(-) diff --git a/sysdeps/powerpc/powerpc32/603e/fpu/e_sqrt.c b/sysdeps/powerpc/powerpc32/603e/fpu/e_sqrt.c -index 71e516d..1795fd6 100644 +index 71e516d1c8..1795fd6c3e 100644 --- a/sysdeps/powerpc/powerpc32/603e/fpu/e_sqrt.c +++ b/sysdeps/powerpc/powerpc32/603e/fpu/e_sqrt.c @@ -39,14 +39,8 @@ static const float half = 0.5; @@ -60,7 +60,7 @@ index 71e516d..1795fd6 100644 } +strong_alias (__ieee754_sqrt, __sqrt_finite) diff --git a/sysdeps/powerpc/powerpc32/603e/fpu/e_sqrtf.c b/sysdeps/powerpc/powerpc32/603e/fpu/e_sqrtf.c -index 26fa067..a917f31 100644 +index 26fa067abf..a917f313ab 100644 --- a/sysdeps/powerpc/powerpc32/603e/fpu/e_sqrtf.c +++ b/sysdeps/powerpc/powerpc32/603e/fpu/e_sqrtf.c @@ -37,14 +37,8 @@ static const float threehalf = 1.5; @@ -84,7 +84,7 @@ index 26fa067..a917f31 100644 } +strong_alias (__ieee754_sqrtf, __sqrtf_finite) diff --git a/sysdeps/powerpc/powerpc32/e500mc/fpu/e_sqrt.c b/sysdeps/powerpc/powerpc32/e500mc/fpu/e_sqrt.c -index 71e516d..fc4a749 100644 +index 71e516d1c8..fc4a74990e 100644 --- a/sysdeps/powerpc/powerpc32/e500mc/fpu/e_sqrt.c +++ b/sysdeps/powerpc/powerpc32/e500mc/fpu/e_sqrt.c @@ -132,3 +132,4 @@ __ieee754_sqrt (b) @@ -93,7 +93,7 @@ index 71e516d..fc4a749 100644 } +strong_alias (__ieee754_sqrt, __sqrt_finite) diff --git a/sysdeps/powerpc/powerpc32/e500mc/fpu/e_sqrtf.c b/sysdeps/powerpc/powerpc32/e500mc/fpu/e_sqrtf.c -index 26fa067..9d17512 100644 +index 26fa067abf..9d175122a8 100644 --- a/sysdeps/powerpc/powerpc32/e500mc/fpu/e_sqrtf.c +++ b/sysdeps/powerpc/powerpc32/e500mc/fpu/e_sqrtf.c @@ -99,3 +99,4 @@ __ieee754_sqrtf (b) @@ -102,7 +102,7 @@ index 26fa067..9d17512 100644 } +strong_alias (__ieee754_sqrtf, __sqrtf_finite) diff --git a/sysdeps/powerpc/powerpc32/e5500/fpu/e_sqrt.c b/sysdeps/powerpc/powerpc32/e5500/fpu/e_sqrt.c -index 71e516d..fc4a749 100644 +index 71e516d1c8..fc4a74990e 100644 --- a/sysdeps/powerpc/powerpc32/e5500/fpu/e_sqrt.c +++ b/sysdeps/powerpc/powerpc32/e5500/fpu/e_sqrt.c @@ -132,3 +132,4 @@ __ieee754_sqrt (b) @@ -111,7 +111,7 @@ index 71e516d..fc4a749 100644 } +strong_alias (__ieee754_sqrt, __sqrt_finite) diff --git a/sysdeps/powerpc/powerpc32/e5500/fpu/e_sqrtf.c b/sysdeps/powerpc/powerpc32/e5500/fpu/e_sqrtf.c -index 26fa067..9d17512 100644 +index 26fa067abf..9d175122a8 100644 --- a/sysdeps/powerpc/powerpc32/e5500/fpu/e_sqrtf.c +++ b/sysdeps/powerpc/powerpc32/e5500/fpu/e_sqrtf.c @@ -99,3 +99,4 @@ __ieee754_sqrtf (b) @@ -120,7 +120,7 @@ index 26fa067..9d17512 100644 } +strong_alias (__ieee754_sqrtf, __sqrtf_finite) diff --git a/sysdeps/powerpc/powerpc32/e6500/fpu/e_sqrt.c b/sysdeps/powerpc/powerpc32/e6500/fpu/e_sqrt.c -index 71e516d..fc4a749 100644 +index 71e516d1c8..fc4a74990e 100644 --- a/sysdeps/powerpc/powerpc32/e6500/fpu/e_sqrt.c +++ b/sysdeps/powerpc/powerpc32/e6500/fpu/e_sqrt.c @@ -132,3 +132,4 @@ __ieee754_sqrt (b) @@ -129,7 +129,7 @@ index 71e516d..fc4a749 100644 } +strong_alias (__ieee754_sqrt, __sqrt_finite) diff --git a/sysdeps/powerpc/powerpc32/e6500/fpu/e_sqrtf.c b/sysdeps/powerpc/powerpc32/e6500/fpu/e_sqrtf.c -index 26fa067..9d17512 100644 +index 26fa067abf..9d175122a8 100644 --- a/sysdeps/powerpc/powerpc32/e6500/fpu/e_sqrtf.c +++ b/sysdeps/powerpc/powerpc32/e6500/fpu/e_sqrtf.c @@ -99,3 +99,4 @@ __ieee754_sqrtf (b) @@ -138,7 +138,7 @@ index 26fa067..9d17512 100644 } +strong_alias (__ieee754_sqrtf, __sqrtf_finite) diff --git a/sysdeps/powerpc/powerpc64/e5500/fpu/e_sqrt.c b/sysdeps/powerpc/powerpc64/e5500/fpu/e_sqrt.c -index 71e516d..1795fd6 100644 +index 71e516d1c8..1795fd6c3e 100644 --- a/sysdeps/powerpc/powerpc64/e5500/fpu/e_sqrt.c +++ b/sysdeps/powerpc/powerpc64/e5500/fpu/e_sqrt.c @@ -39,14 +39,8 @@ static const float half = 0.5; @@ -162,7 +162,7 @@ index 71e516d..1795fd6 100644 } +strong_alias (__ieee754_sqrt, __sqrt_finite) diff --git a/sysdeps/powerpc/powerpc64/e5500/fpu/e_sqrtf.c b/sysdeps/powerpc/powerpc64/e5500/fpu/e_sqrtf.c -index 26fa067..a917f31 100644 +index 26fa067abf..a917f313ab 100644 --- a/sysdeps/powerpc/powerpc64/e5500/fpu/e_sqrtf.c +++ b/sysdeps/powerpc/powerpc64/e5500/fpu/e_sqrtf.c @@ -37,14 +37,8 @@ static const float threehalf = 1.5; @@ -186,7 +186,7 @@ index 26fa067..a917f31 100644 } +strong_alias (__ieee754_sqrtf, __sqrtf_finite) diff --git a/sysdeps/powerpc/powerpc64/e6500/fpu/e_sqrt.c b/sysdeps/powerpc/powerpc64/e6500/fpu/e_sqrt.c -index 71e516d..fc4a749 100644 +index 71e516d1c8..fc4a74990e 100644 --- a/sysdeps/powerpc/powerpc64/e6500/fpu/e_sqrt.c +++ b/sysdeps/powerpc/powerpc64/e6500/fpu/e_sqrt.c @@ -132,3 +132,4 @@ __ieee754_sqrt (b) @@ -195,7 +195,7 @@ index 71e516d..fc4a749 100644 } +strong_alias (__ieee754_sqrt, __sqrt_finite) diff --git a/sysdeps/powerpc/powerpc64/e6500/fpu/e_sqrtf.c b/sysdeps/powerpc/powerpc64/e6500/fpu/e_sqrtf.c -index 26fa067..9d17512 100644 +index 26fa067abf..9d175122a8 100644 --- a/sysdeps/powerpc/powerpc64/e6500/fpu/e_sqrtf.c +++ b/sysdeps/powerpc/powerpc64/e6500/fpu/e_sqrtf.c @@ -99,3 +99,4 @@ __ieee754_sqrtf (b) @@ -204,5 +204,5 @@ index 26fa067..9d17512 100644 } +strong_alias (__ieee754_sqrtf, __sqrtf_finite) -- -2.10.2 +2.13.2 diff --git a/meta/recipes-core/glibc/glibc/0008-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch b/meta/recipes-core/glibc/glibc/0008-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch index 26f65c5b17..65c29c6504 100644 --- a/meta/recipes-core/glibc/glibc/0008-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch +++ b/meta/recipes-core/glibc/glibc/0008-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch @@ -1,4 +1,4 @@ -From 5afb0147e3e49c3b474404524014efe51b2bca5a Mon Sep 17 00:00:00 2001 +From ce6fc5c97284d6252a216f005d1da30baba9ff4c Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 18 Mar 2015 00:16:38 +0000 Subject: [PATCH 08/26] __ieee754_sqrt{,f} are now inline functions and call @@ -23,7 +23,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 12 files changed, 114 insertions(+), 21 deletions(-) diff --git a/sysdeps/powerpc/powerpc32/603e/fpu/e_sqrt.c b/sysdeps/powerpc/powerpc32/603e/fpu/e_sqrt.c -index 1795fd6..daa83f3 100644 +index 1795fd6c3e..daa83f3fe8 100644 --- a/sysdeps/powerpc/powerpc32/603e/fpu/e_sqrt.c +++ b/sysdeps/powerpc/powerpc32/603e/fpu/e_sqrt.c @@ -40,7 +40,7 @@ static const float half = 0.5; @@ -58,7 +58,7 @@ index 1795fd6..daa83f3 100644 + strong_alias (__ieee754_sqrt, __sqrt_finite) diff --git a/sysdeps/powerpc/powerpc32/603e/fpu/e_sqrtf.c b/sysdeps/powerpc/powerpc32/603e/fpu/e_sqrtf.c -index a917f31..b812cf1 100644 +index a917f313ab..b812cf1705 100644 --- a/sysdeps/powerpc/powerpc32/603e/fpu/e_sqrtf.c +++ b/sysdeps/powerpc/powerpc32/603e/fpu/e_sqrtf.c @@ -38,7 +38,7 @@ static const float threehalf = 1.5; @@ -82,7 +82,7 @@ index a917f31..b812cf1 100644 +} strong_alias (__ieee754_sqrtf, __sqrtf_finite) diff --git a/sysdeps/powerpc/powerpc32/e500mc/fpu/e_sqrt.c b/sysdeps/powerpc/powerpc32/e500mc/fpu/e_sqrt.c -index fc4a749..7038a70 100644 +index fc4a74990e..7038a70b47 100644 --- a/sysdeps/powerpc/powerpc32/e500mc/fpu/e_sqrt.c +++ b/sysdeps/powerpc/powerpc32/e500mc/fpu/e_sqrt.c @@ -41,10 +41,10 @@ static const float half = 0.5; @@ -121,7 +121,7 @@ index fc4a749..7038a70 100644 + strong_alias (__ieee754_sqrt, __sqrt_finite) diff --git a/sysdeps/powerpc/powerpc32/e500mc/fpu/e_sqrtf.c b/sysdeps/powerpc/powerpc32/e500mc/fpu/e_sqrtf.c -index 9d17512..10de1f0 100644 +index 9d175122a8..10de1f0cc3 100644 --- a/sysdeps/powerpc/powerpc32/e500mc/fpu/e_sqrtf.c +++ b/sysdeps/powerpc/powerpc32/e500mc/fpu/e_sqrtf.c @@ -39,10 +39,10 @@ static const float threehalf = 1.5; @@ -151,7 +151,7 @@ index 9d17512..10de1f0 100644 + strong_alias (__ieee754_sqrtf, __sqrtf_finite) diff --git a/sysdeps/powerpc/powerpc32/e5500/fpu/e_sqrt.c b/sysdeps/powerpc/powerpc32/e5500/fpu/e_sqrt.c -index fc4a749..7038a70 100644 +index fc4a74990e..7038a70b47 100644 --- a/sysdeps/powerpc/powerpc32/e5500/fpu/e_sqrt.c +++ b/sysdeps/powerpc/powerpc32/e5500/fpu/e_sqrt.c @@ -41,10 +41,10 @@ static const float half = 0.5; @@ -190,7 +190,7 @@ index fc4a749..7038a70 100644 + strong_alias (__ieee754_sqrt, __sqrt_finite) diff --git a/sysdeps/powerpc/powerpc32/e5500/fpu/e_sqrtf.c b/sysdeps/powerpc/powerpc32/e5500/fpu/e_sqrtf.c -index 9d17512..10de1f0 100644 +index 9d175122a8..10de1f0cc3 100644 --- a/sysdeps/powerpc/powerpc32/e5500/fpu/e_sqrtf.c +++ b/sysdeps/powerpc/powerpc32/e5500/fpu/e_sqrtf.c @@ -39,10 +39,10 @@ static const float threehalf = 1.5; @@ -220,7 +220,7 @@ index 9d17512..10de1f0 100644 + strong_alias (__ieee754_sqrtf, __sqrtf_finite) diff --git a/sysdeps/powerpc/powerpc32/e6500/fpu/e_sqrt.c b/sysdeps/powerpc/powerpc32/e6500/fpu/e_sqrt.c -index fc4a749..1c34244 100644 +index fc4a74990e..1c34244bd8 100644 --- a/sysdeps/powerpc/powerpc32/e6500/fpu/e_sqrt.c +++ b/sysdeps/powerpc/powerpc32/e6500/fpu/e_sqrt.c @@ -132,4 +132,12 @@ __ieee754_sqrt (b) @@ -237,7 +237,7 @@ index fc4a749..1c34244 100644 + strong_alias (__ieee754_sqrt, __sqrt_finite) diff --git a/sysdeps/powerpc/powerpc32/e6500/fpu/e_sqrtf.c b/sysdeps/powerpc/powerpc32/e6500/fpu/e_sqrtf.c -index 9d17512..8126535 100644 +index 9d175122a8..812653558f 100644 --- a/sysdeps/powerpc/powerpc32/e6500/fpu/e_sqrtf.c +++ b/sysdeps/powerpc/powerpc32/e6500/fpu/e_sqrtf.c @@ -99,4 +99,12 @@ __ieee754_sqrtf (b) @@ -254,7 +254,7 @@ index 9d17512..8126535 100644 + strong_alias (__ieee754_sqrtf, __sqrtf_finite) diff --git a/sysdeps/powerpc/powerpc64/e5500/fpu/e_sqrt.c b/sysdeps/powerpc/powerpc64/e5500/fpu/e_sqrt.c -index 1795fd6..13a8197 100644 +index 1795fd6c3e..13a81973e3 100644 --- a/sysdeps/powerpc/powerpc64/e5500/fpu/e_sqrt.c +++ b/sysdeps/powerpc/powerpc64/e5500/fpu/e_sqrt.c @@ -40,7 +40,7 @@ static const float half = 0.5; @@ -289,7 +289,7 @@ index 1795fd6..13a8197 100644 + strong_alias (__ieee754_sqrt, __sqrt_finite) diff --git a/sysdeps/powerpc/powerpc64/e5500/fpu/e_sqrtf.c b/sysdeps/powerpc/powerpc64/e5500/fpu/e_sqrtf.c -index a917f31..fae2d81 100644 +index a917f313ab..fae2d81210 100644 --- a/sysdeps/powerpc/powerpc64/e5500/fpu/e_sqrtf.c +++ b/sysdeps/powerpc/powerpc64/e5500/fpu/e_sqrtf.c @@ -38,7 +38,7 @@ static const float threehalf = 1.5; @@ -314,7 +314,7 @@ index a917f31..fae2d81 100644 + strong_alias (__ieee754_sqrtf, __sqrtf_finite) diff --git a/sysdeps/powerpc/powerpc64/e6500/fpu/e_sqrt.c b/sysdeps/powerpc/powerpc64/e6500/fpu/e_sqrt.c -index fc4a749..7038a70 100644 +index fc4a74990e..7038a70b47 100644 --- a/sysdeps/powerpc/powerpc64/e6500/fpu/e_sqrt.c +++ b/sysdeps/powerpc/powerpc64/e6500/fpu/e_sqrt.c @@ -41,10 +41,10 @@ static const float half = 0.5; @@ -353,7 +353,7 @@ index fc4a749..7038a70 100644 + strong_alias (__ieee754_sqrt, __sqrt_finite) diff --git a/sysdeps/powerpc/powerpc64/e6500/fpu/e_sqrtf.c b/sysdeps/powerpc/powerpc64/e6500/fpu/e_sqrtf.c -index 9d17512..10de1f0 100644 +index 9d175122a8..10de1f0cc3 100644 --- a/sysdeps/powerpc/powerpc64/e6500/fpu/e_sqrtf.c +++ b/sysdeps/powerpc/powerpc64/e6500/fpu/e_sqrtf.c @@ -39,10 +39,10 @@ static const float threehalf = 1.5; @@ -383,5 +383,5 @@ index 9d17512..10de1f0 100644 + strong_alias (__ieee754_sqrtf, __sqrtf_finite) -- -2.10.2 +2.13.2 diff --git a/meta/recipes-core/glibc/glibc/0009-Quote-from-bug-1443-which-explains-what-the-patch-do.patch b/meta/recipes-core/glibc/glibc/0009-Quote-from-bug-1443-which-explains-what-the-patch-do.patch index d416acde3e..d360981f4d 100644 --- a/meta/recipes-core/glibc/glibc/0009-Quote-from-bug-1443-which-explains-what-the-patch-do.patch +++ b/meta/recipes-core/glibc/glibc/0009-Quote-from-bug-1443-which-explains-what-the-patch-do.patch @@ -1,4 +1,4 @@ -From ddd51bb4e005432cb3c0f8f33822954408a9fee1 Mon Sep 17 00:00:00 2001 +From e0f64b26035fe05e60a24169ff53d490842c77fe Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 18 Mar 2015 00:20:09 +0000 Subject: [PATCH 09/26] Quote from bug 1443 which explains what the patch does @@ -45,10 +45,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sysdeps/arm/dl-machine.h b/sysdeps/arm/dl-machine.h -index 60eee00..7d54d5e 100644 +index 7053ead16e..0b1e1716b0 100644 --- a/sysdeps/arm/dl-machine.h +++ b/sysdeps/arm/dl-machine.h -@@ -499,7 +499,7 @@ elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc, +@@ -500,7 +500,7 @@ elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc, case R_ARM_TLS_DTPOFF32: if (sym != NULL) @@ -58,5 +58,5 @@ index 60eee00..7d54d5e 100644 case R_ARM_TLS_TPOFF32: -- -2.10.2 +2.13.2 diff --git a/meta/recipes-core/glibc/glibc/0010-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch b/meta/recipes-core/glibc/glibc/0010-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch index 276f1fa4c2..243d3d8b15 100644 --- a/meta/recipes-core/glibc/glibc/0010-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch +++ b/meta/recipes-core/glibc/glibc/0010-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch @@ -1,4 +1,4 @@ -From d7e74670825330f5421a55f5aa2a1ce6fda7d7fb Mon Sep 17 00:00:00 2001 +From 73b1d72054bd068927e23ade86d94ae24e716811 Mon Sep 17 00:00:00 2001 From: Ting Liu <b28495@freescale.com> Date: Wed, 19 Dec 2012 04:39:57 -0600 Subject: [PATCH 10/26] eglibc: run libm-err-tab.pl with specific dirs in ${S} @@ -18,7 +18,7 @@ Signed-off-by: Ting Liu <b28495@freescale.com> 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/manual/Makefile b/manual/Makefile -index f2f694f..e062833 100644 +index 4ed63a8ef3..e89919eb19 100644 --- a/manual/Makefile +++ b/manual/Makefile @@ -105,7 +105,8 @@ $(objpfx)libm-err.texi: $(objpfx)stamp-libm-err @@ -32,5 +32,5 @@ index f2f694f..e062833 100644 touch $@ -- -2.10.2 +2.13.2 diff --git a/meta/recipes-core/glibc/glibc/0011-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch b/meta/recipes-core/glibc/glibc/0011-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch index 096dab5474..b0c410f9e3 100644 --- a/meta/recipes-core/glibc/glibc/0011-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch +++ b/meta/recipes-core/glibc/glibc/0011-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch @@ -1,4 +1,4 @@ -From d6e2076571263e45c48889896d3d94ff576df2be Mon Sep 17 00:00:00 2001 +From 4a5206a25219b85f4cc3a2e3cc7379d95e54df56 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 18 Mar 2015 00:24:46 +0000 Subject: [PATCH 11/26] __ieee754_sqrt{,f} are now inline functions and call @@ -14,7 +14,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sysdeps/powerpc/powerpc32/e6500/fpu/e_sqrt.c b/sysdeps/powerpc/powerpc32/e6500/fpu/e_sqrt.c -index 1c34244..7038a70 100644 +index 1c34244bd8..7038a70b47 100644 --- a/sysdeps/powerpc/powerpc32/e6500/fpu/e_sqrt.c +++ b/sysdeps/powerpc/powerpc32/e6500/fpu/e_sqrt.c @@ -41,10 +41,10 @@ static const float half = 0.5; @@ -40,7 +40,7 @@ index 1c34244..7038a70 100644 #define FMADD(a_, c_, b_) \ ({ double __r; \ diff --git a/sysdeps/powerpc/powerpc32/e6500/fpu/e_sqrtf.c b/sysdeps/powerpc/powerpc32/e6500/fpu/e_sqrtf.c -index 8126535..10de1f0 100644 +index 812653558f..10de1f0cc3 100644 --- a/sysdeps/powerpc/powerpc32/e6500/fpu/e_sqrtf.c +++ b/sysdeps/powerpc/powerpc32/e6500/fpu/e_sqrtf.c @@ -39,10 +39,10 @@ static const float threehalf = 1.5; @@ -57,5 +57,5 @@ index 8126535..10de1f0 100644 #endif { -- -2.10.2 +2.13.2 diff --git a/meta/recipes-core/glibc/glibc/0012-Make-ld-version-output-matching-grok-gold-s-output.patch b/meta/recipes-core/glibc/glibc/0012-Make-ld-version-output-matching-grok-gold-s-output.patch deleted file mode 100644 index 7728c61a9d..0000000000 --- a/meta/recipes-core/glibc/glibc/0012-Make-ld-version-output-matching-grok-gold-s-output.patch +++ /dev/null @@ -1,44 +0,0 @@ -From c0974c746e026650bef5d1940eb3f519765c77af Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 18 Mar 2015 00:25:45 +0000 -Subject: [PATCH 12/26] Make ld --version output matching grok gold's output - -adapted from from upstream branch roland/gold-vs-libc - -Upstream-Status: Backport - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - configure | 2 +- - configure.ac | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure b/configure -index 5cf3230..391f29d 100755 ---- a/configure -+++ b/configure -@@ -4555,7 +4555,7 @@ else - # Found it, now check the version. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking version of $LD" >&5 - $as_echo_n "checking version of $LD... " >&6; } -- ac_prog_version=`$LD --version 2>&1 | sed -n 's/^.*GNU ld.* \([0-9][0-9]*\.[0-9.]*\).*$/\1/p'` -+ ac_prog_version=`$LD --version 2>&1 | sed -n 's/^.*GNU [Bbinutilsd][^.]* \([0-9][0-9]*\.[0-9.]*\).*$/\1/p'` - case $ac_prog_version in - '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; - 2.1[0-9][0-9]*|2.2[2-9]*|2.[3-9][0-9]*|[3-9].*|[1-9][0-9]*) -diff --git a/configure.ac b/configure.ac -index d719fad..5b5877c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -990,7 +990,7 @@ AC_CHECK_PROG_VER(AS, $AS, --version, - [2.1[0-9][0-9]*|2.2[2-9]*|2.[3-9][0-9]*|[3-9].*|[1-9][0-9]*], - AS=: critic_missing="$critic_missing as") - AC_CHECK_PROG_VER(LD, $LD, --version, -- [GNU ld.* \([0-9][0-9]*\.[0-9.]*\)], -+ [GNU [Bbinutilsd][^.]* \([0-9][0-9]*\.[0-9.]*\)], - [2.1[0-9][0-9]*|2.2[2-9]*|2.[3-9][0-9]*|[3-9].*|[1-9][0-9]*], - LD=: critic_missing="$critic_missing ld") - --- -2.10.2 - diff --git a/meta/recipes-core/glibc/glibc/0013-sysdeps-gnu-configure.ac-handle-correctly-libc_cv_ro.patch b/meta/recipes-core/glibc/glibc/0012-sysdeps-gnu-configure.ac-handle-correctly-libc_cv_ro.patch similarity index 82% rename from meta/recipes-core/glibc/glibc/0013-sysdeps-gnu-configure.ac-handle-correctly-libc_cv_ro.patch rename to meta/recipes-core/glibc/glibc/0012-sysdeps-gnu-configure.ac-handle-correctly-libc_cv_ro.patch index 1c81c729db..98f8a1bd98 100644 --- a/meta/recipes-core/glibc/glibc/0013-sysdeps-gnu-configure.ac-handle-correctly-libc_cv_ro.patch +++ b/meta/recipes-core/glibc/glibc/0012-sysdeps-gnu-configure.ac-handle-correctly-libc_cv_ro.patch @@ -1,7 +1,7 @@ -From 2a12eadfd7940b6b0913de8e95d851254cce7953 Mon Sep 17 00:00:00 2001 +From 1d94b2fa2db30a23e72ed5a315b4b9b12a8f4bd9 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 18 Mar 2015 00:27:10 +0000 -Subject: [PATCH 13/26] sysdeps/gnu/configure.ac: handle correctly +Subject: [PATCH 12/26] sysdeps/gnu/configure.ac: handle correctly $libc_cv_rootsbindir Upstream-Status:Pending @@ -14,7 +14,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sysdeps/gnu/configure b/sysdeps/gnu/configure -index 71243ad..f578187 100644 +index 71243ad0c6..f578187576 100644 --- a/sysdeps/gnu/configure +++ b/sysdeps/gnu/configure @@ -32,6 +32,6 @@ case "$prefix" in @@ -26,7 +26,7 @@ index 71243ad..f578187 100644 ;; esac diff --git a/sysdeps/gnu/configure.ac b/sysdeps/gnu/configure.ac -index 634fe4d..3db1697 100644 +index 634fe4de2a..3db1697f4f 100644 --- a/sysdeps/gnu/configure.ac +++ b/sysdeps/gnu/configure.ac @@ -21,6 +21,6 @@ case "$prefix" in @@ -38,5 +38,5 @@ index 634fe4d..3db1697 100644 ;; esac -- -2.10.2 +2.13.2 diff --git a/meta/recipes-core/glibc/glibc/0014-Add-unused-attribute.patch b/meta/recipes-core/glibc/glibc/0013-Add-unused-attribute.patch similarity index 82% rename from meta/recipes-core/glibc/glibc/0014-Add-unused-attribute.patch rename to meta/recipes-core/glibc/glibc/0013-Add-unused-attribute.patch index b23e104ff8..8a283153f7 100644 --- a/meta/recipes-core/glibc/glibc/0014-Add-unused-attribute.patch +++ b/meta/recipes-core/glibc/glibc/0013-Add-unused-attribute.patch @@ -1,7 +1,7 @@ -From ec4f7763b30603b7ba0b70bd7750e34d442821b3 Mon Sep 17 00:00:00 2001 +From 2e1f44eaf38732300cf3cb484b7437d1ba787bdf Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 18 Mar 2015 00:28:41 +0000 -Subject: [PATCH 14/26] Add unused attribute +Subject: [PATCH 13/26] Add unused attribute Helps in avoiding gcc warning when header is is included in a source file which does not use both functions @@ -17,7 +17,7 @@ Upstream-Status: Pending 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iconv/gconv_charset.h b/iconv/gconv_charset.h -index 95cbce7..191a0dd 100644 +index 18d8bd6ae7..eb729da5d3 100644 --- a/iconv/gconv_charset.h +++ b/iconv/gconv_charset.h @@ -21,7 +21,7 @@ @@ -30,5 +30,5 @@ index 95cbce7..191a0dd 100644 { int slash_count = 0; -- -2.10.2 +2.13.2 diff --git a/meta/recipes-core/glibc/glibc/0015-yes-within-the-path-sets-wrong-config-variables.patch b/meta/recipes-core/glibc/glibc/0014-yes-within-the-path-sets-wrong-config-variables.patch similarity index 94% rename from meta/recipes-core/glibc/glibc/0015-yes-within-the-path-sets-wrong-config-variables.patch rename to meta/recipes-core/glibc/glibc/0014-yes-within-the-path-sets-wrong-config-variables.patch index 98d425a7bd..ea1f366a9b 100644 --- a/meta/recipes-core/glibc/glibc/0015-yes-within-the-path-sets-wrong-config-variables.patch +++ b/meta/recipes-core/glibc/glibc/0014-yes-within-the-path-sets-wrong-config-variables.patch @@ -1,7 +1,7 @@ -From 18d64951cbb68d8d75e8ef347cbd0e0a5c14604b Mon Sep 17 00:00:00 2001 +From 044579f48b760e5a8e42bf42e3ec8f8e5088f22e Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 18 Mar 2015 00:31:06 +0000 -Subject: [PATCH 15/26] 'yes' within the path sets wrong config variables +Subject: [PATCH 14/26] 'yes' within the path sets wrong config variables It seems that the 'AC_EGREP_CPP(yes...' example is quite popular but being such a short word to grep it is likely to produce @@ -29,7 +29,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 12 files changed, 28 insertions(+), 28 deletions(-) diff --git a/sysdeps/aarch64/configure b/sysdeps/aarch64/configure -index 5bd355a..3bc5537 100644 +index 5bd355a691..3bc5537bc0 100644 --- a/sysdeps/aarch64/configure +++ b/sysdeps/aarch64/configure @@ -148,12 +148,12 @@ else @@ -48,7 +48,7 @@ index 5bd355a..3bc5537 100644 else libc_cv_aarch64_be=no diff --git a/sysdeps/aarch64/configure.ac b/sysdeps/aarch64/configure.ac -index 7851dd4..6e92381 100644 +index 7851dd4dac..6e9238171f 100644 --- a/sysdeps/aarch64/configure.ac +++ b/sysdeps/aarch64/configure.ac @@ -10,8 +10,8 @@ GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory. @@ -63,7 +63,7 @@ index 7851dd4..6e92381 100644 ], libc_cv_aarch64_be=yes, libc_cv_aarch64_be=no)]) if test $libc_cv_aarch64_be = yes; then diff --git a/sysdeps/arm/configure b/sysdeps/arm/configure -index 431e843..e152461 100644 +index 431e843b2b..e152461138 100644 --- a/sysdeps/arm/configure +++ b/sysdeps/arm/configure @@ -151,12 +151,12 @@ else @@ -82,7 +82,7 @@ index 431e843..e152461 100644 else libc_cv_arm_pcs_vfp=no diff --git a/sysdeps/arm/configure.ac b/sysdeps/arm/configure.ac -index 90cdd69..05a262b 100644 +index 90cdd69c75..05a262ba00 100644 --- a/sysdeps/arm/configure.ac +++ b/sysdeps/arm/configure.ac @@ -15,8 +15,8 @@ AC_DEFINE(PI_STATIC_AND_HIDDEN) @@ -97,7 +97,7 @@ index 90cdd69..05a262b 100644 ], libc_cv_arm_pcs_vfp=yes, libc_cv_arm_pcs_vfp=no)]) if test $libc_cv_arm_pcs_vfp = yes; then diff --git a/sysdeps/mips/configure b/sysdeps/mips/configure -index 4e13248..f14af95 100644 +index 4e13248c03..f14af952d0 100644 --- a/sysdeps/mips/configure +++ b/sysdeps/mips/configure @@ -143,11 +143,11 @@ else @@ -115,7 +115,7 @@ index 4e13248..f14af95 100644 else libc_cv_mips_nan2008=no diff --git a/sysdeps/mips/configure.ac b/sysdeps/mips/configure.ac -index bcbdaff..ad3057f 100644 +index bcbdaffd9f..ad3057f4cc 100644 --- a/sysdeps/mips/configure.ac +++ b/sysdeps/mips/configure.ac @@ -6,9 +6,9 @@ dnl position independent way. @@ -131,7 +131,7 @@ index bcbdaff..ad3057f 100644 if test x$libc_cv_mips_nan2008 = xyes; then AC_DEFINE(HAVE_MIPS_NAN2008) diff --git a/sysdeps/nios2/configure b/sysdeps/nios2/configure -index 14c8a3a..dde3814 100644 +index 14c8a3a014..dde3814ef2 100644 --- a/sysdeps/nios2/configure +++ b/sysdeps/nios2/configure @@ -142,12 +142,12 @@ else @@ -150,7 +150,7 @@ index 14c8a3a..dde3814 100644 else libc_cv_nios2_be=no diff --git a/sysdeps/nios2/configure.ac b/sysdeps/nios2/configure.ac -index f05f438..dc86399 100644 +index f05f43802b..dc8639902d 100644 --- a/sysdeps/nios2/configure.ac +++ b/sysdeps/nios2/configure.ac @@ -4,8 +4,8 @@ GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory. @@ -165,7 +165,7 @@ index f05f438..dc86399 100644 ], libc_cv_nios2_be=yes, libc_cv_nios2_be=no)]) if test $libc_cv_nios2_be = yes; then diff --git a/sysdeps/unix/sysv/linux/mips/configure b/sysdeps/unix/sysv/linux/mips/configure -index a5513fa..283b293 100644 +index a5513fad48..283b293ff3 100644 --- a/sysdeps/unix/sysv/linux/mips/configure +++ b/sysdeps/unix/sysv/linux/mips/configure @@ -414,11 +414,11 @@ else @@ -183,7 +183,7 @@ index a5513fa..283b293 100644 else libc_cv_mips_nan2008=no diff --git a/sysdeps/unix/sysv/linux/mips/configure.ac b/sysdeps/unix/sysv/linux/mips/configure.ac -index 9147aa4..7898e24 100644 +index 9147aa4582..7898e24738 100644 --- a/sysdeps/unix/sysv/linux/mips/configure.ac +++ b/sysdeps/unix/sysv/linux/mips/configure.ac @@ -105,9 +105,9 @@ AC_COMPILE_IFELSE( @@ -199,7 +199,7 @@ index 9147aa4..7898e24 100644 libc_mips_nan= diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure b/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure -index af06970..27b8c1b 100644 +index 4e7fcf1d97..44a9cb3791 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure @@ -155,12 +155,12 @@ else @@ -233,7 +233,7 @@ index af06970..27b8c1b 100644 else libc_cv_ppc64_def_call_elf=no diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure.ac b/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure.ac -index 0822915..9a32fdd 100644 +index f9cba6e15d..b21f72f1e4 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure.ac +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure.ac @@ -6,8 +6,8 @@ LIBC_SLIBDIR_RTLDDIR([lib64], [lib64]) @@ -259,5 +259,5 @@ index 0822915..9a32fdd 100644 ], libc_cv_ppc64_def_call_elf=yes, libc_cv_ppc64_def_call_elf=no)]) if test $libc_cv_ppc64_def_call_elf = no; then -- -2.10.2 +2.13.2 diff --git a/meta/recipes-core/glibc/glibc/0016-timezone-re-written-tzselect-as-posix-sh.patch b/meta/recipes-core/glibc/glibc/0015-timezone-re-written-tzselect-as-posix-sh.patch similarity index 81% rename from meta/recipes-core/glibc/glibc/0016-timezone-re-written-tzselect-as-posix-sh.patch rename to meta/recipes-core/glibc/glibc/0015-timezone-re-written-tzselect-as-posix-sh.patch index 426a2c0c2d..35cd9d9c91 100644 --- a/meta/recipes-core/glibc/glibc/0016-timezone-re-written-tzselect-as-posix-sh.patch +++ b/meta/recipes-core/glibc/glibc/0015-timezone-re-written-tzselect-as-posix-sh.patch @@ -1,7 +1,7 @@ -From 2bed515b9f9f613ae0db9b9607d8fa60a4afca5b Mon Sep 17 00:00:00 2001 +From 25a728a6ea67336e688fd3796a9d6c5452ad4a15 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 18 Mar 2015 00:33:03 +0000 -Subject: [PATCH 16/26] timezone: re-written tzselect as posix sh +Subject: [PATCH 15/26] timezone: re-written tzselect as posix sh To avoid the bash dependency. @@ -15,10 +15,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/timezone/Makefile b/timezone/Makefile -index dee7568..66a50be 100644 +index d6cc7ba357..e4ead6e1a7 100644 --- a/timezone/Makefile +++ b/timezone/Makefile -@@ -120,7 +120,7 @@ $(testdata)/XT%: testdata/XT% +@@ -122,7 +122,7 @@ $(testdata)/XT%: testdata/XT% cp $< $@ $(objpfx)tzselect: tzselect.ksh $(common-objpfx)config.make @@ -28,7 +28,7 @@ index dee7568..66a50be 100644 -e '/TZVERSION=/s|see_Makefile|"$(version)"|' \ -e '/PKGVERSION=/s|=.*|="$(PKGVERSION)"|' \ diff --git a/timezone/tzselect.ksh b/timezone/tzselect.ksh -index 2c3b2f4..0c04a61 100755 +index d2c3a6d1dd..089679f306 100755 --- a/timezone/tzselect.ksh +++ b/timezone/tzselect.ksh @@ -35,7 +35,7 @@ REPORT_BUGS_TO=tz@iana.org @@ -41,5 +41,5 @@ index 2c3b2f4..0c04a61 100755 # Output one argument as-is to standard output. # Safer than 'echo', which can mishandle '\' or leading '-'. -- -2.10.2 +2.13.2 diff --git a/meta/recipes-core/glibc/glibc/0017-Remove-bash-dependency-for-nscd-init-script.patch b/meta/recipes-core/glibc/glibc/0016-Remove-bash-dependency-for-nscd-init-script.patch similarity index 89% rename from meta/recipes-core/glibc/glibc/0017-Remove-bash-dependency-for-nscd-init-script.patch rename to meta/recipes-core/glibc/glibc/0016-Remove-bash-dependency-for-nscd-init-script.patch index e44be894f6..fb57f04100 100644 --- a/meta/recipes-core/glibc/glibc/0017-Remove-bash-dependency-for-nscd-init-script.patch +++ b/meta/recipes-core/glibc/glibc/0016-Remove-bash-dependency-for-nscd-init-script.patch @@ -1,20 +1,21 @@ -From c8814875b362efbfd778345d0d2777478bf11a30 Mon Sep 17 00:00:00 2001 +From 6663ac955bc90969f470b84ecd4a41da8b6561d3 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Thu, 31 Dec 2015 14:33:02 -0800 -Subject: [PATCH 17/26] Remove bash dependency for nscd init script +Subject: [PATCH 16/26] Remove bash dependency for nscd init script The nscd init script uses #! /bin/bash but only really uses one bashism (translated strings), so remove them and switch the shell to #!/bin/sh. Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Khem Raj <raj.khem@gmail.com> -Upstream-Status: Inappropriate --- +Upstream-Status: Pending + nscd/nscd.init | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/nscd/nscd.init b/nscd/nscd.init -index a882da7..b02986e 100644 +index a882da7d8b..b02986ec15 100644 --- a/nscd/nscd.init +++ b/nscd/nscd.init @@ -1,4 +1,4 @@ @@ -70,5 +71,5 @@ index a882da7..b02986e 100644 ;; esac -- -2.10.2 +2.13.2 diff --git a/meta/recipes-core/glibc/glibc/0018-eglibc-Cross-building-and-testing-instructions.patch b/meta/recipes-core/glibc/glibc/0017-eglibc-Cross-building-and-testing-instructions.patch similarity index 99% rename from meta/recipes-core/glibc/glibc/0018-eglibc-Cross-building-and-testing-instructions.patch rename to meta/recipes-core/glibc/glibc/0017-eglibc-Cross-building-and-testing-instructions.patch index 2ec01f05c7..654a1ed743 100644 --- a/meta/recipes-core/glibc/glibc/0018-eglibc-Cross-building-and-testing-instructions.patch +++ b/meta/recipes-core/glibc/glibc/0017-eglibc-Cross-building-and-testing-instructions.patch @@ -1,7 +1,7 @@ -From df96d6b61bb60f13cd3d4989d1afc56d705f4a33 Mon Sep 17 00:00:00 2001 +From 71276db217555ff4c215068a8c24a758e45997a1 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 18 Mar 2015 00:42:58 +0000 -Subject: [PATCH 18/26] eglibc: Cross building and testing instructions +Subject: [PATCH 17/26] eglibc: Cross building and testing instructions Ported from eglibc Upstream-Status: Pending @@ -16,7 +16,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> diff --git a/GLIBC.cross-building b/GLIBC.cross-building new file mode 100644 -index 0000000..e6e0da1 +index 0000000000..e6e0da1aaf --- /dev/null +++ b/GLIBC.cross-building @@ -0,0 +1,383 @@ @@ -405,7 +405,7 @@ index 0000000..e6e0da1 + Hello, C++ world! diff --git a/GLIBC.cross-testing b/GLIBC.cross-testing new file mode 100644 -index 0000000..b67b468 +index 0000000000..b67b468466 --- /dev/null +++ b/GLIBC.cross-testing @@ -0,0 +1,205 @@ @@ -615,5 +615,5 @@ index 0000000..b67b468 + simply place copies of these libraries in the top GLIBC build + directory. -- -2.10.2 +2.13.2 diff --git a/meta/recipes-core/glibc/glibc/0019-eglibc-Help-bootstrap-cross-toolchain.patch b/meta/recipes-core/glibc/glibc/0018-eglibc-Help-bootstrap-cross-toolchain.patch similarity index 94% rename from meta/recipes-core/glibc/glibc/0019-eglibc-Help-bootstrap-cross-toolchain.patch rename to meta/recipes-core/glibc/glibc/0018-eglibc-Help-bootstrap-cross-toolchain.patch index f5921bb7be..951e8d4aa8 100644 --- a/meta/recipes-core/glibc/glibc/0019-eglibc-Help-bootstrap-cross-toolchain.patch +++ b/meta/recipes-core/glibc/glibc/0018-eglibc-Help-bootstrap-cross-toolchain.patch @@ -1,7 +1,7 @@ -From 2cb7e3cae4020f431d426ad1740bb25506cde899 Mon Sep 17 00:00:00 2001 +From bba4e2815d0243adda15c170a6b5daf76cf0708b Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 18 Mar 2015 00:49:28 +0000 -Subject: [PATCH 19/26] eglibc: Help bootstrap cross toolchain +Subject: [PATCH 18/26] eglibc: Help bootstrap cross toolchain Taken from EGLIBC, r1484 + r1525 @@ -29,7 +29,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> create mode 100644 include/stubs-bootstrap.h diff --git a/Makefile b/Makefile -index 1ae3281..26ab7bf 100644 +index 3e0ae6f43b..24dc66d17c 100644 --- a/Makefile +++ b/Makefile @@ -70,9 +70,18 @@ subdir-dirs = include @@ -79,7 +79,7 @@ index 1ae3281..26ab7bf 100644 # Since stubs.h is never needed when building the library, we simplify the diff --git a/include/stubs-bootstrap.h b/include/stubs-bootstrap.h new file mode 100644 -index 0000000..1d2b669 +index 0000000000..1d2b669aff --- /dev/null +++ b/include/stubs-bootstrap.h @@ -0,0 +1,12 @@ @@ -96,5 +96,5 @@ index 0000000..1d2b669 + EGLIBC subdir 'stubs' make targets, on every .o file in EGLIBC, but + an empty stubs.h like this will do fine for GCC. */ -- -2.10.2 +2.13.2 diff --git a/meta/recipes-core/glibc/glibc/0021-eglibc-Clear-cache-lines-on-ppc8xx.patch b/meta/recipes-core/glibc/glibc/0019-eglibc-Clear-cache-lines-on-ppc8xx.patch similarity index 94% rename from meta/recipes-core/glibc/glibc/0021-eglibc-Clear-cache-lines-on-ppc8xx.patch rename to meta/recipes-core/glibc/glibc/0019-eglibc-Clear-cache-lines-on-ppc8xx.patch index a9a73916f3..91b92f746c 100644 --- a/meta/recipes-core/glibc/glibc/0021-eglibc-Clear-cache-lines-on-ppc8xx.patch +++ b/meta/recipes-core/glibc/glibc/0019-eglibc-Clear-cache-lines-on-ppc8xx.patch @@ -1,7 +1,7 @@ -From 000ab518aa1269714bc0a9a4633b0a538fae91d9 Mon Sep 17 00:00:00 2001 +From 0089bf40b3c247a16d1aa55cc6618d41061cd51b Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Thu, 31 Dec 2015 15:15:09 -0800 -Subject: [PATCH 21/26] eglibc: Clear cache lines on ppc8xx +Subject: [PATCH 19/26] eglibc: Clear cache lines on ppc8xx 2007-06-13 Nathan Sidwell <nathan@codesourcery.com> Mark Shinwell <shinwell@codesourcery.com> @@ -21,7 +21,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/sysdeps/unix/sysv/linux/powerpc/dl-sysdep.c b/sysdeps/unix/sysv/linux/powerpc/dl-sysdep.c -index 98ec2b3..b384ae0 100644 +index 23f5d5d388..7e45288db7 100644 --- a/sysdeps/unix/sysv/linux/powerpc/dl-sysdep.c +++ b/sysdeps/unix/sysv/linux/powerpc/dl-sysdep.c @@ -24,9 +24,21 @@ int __cache_line_size attribute_hidden; @@ -48,7 +48,7 @@ index 98ec2b3..b384ae0 100644 break; diff --git a/sysdeps/unix/sysv/linux/powerpc/libc-start.c b/sysdeps/unix/sysv/linux/powerpc/libc-start.c -index 0efd297..8cc0ef8 100644 +index ad036c1e4b..afee56a3da 100644 --- a/sysdeps/unix/sysv/linux/powerpc/libc-start.c +++ b/sysdeps/unix/sysv/linux/powerpc/libc-start.c @@ -73,11 +73,25 @@ __libc_start_main (int argc, char **argv, @@ -79,5 +79,5 @@ index 0efd297..8cc0ef8 100644 break; #ifndef SHARED -- -2.10.2 +2.13.2 diff --git a/meta/recipes-core/glibc/glibc/0022-eglibc-Resolve-__fpscr_values-on-SH4.patch b/meta/recipes-core/glibc/glibc/0020-eglibc-Resolve-__fpscr_values-on-SH4.patch similarity index 88% rename from meta/recipes-core/glibc/glibc/0022-eglibc-Resolve-__fpscr_values-on-SH4.patch rename to meta/recipes-core/glibc/glibc/0020-eglibc-Resolve-__fpscr_values-on-SH4.patch index c0cd5b0d12..438a02f39f 100644 --- a/meta/recipes-core/glibc/glibc/0022-eglibc-Resolve-__fpscr_values-on-SH4.patch +++ b/meta/recipes-core/glibc/glibc/0020-eglibc-Resolve-__fpscr_values-on-SH4.patch @@ -1,7 +1,7 @@ -From a50c6e80543fb4cbc589978c11fe846bf4a94492 Mon Sep 17 00:00:00 2001 +From 0c04427c68e661952b1094d079ee3c1420d4435c Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 18 Mar 2015 00:55:53 +0000 -Subject: [PATCH 22/26] eglibc: Resolve __fpscr_values on SH4 +Subject: [PATCH 20/26] eglibc: Resolve __fpscr_values on SH4 2010-09-29 Nobuhiro Iwamatsu <iwamatsu@nigauri.org> Andrew Stubbs <ams@codesourcery.com> @@ -21,7 +21,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 2 files changed, 12 insertions(+) diff --git a/sysdeps/unix/sysv/linux/sh/Versions b/sysdeps/unix/sysv/linux/sh/Versions -index e0938c4..ca1d7da 100644 +index e0938c4165..ca1d7da339 100644 --- a/sysdeps/unix/sysv/linux/sh/Versions +++ b/sysdeps/unix/sysv/linux/sh/Versions @@ -2,6 +2,7 @@ libc { @@ -33,7 +33,7 @@ index e0938c4..ca1d7da 100644 # a* alphasort64; diff --git a/sysdeps/unix/sysv/linux/sh/sysdep.S b/sysdeps/unix/sysv/linux/sh/sysdep.S -index 0024d79..d1db7e4 100644 +index 5f11bc737b..2fd217b00b 100644 --- a/sysdeps/unix/sysv/linux/sh/sysdep.S +++ b/sysdeps/unix/sysv/linux/sh/sysdep.S @@ -30,3 +30,14 @@ ENTRY (__syscall_error) @@ -52,5 +52,5 @@ index 0024d79..d1db7e4 100644 +weak_alias (___fpscr_values, __fpscr_values) + -- -2.10.2 +2.13.2 diff --git a/meta/recipes-core/glibc/glibc/0023-eglibc-Install-PIC-archives.patch b/meta/recipes-core/glibc/glibc/0021-eglibc-Install-PIC-archives.patch similarity index 90% rename from meta/recipes-core/glibc/glibc/0023-eglibc-Install-PIC-archives.patch rename to meta/recipes-core/glibc/glibc/0021-eglibc-Install-PIC-archives.patch index c3e571f8a9..26c5edb2c9 100644 --- a/meta/recipes-core/glibc/glibc/0023-eglibc-Install-PIC-archives.patch +++ b/meta/recipes-core/glibc/glibc/0021-eglibc-Install-PIC-archives.patch @@ -1,7 +1,7 @@ -From 101568daf48d99e71b280a2fdd85460fe740d583 Mon Sep 17 00:00:00 2001 +From a0efe850b42b2a4351e0d6c7b025a47677375db9 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 18 Mar 2015 01:57:01 +0000 -Subject: [PATCH 23/26] eglibc: Install PIC archives +Subject: [PATCH 21/26] eglibc: Install PIC archives Forward port from eglibc @@ -29,10 +29,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 40 insertions(+), 2 deletions(-) diff --git a/Makerules b/Makerules -index 61a0240..373e628 100644 +index 9bb707c168..74cbefb9ba 100644 --- a/Makerules +++ b/Makerules -@@ -762,6 +762,9 @@ ifeq ($(build-shared),yes) +@@ -775,6 +775,9 @@ ifeq ($(build-shared),yes) $(common-objpfx)libc.so: $(common-objpfx)libc.map endif common-generated += libc.so libc_pic.os @@ -42,7 +42,7 @@ index 61a0240..373e628 100644 ifdef libc.so-version $(common-objpfx)libc.so$(libc.so-version): $(common-objpfx)libc.so $(make-link) -@@ -1004,6 +1007,7 @@ endif +@@ -1026,6 +1029,7 @@ endif install: check-install-supported @@ -50,7 +50,7 @@ index 61a0240..373e628 100644 install: $(installed-libcs) $(installed-libcs): $(inst_libdir)/lib$(libprefix)%: lib $(+force) $(make-target-directory) -@@ -1032,6 +1036,22 @@ versioned := $(strip $(foreach so,$(install-lib.so),\ +@@ -1054,6 +1058,22 @@ versioned := $(strip $(foreach so,$(install-lib.so),\ install-lib.so-versioned := $(filter $(versioned), $(install-lib.so)) install-lib.so-unversioned := $(filter-out $(versioned), $(install-lib.so)) @@ -73,7 +73,7 @@ index 61a0240..373e628 100644 # For versioned libraries, we install three files: # $(inst_libdir)/libfoo.so -- for linking, symlink or ld script # $(inst_slibdir)/libfoo.so.NN -- for loading by SONAME, symlink -@@ -1275,9 +1295,22 @@ $(addprefix $(inst_includedir)/,$(headers-nonh)): $(inst_includedir)/%: \ +@@ -1298,9 +1318,22 @@ $(addprefix $(inst_includedir)/,$(headers-nonh)): $(inst_includedir)/%: \ endif # headers-nonh endif # headers @@ -97,7 +97,7 @@ index 61a0240..373e628 100644 install-bin-nosubdir: $(addprefix $(inst_bindir)/,$(install-bin)) install-bin-script-nosubdir: $(addprefix $(inst_bindir)/,$(install-bin-script)) install-rootsbin-nosubdir: \ -@@ -1290,6 +1323,10 @@ install-data-nosubdir: $(addprefix $(inst_datadir)/,$(install-data)) +@@ -1313,6 +1346,10 @@ install-data-nosubdir: $(addprefix $(inst_datadir)/,$(install-data)) install-headers-nosubdir: $(addprefix $(inst_includedir)/,$(headers)) install-others-nosubdir: $(install-others) install-others-programs-nosubdir: $(install-others-programs) @@ -108,7 +108,7 @@ index 61a0240..373e628 100644 # We need all the `-nosubdir' targets so that `install' in the parent # doesn't depend on several things which each iterate over the subdirs. -@@ -1299,7 +1336,8 @@ install-%:: install-%-nosubdir ; +@@ -1322,7 +1359,8 @@ install-%:: install-%-nosubdir ; .PHONY: install install-no-libc.a-nosubdir install-no-libc.a-nosubdir: install-headers-nosubdir install-data-nosubdir \ @@ -119,5 +119,5 @@ index 61a0240..373e628 100644 install-no-libc.a-nosubdir: install-bin-nosubdir install-bin-script-nosubdir \ install-rootsbin-nosubdir install-sbin-nosubdir \ -- -2.10.2 +2.13.2 diff --git a/meta/recipes-core/glibc/glibc/0024-eglibc-Forward-port-cross-locale-generation-support.patch b/meta/recipes-core/glibc/glibc/0022-eglibc-Forward-port-cross-locale-generation-support.patch similarity index 96% rename from meta/recipes-core/glibc/glibc/0024-eglibc-Forward-port-cross-locale-generation-support.patch rename to meta/recipes-core/glibc/glibc/0022-eglibc-Forward-port-cross-locale-generation-support.patch index 3399890de1..11eb9346ed 100644 --- a/meta/recipes-core/glibc/glibc/0024-eglibc-Forward-port-cross-locale-generation-support.patch +++ b/meta/recipes-core/glibc/glibc/0022-eglibc-Forward-port-cross-locale-generation-support.patch @@ -1,7 +1,7 @@ -From 82516e3ed372f618c886a2de4f9498f597aa8a8b Mon Sep 17 00:00:00 2001 +From 6de1dc8197535dcf47e359a7860f58347ca08ef5 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 18 Mar 2015 01:33:49 +0000 -Subject: [PATCH 24/26] eglibc: Forward port cross locale generation support +Subject: [PATCH 22/26] eglibc: Forward port cross locale generation support Upstream-Status: Pending @@ -23,11 +23,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> create mode 100644 locale/catnames.c diff --git a/locale/Makefile b/locale/Makefile -index c5379e6..c98c675 100644 +index 98ee76272d..bc3afb2248 100644 --- a/locale/Makefile +++ b/locale/Makefile -@@ -25,7 +25,8 @@ include ../Makeconfig - headers = locale.h bits/locale.h langinfo.h xlocale.h +@@ -26,7 +26,8 @@ headers = langinfo.h locale.h bits/locale.h \ + bits/types/locale_t.h bits/types/__locale_t.h routines = setlocale findlocale loadlocale loadarchive \ localeconv nl_langinfo nl_langinfo_l mb_cur_max \ - newlocale duplocale freelocale uselocale @@ -38,7 +38,7 @@ index c5379e6..c98c675 100644 address telephone measurement identification collate diff --git a/locale/catnames.c b/locale/catnames.c new file mode 100644 -index 0000000..9fad357 +index 0000000000..9fad357db1 --- /dev/null +++ b/locale/catnames.c @@ -0,0 +1,48 @@ @@ -91,10 +91,10 @@ index 0000000..9fad357 + [LC_ALL] = sizeof ("LC_ALL") - 1 + }; diff --git a/locale/localeinfo.h b/locale/localeinfo.h -index 1f4da92..7f68935 100644 +index 4e1c8c568a..f7ed946f1c 100644 --- a/locale/localeinfo.h +++ b/locale/localeinfo.h -@@ -224,7 +224,7 @@ __libc_tsd_define (extern, __locale_t, LOCALE) +@@ -224,7 +224,7 @@ __libc_tsd_define (extern, locale_t, LOCALE) unused. We can manage this playing some tricks with weak references. But with thread-local locale settings, it becomes quite ungainly unless we can use __thread variables. So only in that case do we attempt this. */ @@ -104,7 +104,7 @@ index 1f4da92..7f68935 100644 # define NL_CURRENT_INDIRECT 1 #endif diff --git a/locale/programs/charmap-dir.c b/locale/programs/charmap-dir.c -index 99fcd35..5e528dc 100644 +index e55ab86e28..0f87e6dd28 100644 --- a/locale/programs/charmap-dir.c +++ b/locale/programs/charmap-dir.c @@ -19,7 +19,9 @@ @@ -150,7 +150,7 @@ index 99fcd35..5e528dc 100644 return NULL; } diff --git a/locale/programs/ld-collate.c b/locale/programs/ld-collate.c -index 1e125f6..3b2867f 100644 +index cec848cb7c..fcd768eb7d 100644 --- a/locale/programs/ld-collate.c +++ b/locale/programs/ld-collate.c @@ -350,7 +350,7 @@ new_element (struct locale_collate_t *collate, const char *mbs, size_t mbslen, @@ -199,7 +199,7 @@ index 1e125f6..3b2867f 100644 == runp->wcnext->wcs[runp->nwcs - 1] + 1)); diff --git a/locale/programs/ld-ctype.c b/locale/programs/ld-ctype.c -index 0fd141c..68136e6 100644 +index df266c20d6..05c0152ec9 100644 --- a/locale/programs/ld-ctype.c +++ b/locale/programs/ld-ctype.c @@ -926,7 +926,7 @@ ctype_output (struct localedef_t *locale, const struct charmap_t *charmap, @@ -281,7 +281,7 @@ index 0fd141c..68136e6 100644 srunp = srunp->next; } diff --git a/locale/programs/ld-time.c b/locale/programs/ld-time.c -index 87531bc..5f2c266 100644 +index 32e9c41e35..6a61fcedeb 100644 --- a/locale/programs/ld-time.c +++ b/locale/programs/ld-time.c @@ -215,8 +215,10 @@ No definition for %s category found"), "LC_TIME")); @@ -350,7 +350,7 @@ index 87531bc..5f2c266 100644 diff --git a/locale/programs/linereader.c b/locale/programs/linereader.c -index b885f65..0afb631 100644 +index 52b340963a..1a8bce17b4 100644 --- a/locale/programs/linereader.c +++ b/locale/programs/linereader.c @@ -595,7 +595,7 @@ get_string (struct linereader *lr, const struct charmap_t *charmap, @@ -363,7 +363,7 @@ index b885f65..0afb631 100644 size_t bufmax = 56; diff --git a/locale/programs/localedef.c b/locale/programs/localedef.c -index b4c48f1..ed08d48 100644 +index 6acc1342c7..df87740f8b 100644 --- a/locale/programs/localedef.c +++ b/locale/programs/localedef.c @@ -108,6 +108,7 @@ void (*argp_program_version_hook) (FILE *, struct argp_state *) = print_version; @@ -409,7 +409,7 @@ index b4c48f1..ed08d48 100644 force_output = 1; break; diff --git a/locale/programs/locfile.c b/locale/programs/locfile.c -index 32f5cd2..02967b0 100644 +index 0990ef11be..683422c908 100644 --- a/locale/programs/locfile.c +++ b/locale/programs/locfile.c @@ -544,6 +544,9 @@ compare_files (const char *filename1, const char *filename2, size_t size, @@ -432,7 +432,7 @@ index 32f5cd2..02967b0 100644 /* Record that FILE's next element is the 32-bit integer VALUE. */ diff --git a/locale/programs/locfile.h b/locale/programs/locfile.h -index a3dd904..2c7763a 100644 +index 3407e13c13..0bb556caf8 100644 --- a/locale/programs/locfile.h +++ b/locale/programs/locfile.h @@ -71,6 +71,8 @@ extern void write_all_categories (struct localedef_t *definitions, @@ -521,7 +521,7 @@ index a3dd904..2c7763a 100644 + #endif /* locfile.h */ diff --git a/locale/setlocale.c b/locale/setlocale.c -index 69b3141..1cef0be 100644 +index 19acc4b2c7..c89d3b87ad 100644 --- a/locale/setlocale.c +++ b/locale/setlocale.c @@ -64,36 +64,6 @@ static char *const _nl_current_used[] = @@ -562,5 +562,5 @@ index 69b3141..1cef0be 100644 # define WEAK_POSTLOAD(postload) weak_extern (postload) #else -- -2.10.2 +2.13.2 diff --git a/meta/recipes-core/glibc/glibc/0025-Define-DUMMY_LOCALE_T-if-not-defined.patch b/meta/recipes-core/glibc/glibc/0023-Define-DUMMY_LOCALE_T-if-not-defined.patch similarity index 80% rename from meta/recipes-core/glibc/glibc/0025-Define-DUMMY_LOCALE_T-if-not-defined.patch rename to meta/recipes-core/glibc/glibc/0023-Define-DUMMY_LOCALE_T-if-not-defined.patch index 1f0f5d4da2..d3c7373dde 100644 --- a/meta/recipes-core/glibc/glibc/0025-Define-DUMMY_LOCALE_T-if-not-defined.patch +++ b/meta/recipes-core/glibc/glibc/0023-Define-DUMMY_LOCALE_T-if-not-defined.patch @@ -1,7 +1,7 @@ -From c2d8cdeab116caacdfedb35eeb3e743b44807bec Mon Sep 17 00:00:00 2001 +From c6b9fca34a9284b41500357c06b4de5b6431ab56 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 20 Apr 2016 21:11:00 -0700 -Subject: [PATCH 25/26] Define DUMMY_LOCALE_T if not defined +Subject: [PATCH 23/26] Define DUMMY_LOCALE_T if not defined This is a hack to fix building the locale bits on an older CentOs 5.X machine @@ -14,7 +14,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 3 insertions(+) diff --git a/locale/programs/config.h b/locale/programs/config.h -index f606365..0e5f8c3 100644 +index 5b416be0d8..79e66eed5e 100644 --- a/locale/programs/config.h +++ b/locale/programs/config.h @@ -19,6 +19,9 @@ @@ -28,5 +28,5 @@ index f606365..0e5f8c3 100644 #define PACKAGE _libc_intl_domainname #ifndef VERSION -- -2.10.2 +2.13.2 diff --git a/meta/recipes-core/glibc/glibc/0020-eglibc-cherry-picked-from.patch b/meta/recipes-core/glibc/glibc/0024-local-dynamic-resolvconf.patch similarity index 49% rename from meta/recipes-core/glibc/glibc/0020-eglibc-cherry-picked-from.patch rename to meta/recipes-core/glibc/glibc/0024-local-dynamic-resolvconf.patch index 43445739b1..592ac7a552 100644 --- a/meta/recipes-core/glibc/glibc/0020-eglibc-cherry-picked-from.patch +++ b/meta/recipes-core/glibc/glibc/0024-local-dynamic-resolvconf.patch @@ -1,24 +1,27 @@ -From b2ed906ec864583b43379ef9ad2b5630c1232565 Mon Sep 17 00:00:00 2001 +From e77b519ebcd9fed263e963b5d4c201039b04eaea Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 31 Dec 2015 15:10:33 -0800 -Subject: [PATCH 20/26] eglibc: cherry-picked from +Date: Fri, 23 Jun 2017 14:21:44 -0700 +Subject: [PATCH 24/26] local dynamic resolvconf + +Forwarded ported from eglibc http://www.eglibc.org/archives/patches/msg00772.html -Not yet merged into glibc +Fixes +https://sourceware.org/bugzilla/show_bug.cgi?id=984 Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> --- - resolv/res_libc.c | 14 +++++++++++++- - 1 file changed, 13 insertions(+), 1 deletion(-) + resolv/res_libc.c | 15 ++++++++++++++- + 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/resolv/res_libc.c b/resolv/res_libc.c -index a4b376f..3256e12 100644 +index 3d7b4f72d0..dac6de02f8 100644 --- a/resolv/res_libc.c +++ b/resolv/res_libc.c -@@ -21,11 +21,13 @@ +@@ -36,19 +36,20 @@ #include <atomic.h> #include <limits.h> #include <sys/types.h> @@ -27,12 +30,12 @@ index a4b376f..3256e12 100644 #include <arpa/nameser.h> #include <resolv.h> #include <libc-lock.h> + #include <resolv-internal.h> +__libc_lock_define_initialized (static, lock); - extern unsigned long long int __res_initstamp attribute_hidden; /* We have atomic increment operations on 64-bit platforms. */ #if __WORDSIZE == 64 -@@ -33,7 +35,6 @@ extern unsigned long long int __res_initstamp attribute_hidden; + # define atomicinclock(lock) (void) 0 # define atomicincunlock(lock) (void) 0 # define atomicinc(var) catomic_increment (&(var)) #else @@ -40,25 +43,27 @@ index a4b376f..3256e12 100644 # define atomicinclock(lock) __libc_lock_lock (lock) # define atomicincunlock(lock) __libc_lock_unlock (lock) # define atomicinc(var) ++var -@@ -92,7 +93,18 @@ res_init(void) { +@@ -104,8 +105,20 @@ res_init (void) int __res_maybe_init (res_state resp, int preinit) { -+ static time_t last_mtime; -+ struct stat statbuf; -+ int ret; ++ static time_t last_mtime; ++ struct stat statbuf; ++ int ret; + - if (resp->options & RES_INIT) { -+ ret = stat (_PATH_RESCONF, &statbuf); -+ __libc_lock_lock (lock); -+ if ((ret == 0) && (last_mtime != statbuf.st_mtime)) { -+ last_mtime = statbuf.st_mtime; -+ atomicinc (__res_initstamp); -+ } -+ __libc_lock_unlock (lock); - if (__res_initstamp != resp->_u._ext.initstamp) { - if (resp->nscount > 0) - __res_iclose (resp, true); + if (resp->options & RES_INIT) + { ++ ret = stat (_PATH_RESCONF, &statbuf); ++ __libc_lock_lock (lock); ++ if ((ret == 0) && (last_mtime != statbuf.st_mtime)) ++ { ++ last_mtime = statbuf.st_mtime; ++ atomicinc (__res_initstamp); ++ } ++ __libc_lock_unlock (lock); + if (__res_initstamp != resp->_u._ext.initstamp) + { + if (resp->nscount > 0) -- -2.10.2 +2.13.2 diff --git a/meta/recipes-core/glibc/glibc/0026-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch b/meta/recipes-core/glibc/glibc/0025-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch similarity index 89% rename from meta/recipes-core/glibc/glibc/0026-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch rename to meta/recipes-core/glibc/glibc/0025-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch index 852f5304ce..6c181c8843 100644 --- a/meta/recipes-core/glibc/glibc/0026-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch +++ b/meta/recipes-core/glibc/glibc/0025-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch @@ -1,7 +1,7 @@ -From fb315c197cca61299a6f6588ea3460145c255d06 Mon Sep 17 00:00:00 2001 +From ab21138ac31d14552e7bf3432a9f92a2e33b72c0 Mon Sep 17 00:00:00 2001 From: Mark Hatle <mark.hatle@windriver.com> Date: Thu, 18 Aug 2016 14:07:58 -0500 -Subject: [PATCH 26/26] elf/dl-deps.c: Make _dl_build_local_scope breadth first +Subject: [PATCH 25/26] elf/dl-deps.c: Make _dl_build_local_scope breadth first According to the ELF specification: @@ -24,7 +24,7 @@ Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/elf/dl-deps.c b/elf/dl-deps.c -index 6a82987..53be824 100644 +index 1b8bac6593..c616808f31 100644 --- a/elf/dl-deps.c +++ b/elf/dl-deps.c @@ -73,13 +73,19 @@ _dl_build_local_scope (struct link_map **list, struct link_map *map) @@ -52,5 +52,5 @@ index 6a82987..53be824 100644 } -- -2.10.2 +2.13.2 diff --git a/meta/recipes-core/glibc/glibc/0027-locale-fix-hard-coded-reference-to-gcc-E.patch b/meta/recipes-core/glibc/glibc/0026-locale-fix-hard-coded-reference-to-gcc-E.patch similarity index 82% rename from meta/recipes-core/glibc/glibc/0027-locale-fix-hard-coded-reference-to-gcc-E.patch rename to meta/recipes-core/glibc/glibc/0026-locale-fix-hard-coded-reference-to-gcc-E.patch index bce90557cf..08967925ab 100644 --- a/meta/recipes-core/glibc/glibc/0027-locale-fix-hard-coded-reference-to-gcc-E.patch +++ b/meta/recipes-core/glibc/glibc/0026-locale-fix-hard-coded-reference-to-gcc-E.patch @@ -1,7 +1,7 @@ -From a2fc86cb8d0366171f100ebd033aeb9609fa40de Mon Sep 17 00:00:00 2001 +From 84625a170eb3145eb27f3d348fcd9bad85cc2fa2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Rosen?= <jeremy.rosen@smile.fr> Date: Mon, 22 Aug 2016 16:09:25 +0200 -Subject: [PATCH 27/27] locale: fix hard-coded reference to gcc -E +Subject: [PATCH 26/26] locale: fix hard-coded reference to gcc -E When new version of compilers are published, they may not be compatible with older versions of software. This is particularly common when software is built @@ -17,13 +17,13 @@ environment. This patch replaces the hard-coded reference to the gcc binary with the proper environment variable, thus allowing a user to override it. -Upstream-Status: Submitted [https://sourceware.org/ml/libc-alpha/2016-08/msg00746.html] +Upstream-Status : Submitted [https://sourceware.org/ml/libc-alpha/2016-08/msg00746.html] --- locale/gen-translit.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locale/gen-translit.pl b/locale/gen-translit.pl -index 30d3f2f..e976530 100644 +index 30d3f2f195..e97653017c 100644 --- a/locale/gen-translit.pl +++ b/locale/gen-translit.pl @@ -1,5 +1,5 @@ @@ -34,5 +34,5 @@ index 30d3f2f..e976530 100644 sub cstrlen { -- -2.10.2 +2.13.2 diff --git a/meta/recipes-core/glibc/glibc_2.25.bb b/meta/recipes-core/glibc/glibc_2.25.90.bb similarity index 80% rename from meta/recipes-core/glibc/glibc_2.25.bb rename to meta/recipes-core/glibc/glibc_2.25.90.bb index c37438a2d1..b2f4db5181 100644 --- a/meta/recipes-core/glibc/glibc_2.25.bb +++ b/meta/recipes-core/glibc/glibc_2.25.90.bb @@ -7,9 +7,10 @@ LIC_FILES_CHKSUM = "file://LICENSES;md5=e9a558e243b36d3209f380deb394b213 \ DEPENDS += "gperf-native" -SRCREV ?= "db0242e3023436757bbc7c488a779e6e3343db04" +SRCREV ?= "8466ee1cb7c2041d8471dad0aa53af35ab599012" -SRCBRANCH ?= "release/${PV}/master" +#SRCBRANCH ?= "release/${PV}/master" +SRCBRANCH ?= "master" GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.\d+(\.\d+)*)" @@ -26,22 +27,21 @@ SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \ file://0009-Quote-from-bug-1443-which-explains-what-the-patch-do.patch \ file://0010-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch \ file://0011-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch \ - file://0012-Make-ld-version-output-matching-grok-gold-s-output.patch \ - file://0013-sysdeps-gnu-configure.ac-handle-correctly-libc_cv_ro.patch \ - file://0014-Add-unused-attribute.patch \ - file://0015-yes-within-the-path-sets-wrong-config-variables.patch \ - file://0016-timezone-re-written-tzselect-as-posix-sh.patch \ - file://0017-Remove-bash-dependency-for-nscd-init-script.patch \ - file://0018-eglibc-Cross-building-and-testing-instructions.patch \ - file://0019-eglibc-Help-bootstrap-cross-toolchain.patch \ - file://0020-eglibc-cherry-picked-from.patch \ - file://0021-eglibc-Clear-cache-lines-on-ppc8xx.patch \ - file://0022-eglibc-Resolve-__fpscr_values-on-SH4.patch \ - 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://0026-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch \ - file://0027-locale-fix-hard-coded-reference-to-gcc-E.patch \ + file://0012-sysdeps-gnu-configure.ac-handle-correctly-libc_cv_ro.patch \ + file://0013-Add-unused-attribute.patch \ + file://0014-yes-within-the-path-sets-wrong-config-variables.patch \ + file://0015-timezone-re-written-tzselect-as-posix-sh.patch \ + file://0016-Remove-bash-dependency-for-nscd-init-script.patch \ + file://0017-eglibc-Cross-building-and-testing-instructions.patch \ + file://0018-eglibc-Help-bootstrap-cross-toolchain.patch \ + file://0019-eglibc-Clear-cache-lines-on-ppc8xx.patch \ + file://0020-eglibc-Resolve-__fpscr_values-on-SH4.patch \ + file://0021-eglibc-Install-PIC-archives.patch \ + file://0022-eglibc-Forward-port-cross-locale-generation-support.patch \ + file://0023-Define-DUMMY_LOCALE_T-if-not-defined.patch \ + file://0024-local-dynamic-resolvconf.patch \ + file://0025-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch \ + file://0026-locale-fix-hard-coded-reference-to-gcc-E.patch \ " NATIVESDKFIXES ?= "" -- 2.13.2 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 02/19] glibc: Drop obsoleted bits/string.h from multilibbing 2017-07-01 14:23 [PATCH 00/19] Rework GCC PIE and security flags (take 3) Khem Raj 2017-07-01 14:23 ` [PATCH 01/19] glibc: Upgrade to 2.25.90 Khem Raj @ 2017-07-01 14:23 ` Khem Raj 2017-07-01 14:23 ` [PATCH 03/19] glibc: Enable obsoleted nsl Khem Raj ` (16 subsequent siblings) 18 siblings, 0 replies; 20+ messages in thread From: Khem Raj @ 2017-07-01 14:23 UTC (permalink / raw) To: openembedded-core glibc 2.26 has dropped bits/string.h Signed-off-by: Khem Raj <raj.khem@gmail.com> --- meta/recipes-core/glibc/glibc-package.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc index 645be694b5..0281251bee 100644 --- a/meta/recipes-core/glibc/glibc-package.inc +++ b/meta/recipes-core/glibc/glibc-package.inc @@ -135,7 +135,7 @@ do_install_armmultilib () { oe_multilib_header bits/endian.h bits/fcntl.h bits/fenv.h bits/fp-fast.h bits/hwcap.h bits/ipc.h bits/link.h bits/wordsize.h oe_multilib_header bits/local_lim.h bits/mman.h bits/msq.h bits/pthreadtypes.h bits/sem.h bits/semaphore.h bits/setjmp.h - oe_multilib_header bits/shm.h bits/sigstack.h bits/stat.h bits/statfs.h bits/string.h bits/typesizes.h + oe_multilib_header bits/shm.h bits/sigstack.h bits/stat.h bits/statfs.h bits/typesizes.h oe_multilib_header fpu_control.h gnu/lib-names.h gnu/stubs.h ieee754.h -- 2.13.2 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 03/19] glibc: Enable obsoleted nsl 2017-07-01 14:23 [PATCH 00/19] Rework GCC PIE and security flags (take 3) Khem Raj 2017-07-01 14:23 ` [PATCH 01/19] glibc: Upgrade to 2.25.90 Khem Raj 2017-07-01 14:23 ` [PATCH 02/19] glibc: Drop obsoleted bits/string.h from multilibbing Khem Raj @ 2017-07-01 14:23 ` Khem Raj 2017-07-01 14:23 ` [PATCH 04/19] gcc: Introduce a knob to configure gcc to default to PIE Khem Raj ` (15 subsequent siblings) 18 siblings, 0 replies; 20+ messages in thread From: Khem Raj @ 2017-07-01 14:23 UTC (permalink / raw) To: openembedded-core libnsl has been obsoleted in 2.26 and will be removed in future until them we enable it Signed-off-by: Khem Raj <raj.khem@gmail.com> --- meta/recipes-core/glibc/glibc_2.25.90.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-core/glibc/glibc_2.25.90.bb b/meta/recipes-core/glibc/glibc_2.25.90.bb index b2f4db5181..bdbfd40ada 100644 --- a/meta/recipes-core/glibc/glibc_2.25.90.bb +++ b/meta/recipes-core/glibc/glibc_2.25.90.bb @@ -76,6 +76,7 @@ EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ --with-headers=${STAGING_INCDIR} \ --without-selinux \ --enable-obsolete-rpc \ + --enable-obsolete-nsl \ --enable-tunables \ --enable-bind-now \ --enable-stack-protector=strong \ -- 2.13.2 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 04/19] gcc: Introduce a knob to configure gcc to default to PIE 2017-07-01 14:23 [PATCH 00/19] Rework GCC PIE and security flags (take 3) Khem Raj ` (2 preceding siblings ...) 2017-07-01 14:23 ` [PATCH 03/19] glibc: Enable obsoleted nsl Khem Raj @ 2017-07-01 14:23 ` Khem Raj 2017-07-01 14:23 ` [PATCH 05/19] security_flags.inc: Delete pinnings for SECURITY_NO_PIE_CFLAGS Khem Raj ` (14 subsequent siblings) 18 siblings, 0 replies; 20+ messages in thread From: Khem Raj @ 2017-07-01 14:23 UTC (permalink / raw) To: openembedded-core GCCPIE flag which is empty by default adds "--enable-default-pie" configure option for harderned distros We do not require to add -fpie -pie flag externally anymore Signed-off-by: Khem Raj <raj.khem@gmail.com> --- meta/conf/distro/include/security_flags.inc | 4 +++- meta/recipes-devtools/gcc/gcc-configure-common.inc | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/meta/conf/distro/include/security_flags.inc b/meta/conf/distro/include/security_flags.inc index 38164d08b8..f2eb224a77 100644 --- a/meta/conf/distro/include/security_flags.inc +++ b/meta/conf/distro/include/security_flags.inc @@ -5,6 +5,8 @@ # From a Yocto Project perspective, this file is included and tested # in the DISTRO="poky-lsb" configuration. +GCCPIE ?= "--enable-default-pie" + # _FORTIFY_SOURCE requires -O1 or higher, so disable in debug builds as they use # -O0 which then results in a compiler warning. lcl_maybe_fortify = "${@base_conditional('DEBUG_BUILD','1','','-D_FORTIFY_SOURCE=2',d)}" @@ -12,7 +14,7 @@ lcl_maybe_fortify = "${@base_conditional('DEBUG_BUILD','1','','-D_FORTIFY_SOURCE # Error on use of format strings that represent possible security problems SECURITY_STRINGFORMAT ?= "-Wformat -Wformat-security -Werror=format-security" -SECURITY_CFLAGS ?= "-fstack-protector-strong -pie -fpie ${lcl_maybe_fortify} ${SECURITY_STRINGFORMAT}" +SECURITY_CFLAGS ?= "-fstack-protector-strong ${lcl_maybe_fortify} ${SECURITY_STRINGFORMAT}" SECURITY_NO_PIE_CFLAGS ?= "-fstack-protector-strong ${lcl_maybe_fortify} ${SECURITY_STRINGFORMAT}" SECURITY_LDFLAGS ?= "-fstack-protector-strong -Wl,-z,relro,-z,now" diff --git a/meta/recipes-devtools/gcc/gcc-configure-common.inc b/meta/recipes-devtools/gcc/gcc-configure-common.inc index 63fa1d9686..e2ce234aa1 100644 --- a/meta/recipes-devtools/gcc/gcc-configure-common.inc +++ b/meta/recipes-devtools/gcc/gcc-configure-common.inc @@ -22,6 +22,8 @@ EXTRA_OECONF_INITIAL ?= "" GCCMULTILIB ?= "--disable-multilib" GCCTHREADS ?= "posix" +GCCPIE ??= "" + EXTRA_OECONF = "\ ${@['--enable-clocale=generic', ''][d.getVar('USE_NLS') != 'no']} \ --with-gnu-ld \ @@ -29,6 +31,7 @@ EXTRA_OECONF = "\ --enable-languages=${LANGUAGES} \ --enable-threads=${GCCTHREADS} \ ${GCCMULTILIB} \ + ${GCCPIE} \ --enable-c99 \ --enable-long-long \ --enable-symvers=gnu \ -- 2.13.2 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 05/19] security_flags.inc: Delete pinnings for SECURITY_NO_PIE_CFLAGS 2017-07-01 14:23 [PATCH 00/19] Rework GCC PIE and security flags (take 3) Khem Raj ` (3 preceding siblings ...) 2017-07-01 14:23 ` [PATCH 04/19] gcc: Introduce a knob to configure gcc to default to PIE Khem Raj @ 2017-07-01 14:23 ` Khem Raj 2017-07-01 14:23 ` [PATCH 06/19] distutils, setuptools: Delete use of SECURITY_NO_PIE_CFLAGS Khem Raj ` (13 subsequent siblings) 18 siblings, 0 replies; 20+ messages in thread From: Khem Raj @ 2017-07-01 14:23 UTC (permalink / raw) To: openembedded-core GCC is configured correctly to pass PIE cflags/ldflags Signed-off-by: Khem Raj <raj.khem@gmail.com> --- meta/conf/distro/include/security_flags.inc | 83 ++++++++--------------------- 1 file changed, 22 insertions(+), 61 deletions(-) diff --git a/meta/conf/distro/include/security_flags.inc b/meta/conf/distro/include/security_flags.inc index f2eb224a77..dd713b9818 100644 --- a/meta/conf/distro/include/security_flags.inc +++ b/meta/conf/distro/include/security_flags.inc @@ -1,4 +1,4 @@ -# Setup extra CFLAGS and LDFLAGS which have 'security' benefits. These +# Setup extra CFLAGS and LDFLAGS which have 'security' benefits. These # don't work universally, there are recipes which can't use one, the other # or both so a blacklist is maintained here. The idea would be over # time to reduce this list to nothing. @@ -14,87 +14,45 @@ lcl_maybe_fortify = "${@base_conditional('DEBUG_BUILD','1','','-D_FORTIFY_SOURCE # Error on use of format strings that represent possible security problems SECURITY_STRINGFORMAT ?= "-Wformat -Wformat-security -Werror=format-security" -SECURITY_CFLAGS ?= "-fstack-protector-strong ${lcl_maybe_fortify} ${SECURITY_STRINGFORMAT}" +# Inject pie flags into compiler flags if not configured with gcc itself +# especially useful with external toolchains +SECURITY_PIE_CFLAGS ?= "${@'' if '${GCCPIE}' else '-pie -fPIE'}" + +SECURITY_NOPIE_CFLAGS ?= "-no-pie -fno-PIE" + +SECURITY_CFLAGS ?= "-fstack-protector-strong ${SECURITY_PIE_CFLAGS} ${lcl_maybe_fortify} ${SECURITY_STRINGFORMAT}" SECURITY_NO_PIE_CFLAGS ?= "-fstack-protector-strong ${lcl_maybe_fortify} ${SECURITY_STRINGFORMAT}" SECURITY_LDFLAGS ?= "-fstack-protector-strong -Wl,-z,relro,-z,now" SECURITY_X_LDFLAGS ?= "-fstack-protector-strong -Wl,-z,relro" # powerpc does not get on with pie for reasons not looked into as yet -SECURITY_CFLAGS_powerpc = "-fstack-protector-strong ${lcl_maybe_fortify}" -# Deal with ppc specific linker failures when using the cflags -SECURITY_CFLAGS_pn-dbus_powerpc = "" -SECURITY_CFLAGS_pn-dbus-ptest_powerpc = "" -SECURITY_CFLAGS_pn-libmatchbox_powerpc = "" +SECURITY_CFLAGS_powerpc = "-fstack-protector-strong ${lcl_maybe_fortify} ${SECURITY_NOPIE_CFLAGS}" +SECURITY_CFLAGS_pn-libgcc_powerpc = "" # arm specific security flag issues -SECURITY_CFLAGS_pn-lttng-tools_arm = "${SECURITY_NO_PIE_CFLAGS}" -SECURITY_CFLAGS_pn-aspell = "${SECURITY_NO_PIE_CFLAGS}" -SECURITY_CFLAGS_pn-beecrypt = "${SECURITY_NO_PIE_CFLAGS}" -SECURITY_CFLAGS_pn-coreutils = "${SECURITY_NO_PIE_CFLAGS}" -SECURITY_CFLAGS_pn-cups = "${SECURITY_NO_PIE_CFLAGS}" -SECURITY_CFLAGS_pn-db = "${SECURITY_NO_PIE_CFLAGS}" -SECURITY_CFLAGS_pn-directfb = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-glibc = "" SECURITY_CFLAGS_pn-glibc-initial = "" -SECURITY_CFLAGS_pn-elfutils = "${SECURITY_NO_PIE_CFLAGS}" -SECURITY_CFLAGS_pn-enchant = "${SECURITY_NO_PIE_CFLAGS}" -SECURITY_CFLAGS_pn-expect = "${SECURITY_NO_PIE_CFLAGS}" -SECURITY_CFLAGS_pn-flac = "${SECURITY_NO_PIE_CFLAGS}" -SECURITY_CFLAGS_pn-gcc = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-gcc-runtime = "" -SECURITY_CFLAGS_pn-gcc-sanitizers = "${SECURITY_NO_PIE_CFLAGS}" -SECURITY_CFLAGS_pn-gdb = "${SECURITY_NO_PIE_CFLAGS}" -SECURITY_CFLAGS_pn-gmp = "${SECURITY_NO_PIE_CFLAGS}" -SECURITY_CFLAGS_pn-gnutls = "${SECURITY_NO_PIE_CFLAGS}" -SECURITY_CFLAGS_pn-gpgme = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-grub = "" SECURITY_CFLAGS_pn-grub-efi = "" SECURITY_CFLAGS_pn-grub-efi-native = "" SECURITY_CFLAGS_pn-grub-efi-x86-native = "" SECURITY_CFLAGS_pn-grub-efi-i586-native = "" SECURITY_CFLAGS_pn-grub-efi-x86-64-native = "" -SECURITY_CFLAGS_pn-gstreamer1.0-plugins-bad = "${SECURITY_NO_PIE_CFLAGS}" -SECURITY_CFLAGS_pn-gstreamer1.0-plugins-good = "${SECURITY_NO_PIE_CFLAGS}" -SECURITY_CFLAGS_pn-harfbuzz = "${SECURITY_NO_PIE_CFLAGS}" -SECURITY_CFLAGS_pn-kexec-tools = "${SECURITY_NO_PIE_CFLAGS}" -SECURITY_CFLAGS_pn-iptables = "${SECURITY_NO_PIE_CFLAGS}" -SECURITY_CFLAGS_pn-libaio = "${SECURITY_NO_PIE_CFLAGS}" -SECURITY_CFLAGS_pn-libcap = "${SECURITY_NO_PIE_CFLAGS}" -SECURITY_CFLAGS_pn-libgcc = "${SECURITY_NO_PIE_CFLAGS}" -SECURITY_CFLAGS_pn-libid3tag = "${SECURITY_NO_PIE_CFLAGS}" -SECURITY_CFLAGS_pn-libnewt-python = "${SECURITY_NO_PIE_CFLAGS}" -SECURITY_CFLAGS_pn-libglu = "${SECURITY_NO_PIE_CFLAGS}" -SECURITY_CFLAGS_pn-libpcap = "${SECURITY_NO_PIE_CFLAGS}" -SECURITY_CFLAGS_pn-libpcre = "${SECURITY_NO_PIE_CFLAGS}" -SECURITY_CFLAGS_pn-libproxy = "${SECURITY_NO_PIE_CFLAGS}" -SECURITY_CFLAGS_pn-mesa = "${SECURITY_NO_PIE_CFLAGS}" -SECURITY_CFLAGS_pn-mesa-gl = "${SECURITY_NO_PIE_CFLAGS}" -SECURITY_CFLAGS_pn-openssl = "${SECURITY_NO_PIE_CFLAGS}" -SECURITY_CFLAGS_pn-opensp = "${SECURITY_NO_PIE_CFLAGS}" -SECURITY_CFLAGS_pn-ppp = "${SECURITY_NO_PIE_CFLAGS}" -SECURITY_CFLAGS_pn-python = "${SECURITY_NO_PIE_CFLAGS}" -SECURITY_CFLAGS_pn-python-pycurl = "${SECURITY_NO_PIE_CFLAGS}" -SECURITY_CFLAGS_pn-python-numpy = "${SECURITY_NO_PIE_CFLAGS}" -SECURITY_CFLAGS_pn-python3-numpy = "${SECURITY_NO_PIE_CFLAGS}" -SECURITY_CFLAGS_pn-python3-pycairo = "${SECURITY_NO_PIE_CFLAGS}" -SECURITY_CFLAGS_pn-python3-pycurl = "${SECURITY_NO_PIE_CFLAGS}" -SECURITY_CFLAGS_pn-python3-pygpgme = "${SECURITY_NO_PIE_CFLAGS}" -SECURITY_CFLAGS_pn-python3 = "${SECURITY_NO_PIE_CFLAGS}" -SECURITY_CFLAGS_pn-syslinux = "${SECURITY_NO_PIE_CFLAGS}" -SECURITY_CFLAGS_pn-slang = "${SECURITY_NO_PIE_CFLAGS}" -SECURITY_CFLAGS_pn-source-highlight = "${SECURITY_NO_PIE_CFLAGS}" -SECURITY_CFLAGS_pn-tcl = "${SECURITY_NO_PIE_CFLAGS}" -SECURITY_CFLAGS_pn-tiff = "${SECURITY_NO_PIE_CFLAGS}" -SECURITY_CFLAGS_pn-valgrind = "" -SECURITY_CFLAGS_pn-zlib = "${SECURITY_NO_PIE_CFLAGS}" + +SECURITY_CFLAGS_pn-mkelfimage_x86 = "" + +SECURITY_CFLAGS_pn-valgrind = "${SECURITY_NOPIE_CFLAGS}" +SECURITY_LDFLAGS_pn-valgrind = "" +SECURITY_CFLAGS_pn-sysklogd = "${SECURITY_NOPIE_CFLAGS}" +SECURITY_LDFLAGS_pn-sysklogd = "" # Recipes which fail to compile when elevating -Wformat-security to an error SECURITY_STRINGFORMAT_pn-busybox = "" SECURITY_STRINGFORMAT_pn-gcc = "" -SECURITY_STRINGFORMAT_pn-oh-puzzles = "" -TARGET_CFLAGS_append_class-target = " ${SECURITY_CFLAGS}" +TARGET_CC_ARCH_append_class-target = " ${SECURITY_CFLAGS}" TARGET_LDFLAGS_append_class-target = " ${SECURITY_LDFLAGS}" SECURITY_LDFLAGS_remove_pn-gcc-runtime = "-fstack-protector-strong" @@ -108,4 +66,7 @@ SECURITY_LDFLAGS_pn-xf86-video-vesa = "${SECURITY_X_LDFLAGS}" SECURITY_LDFLAGS_pn-xf86-video-vmware = "${SECURITY_X_LDFLAGS}" SECURITY_LDFLAGS_pn-xserver-xorg = "${SECURITY_X_LDFLAGS}" -TARGET_CC_ARCH_append_pn-binutils = " ${SECURITY_CFLAGS} ${SELECTED_OPTIMIZATION}" +TARGET_CC_ARCH_append_pn-binutils = " ${SELECTED_OPTIMIZATION}" +TARGET_CC_ARCH_append_pn-gcc = " ${SELECTED_OPTIMIZATION}" +TARGET_CC_ARCH_append_pn-gdb = " ${SELECTED_OPTIMIZATION}" +TARGET_CC_ARCH_append_pn-perf = " ${SELECTED_OPTIMIZATION}" -- 2.13.2 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 06/19] distutils, setuptools: Delete use of SECURITY_NO_PIE_CFLAGS 2017-07-01 14:23 [PATCH 00/19] Rework GCC PIE and security flags (take 3) Khem Raj ` (4 preceding siblings ...) 2017-07-01 14:23 ` [PATCH 05/19] security_flags.inc: Delete pinnings for SECURITY_NO_PIE_CFLAGS Khem Raj @ 2017-07-01 14:23 ` Khem Raj 2017-07-01 14:23 ` [PATCH 07/19] gcc7: Enable static PIE Khem Raj ` (12 subsequent siblings) 18 siblings, 0 replies; 20+ messages in thread From: Khem Raj @ 2017-07-01 14:23 UTC (permalink / raw) To: openembedded-core gcc can handle PIE in gcc driver Signed-off-by: Khem Raj <raj.khem@gmail.com> --- meta/classes/distutils-common-base.bbclass | 2 -- meta/classes/setuptools.bbclass | 2 -- 2 files changed, 4 deletions(-) diff --git a/meta/classes/distutils-common-base.bbclass b/meta/classes/distutils-common-base.bbclass index fa733c672c..824a1b68b1 100644 --- a/meta/classes/distutils-common-base.bbclass +++ b/meta/classes/distutils-common-base.bbclass @@ -11,5 +11,3 @@ FILES_${PN}-dev += "\ ${libdir}/pkgconfig \ ${PYTHON_SITEPACKAGES_DIR}/*.la \ " - -SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" diff --git a/meta/classes/setuptools.bbclass b/meta/classes/setuptools.bbclass index 7d0c5267d7..56343b1c73 100644 --- a/meta/classes/setuptools.bbclass +++ b/meta/classes/setuptools.bbclass @@ -6,5 +6,3 @@ DISTUTILS_INSTALL_ARGS = "--root=${D} \ --prefix=${prefix} \ --install-lib=${PYTHON_SITEPACKAGES_DIR} \ --install-data=${datadir}" - -SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" -- 2.13.2 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 07/19] gcc7: Enable static PIE 2017-07-01 14:23 [PATCH 00/19] Rework GCC PIE and security flags (take 3) Khem Raj ` (5 preceding siblings ...) 2017-07-01 14:23 ` [PATCH 06/19] distutils, setuptools: Delete use of SECURITY_NO_PIE_CFLAGS Khem Raj @ 2017-07-01 14:23 ` Khem Raj 2017-07-01 14:23 ` [PATCH 08/19] gcc: Link libssp_nonshared.a only on musl targets Khem Raj ` (11 subsequent siblings) 18 siblings, 0 replies; 20+ messages in thread From: Khem Raj @ 2017-07-01 14:23 UTC (permalink / raw) To: openembedded-core Signed-off-by: Khem Raj <raj.khem@gmail.com> --- meta/recipes-devtools/gcc/gcc-7.1.inc | 1 + .../gcc/gcc-7.1/0048-gcc-Enable-static-PIE.patch | 37 ++++++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 meta/recipes-devtools/gcc/gcc-7.1/0048-gcc-Enable-static-PIE.patch diff --git a/meta/recipes-devtools/gcc/gcc-7.1.inc b/meta/recipes-devtools/gcc/gcc-7.1.inc index 4098d6a2c1..b52d51fba6 100644 --- a/meta/recipes-devtools/gcc/gcc-7.1.inc +++ b/meta/recipes-devtools/gcc/gcc-7.1.inc @@ -72,6 +72,7 @@ SRC_URI = "\ file://0045-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch \ file://0046-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch \ file://0047-sync-gcc-stddef.h-with-musl.patch \ + file://0048-gcc-Enable-static-PIE.patch \ ${BACKPORTS} \ " BACKPORTS = "\ diff --git a/meta/recipes-devtools/gcc/gcc-7.1/0048-gcc-Enable-static-PIE.patch b/meta/recipes-devtools/gcc/gcc-7.1/0048-gcc-Enable-static-PIE.patch new file mode 100644 index 0000000000..879e360cf3 --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-7.1/0048-gcc-Enable-static-PIE.patch @@ -0,0 +1,37 @@ +From 44ef80688b56beea85c0070840dea1e2a4e34aed Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 13 Jun 2017 12:12:52 -0700 +Subject: [PATCH 49/49] gcc: Enable static PIE + +Static PIE support in GCC +see +https://gcc.gnu.org/ml/gcc/2015-06/msg00008.html + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + gcc/config/gnu-user.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/gcc/config/gnu-user.h b/gcc/config/gnu-user.h +index 2787a3d16be..ee7b781319e 100644 +--- a/gcc/config/gnu-user.h ++++ b/gcc/config/gnu-user.h +@@ -51,10 +51,10 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see + #if defined HAVE_LD_PIE + #define GNU_USER_TARGET_STARTFILE_SPEC \ + "%{!shared: %{pg|p|profile:gcrt1.o%s;: \ +- %{" PIE_SPEC ":Scrt1.o%s} %{" NO_PIE_SPEC ":crt1.o%s}}} \ +- crti.o%s %{static:crtbeginT.o%s;: %{shared:crtbeginS.o%s} \ ++ %{" PIE_SPEC ":%{static:rcrt1.o%s;:Scrt1.o%s}} %{" NO_PIE_SPEC ":crt1.o%s}}} \ ++ crti.o%s %{shared:crtbeginS.o%s;: \ + %{" PIE_SPEC ":crtbeginS.o%s} \ +- %{" NO_PIE_SPEC ":crtbegin.o%s}} \ ++ %{" NO_PIE_SPEC ":%{static:crtbeginT.o%s;:crtbegin.o%s}}} \ + %{fvtable-verify=none:%s; \ + fvtable-verify=preinit:vtv_start_preinit.o%s; \ + fvtable-verify=std:vtv_start.o%s} \ +-- +2.13.1 + -- 2.13.2 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 08/19] gcc: Link libssp_nonshared.a only on musl targets 2017-07-01 14:23 [PATCH 00/19] Rework GCC PIE and security flags (take 3) Khem Raj ` (6 preceding siblings ...) 2017-07-01 14:23 ` [PATCH 07/19] gcc7: Enable static PIE Khem Raj @ 2017-07-01 14:23 ` Khem Raj 2017-07-01 14:23 ` [PATCH 09/19] sysklogd: Improve build and fix runtime crash Khem Raj ` (10 subsequent siblings) 18 siblings, 0 replies; 20+ messages in thread From: Khem Raj @ 2017-07-01 14:23 UTC (permalink / raw) To: openembedded-core glibc already provides the content for libssp_nonshared in libc_nonshared.a therefore we dont need to make it universal. This also fixed build issues on glibc when linking statically and using -fstack-protector Fixed errors like /mnt/a/oe/build/tmp/work/i586-bec-linux/aufs-util/3.14+gitAUTOINC+bdfcc0dcfc-r0/recipe-sysroot/usr/lib/../lib/libc.a(stack_chk_fail.o): In function `__stack_chk_fail': /usr/src/debug/glibc/2.26-r0/git/debug/stack_chk_fail.c:27: multiple definition of `__stack_chk_fail_local' /mnt/a/oe/build/tmp/work/i586-bec-linux/aufs-util/3.14+gitAUTOINC+bdfcc0dcfc-r0/recipe-sysroot/usr/lib/../lib/libssp_nonshared.a(libssp_nonshared_la-ssp-local.o):/usr/src/debug/gcc-runtime/7.1.0-r0/gcc-7.1.0/build.i586-bec-linux.i586-bec-linux/i586-bec-linux/libssp/../../../../../../../../work-shared/gcc-7.1.0-r0/gcc-7.1.0/libssp/ssp-local.c:47: first defined here collect2: error: ld returned 1 exit status Signed-off-by: Khem Raj <raj.khem@gmail.com> --- meta/recipes-devtools/gcc/gcc-7.1.inc | 2 +- ...shared-to-link-commandline-for-musl-targe.patch | 42 ++++++++++++++++++++++ .../gcc/gcc-7.1/0040-ssp_nonshared.patch | 28 --------------- 3 files changed, 43 insertions(+), 29 deletions(-) create mode 100644 meta/recipes-devtools/gcc/gcc-7.1/0040-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch delete mode 100644 meta/recipes-devtools/gcc/gcc-7.1/0040-ssp_nonshared.patch diff --git a/meta/recipes-devtools/gcc/gcc-7.1.inc b/meta/recipes-devtools/gcc/gcc-7.1.inc index b52d51fba6..96fc11c943 100644 --- a/meta/recipes-devtools/gcc/gcc-7.1.inc +++ b/meta/recipes-devtools/gcc/gcc-7.1.inc @@ -64,7 +64,7 @@ SRC_URI = "\ file://0037-Search-target-sysroot-gcc-version-specific-dirs-with.patch \ file://0038-Fix-various-_FOR_BUILD-and-related-variables.patch \ file://0039-nios2-Define-MUSL_DYNAMIC_LINKER.patch \ - file://0040-ssp_nonshared.patch \ + file://0040-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch \ file://0041-gcc-libcpp-support-ffile-prefix-map-old-new.patch \ file://0042-Reuse-fdebug-prefix-map-to-replace-ffile-prefix-map.patch \ file://0043-gcc-final.c-fdebug-prefix-map-support-to-remap-sourc.patch \ diff --git a/meta/recipes-devtools/gcc/gcc-7.1/0040-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch b/meta/recipes-devtools/gcc/gcc-7.1/0040-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch new file mode 100644 index 0000000000..310f7aacba --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-7.1/0040-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch @@ -0,0 +1,42 @@ +From 75a42d6d0f1f9784327f74882195a5c24843d5a8 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 27 Jun 2017 18:10:54 -0700 +Subject: [PATCH 40/49] Add ssp_nonshared to link commandline for musl targets + +when -fstack-protector options are enabled we need to +link with ssp_shared on musl since it does not provide +the __stack_chk_fail_local() so essentially it provides +libssp but not libssp_nonshared something like +TARGET_LIBC_PROVIDES_SSP_BUT_NOT_SSP_NONSHARED + where-as for glibc the needed symbols +are already present in libc_nonshared library therefore +we do not need any library helper on glibc based systems +but musl needs the libssp_noshared from gcc + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + gcc/config/linux.h | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/gcc/config/linux.h b/gcc/config/linux.h +index 2e683d0c430..5ff0a2cb2ff 100644 +--- a/gcc/config/linux.h ++++ b/gcc/config/linux.h +@@ -182,6 +182,12 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see + { GCC_INCLUDE_DIR, "GCC", 0, 1, 0, 0 }, \ + { 0, 0, 0, 0, 0, 0 } \ + } ++#ifdef TARGET_LIBC_PROVIDES_SSP ++#define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \ ++ "|fstack-protector-strong|fstack-protector-explicit" \ ++ ":-lssp_nonshared}" ++#endif ++ + #endif + + #if (DEFAULT_LIBC == LIBC_UCLIBC) && defined (SINGLE_LIBC) /* uClinux */ +-- +2.13.2 + diff --git a/meta/recipes-devtools/gcc/gcc-7.1/0040-ssp_nonshared.patch b/meta/recipes-devtools/gcc/gcc-7.1/0040-ssp_nonshared.patch deleted file mode 100644 index e9fb35cb91..0000000000 --- a/meta/recipes-devtools/gcc/gcc-7.1/0040-ssp_nonshared.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 6c98538411ac30c2262b2635547974c6cd1699c5 Mon Sep 17 00:00:00 2001 -From: Szabolcs Nagy <nsz@port70.net> -Date: Sat, 7 Nov 2015 14:58:40 +0000 -Subject: [PATCH 40/47] ssp_nonshared - ---- -Upstream-Status: Inappropriate [OE-Specific] - - gcc/gcc.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/gcc/gcc.c b/gcc/gcc.c -index 84af5d5a2e1..2c6471aa565 100644 ---- a/gcc/gcc.c -+++ b/gcc/gcc.c -@@ -872,7 +872,8 @@ proper position among the other output files. */ - #ifndef LINK_SSP_SPEC - #ifdef TARGET_LIBC_PROVIDES_SSP - #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \ -- "|fstack-protector-strong|fstack-protector-explicit:}" -+ "|fstack-protector-strong|fstack-protector-explicit" \ -+ ":-lssp_nonshared}" - #else - #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \ - "|fstack-protector-strong|fstack-protector-explicit" \ --- -2.12.2 - -- 2.13.2 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 09/19] sysklogd: Improve build and fix runtime crash 2017-07-01 14:23 [PATCH 00/19] Rework GCC PIE and security flags (take 3) Khem Raj ` (7 preceding siblings ...) 2017-07-01 14:23 ` [PATCH 08/19] gcc: Link libssp_nonshared.a only on musl targets Khem Raj @ 2017-07-01 14:23 ` Khem Raj 2017-07-01 14:23 ` [PATCH 10/19] libunwind: We set -fPIE in security flags now if gcc is not configured for default PIE Khem Raj ` (9 subsequent siblings) 18 siblings, 0 replies; 20+ messages in thread From: Khem Raj @ 2017-07-01 14:23 UTC (permalink / raw) To: openembedded-core Patch the makefile so it can respect flags from environment add a patch to fix a run time crash Signed-off-by: Khem Raj <raj.khem@gmail.com> --- ...s-that-causes-a-segmentation-fault-under-.patch | 28 +++++++++++++++++ ...way-for-respecting-flags-from-environment.patch | 35 ++++++++++++++++++++++ meta/recipes-extended/sysklogd/sysklogd.inc | 6 ++-- 3 files changed, 66 insertions(+), 3 deletions(-) create mode 100644 meta/recipes-extended/sysklogd/files/0001-fix-problems-that-causes-a-segmentation-fault-under-.patch create mode 100644 meta/recipes-extended/sysklogd/files/0002-Make-way-for-respecting-flags-from-environment.patch diff --git a/meta/recipes-extended/sysklogd/files/0001-fix-problems-that-causes-a-segmentation-fault-under-.patch b/meta/recipes-extended/sysklogd/files/0001-fix-problems-that-causes-a-segmentation-fault-under-.patch new file mode 100644 index 0000000000..56431af845 --- /dev/null +++ b/meta/recipes-extended/sysklogd/files/0001-fix-problems-that-causes-a-segmentation-fault-under-.patch @@ -0,0 +1,28 @@ +From cb72b3e172c238b4b5ae5935dc6be54f5034fcf1 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 30 Jun 2017 18:20:06 -0700 +Subject: [PATCH 1/2] fix problems that causes a segmentation fault under some + conditions + +Upstream-Status: Inappropriate [ no upstream ] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + ksym_mod.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/ksym_mod.c b/ksym_mod.c +index 6e26da1..a3daa7d 100644 +--- a/ksym_mod.c ++++ b/ksym_mod.c +@@ -186,7 +186,6 @@ extern int InitMsyms() + else + Syslog(LOG_ERR, "Error loading kernel symbols " \ + "- %s\n", strerror(errno)); +- fclose(ksyms); + return(0); + } + +-- +2.13.2 + diff --git a/meta/recipes-extended/sysklogd/files/0002-Make-way-for-respecting-flags-from-environment.patch b/meta/recipes-extended/sysklogd/files/0002-Make-way-for-respecting-flags-from-environment.patch new file mode 100644 index 0000000000..ebbdef303b --- /dev/null +++ b/meta/recipes-extended/sysklogd/files/0002-Make-way-for-respecting-flags-from-environment.patch @@ -0,0 +1,35 @@ +From b22f244732cd0f475af2f82fc7eecec49f90623b Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 1 Jul 2017 00:01:50 -0700 +Subject: [PATCH 2/2] Make way for respecting flags from environment + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + Makefile | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/Makefile b/Makefile +index 5af1689..af699d2 100644 +--- a/Makefile ++++ b/Makefile +@@ -17,14 +17,12 @@ + # along with this program; if not, write to the Free Software + # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +-CC= gcc + #SKFLAGS= -g -DSYSV -Wall + #LDFLAGS= -g +-SKFLAGS= $(RPM_OPT_FLAGS) -O3 -DSYSV -fomit-frame-pointer -Wall -fno-strength-reduce ++SKFLAGS = $(CFLAGS) $(CPPFLAGS) -DSYSV -Wall -fno-strength-reduce + # -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE + # -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE + # $(shell getconf LFS_SKFLAGS) +-LDFLAGS= -s + + # Look where your install program is. + INSTALL = /usr/bin/install +-- +2.13.2 + diff --git a/meta/recipes-extended/sysklogd/sysklogd.inc b/meta/recipes-extended/sysklogd/sysklogd.inc index 78b8d7a985..644728ae67 100644 --- a/meta/recipes-extended/sysklogd/sysklogd.inc +++ b/meta/recipes-extended/sysklogd/sysklogd.inc @@ -16,6 +16,8 @@ inherit update-rc.d update-alternatives systemd SRC_URI = "http://www.infodrom.org/projects/sysklogd/download/sysklogd-${PV}.tar.gz \ file://no-strip-install.patch \ file://0001-Fix-build-with-musl.patch \ + file://0001-fix-problems-that-causes-a-segmentation-fault-under-.patch \ + file://0002-Make-way-for-respecting-flags-from-environment.patch \ file://sysklogd \ file://syslog.conf \ file://syslogd.service \ @@ -32,9 +34,7 @@ SYSTEMD_AUTO_ENABLE = "enable" INITSCRIPT_NAME = "syslog" CONFFILES_${PN} = "${sysconfdir}/syslog.conf.${BPN}" -EXTRA_OEMAKE = "-e MAKEFLAGS=" - -CFLAGS_append = " -DSYSV" +CFLAGS += "-DSYSV -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE" do_install () { install -d ${D}${mandir}/man8 \ -- 2.13.2 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 10/19] libunwind: We set -fPIE in security flags now if gcc is not configured for default PIE 2017-07-01 14:23 [PATCH 00/19] Rework GCC PIE and security flags (take 3) Khem Raj ` (8 preceding siblings ...) 2017-07-01 14:23 ` [PATCH 09/19] sysklogd: Improve build and fix runtime crash Khem Raj @ 2017-07-01 14:23 ` Khem Raj 2017-07-01 14:23 ` [PATCH 11/19] valgrind: Remove -no-pie from cflags Khem Raj ` (8 subsequent siblings) 18 siblings, 0 replies; 20+ messages in thread From: Khem Raj @ 2017-07-01 14:23 UTC (permalink / raw) To: openembedded-core Signed-off-by: Khem Raj <raj.khem@gmail.com> --- meta/recipes-support/libunwind/libunwind_1.2.bb | 4 ---- 1 file changed, 4 deletions(-) diff --git a/meta/recipes-support/libunwind/libunwind_1.2.bb b/meta/recipes-support/libunwind/libunwind_1.2.bb index e598e40c6f..c6312f24fd 100644 --- a/meta/recipes-support/libunwind/libunwind_1.2.bb +++ b/meta/recipes-support/libunwind/libunwind_1.2.bb @@ -21,8 +21,4 @@ EXTRA_OECONF_append_libc-musl = " --disable-documentation --disable-tests " ARM_INSTRUCTION_SET_armv4 = "arm" ARM_INSTRUCTION_SET_armv5 = "arm" -# see https://sourceware.org/bugzilla/show_bug.cgi?id=19987 -SECURITY_CFLAGS_remove_aarch64 = "-fpie" -SECURITY_CFLAGS_append_aarch64 = " -fPIE" - LDFLAGS += "-Wl,-z,relro,-z,now ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" -- 2.13.2 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 11/19] valgrind: Remove -no-pie from cflags 2017-07-01 14:23 [PATCH 00/19] Rework GCC PIE and security flags (take 3) Khem Raj ` (9 preceding siblings ...) 2017-07-01 14:23 ` [PATCH 10/19] libunwind: We set -fPIE in security flags now if gcc is not configured for default PIE Khem Raj @ 2017-07-01 14:23 ` Khem Raj 2017-07-01 14:23 ` [PATCH 12/19] icu: Fix build with glibc 2.26 Khem Raj ` (7 subsequent siblings) 18 siblings, 0 replies; 20+ messages in thread From: Khem Raj @ 2017-07-01 14:23 UTC (permalink / raw) To: openembedded-core It has been moved to distro security include file Signed-off-by: Khem Raj <raj.khem@gmail.com> --- meta/recipes-devtools/valgrind/valgrind_3.12.0.bb | 2 -- 1 file changed, 2 deletions(-) diff --git a/meta/recipes-devtools/valgrind/valgrind_3.12.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.12.0.bb index a81adc31d6..888b132ec7 100644 --- a/meta/recipes-devtools/valgrind/valgrind_3.12.0.bb +++ b/meta/recipes-devtools/valgrind/valgrind_3.12.0.bb @@ -73,8 +73,6 @@ CACHED_CONFIGUREVARS += "ac_cv_path_PERL='/usr/bin/env perl'" # which fixes build path issue in DWARF. SELECTED_OPTIMIZATION = "${DEBUG_FLAGS}" -CFLAGS += "-no-pie" - def get_mcpu(d): for arg in (d.getVar('TUNE_CCARGS') or '').split(): if arg.startswith('-mcpu='): -- 2.13.2 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 12/19] icu: Fix build with glibc 2.26 2017-07-01 14:23 [PATCH 00/19] Rework GCC PIE and security flags (take 3) Khem Raj ` (10 preceding siblings ...) 2017-07-01 14:23 ` [PATCH 11/19] valgrind: Remove -no-pie from cflags Khem Raj @ 2017-07-01 14:23 ` Khem Raj 2017-07-01 14:23 ` [PATCH 13/19] gstreamer1.0-plugins-bad: Fix missing library with bcm egl Khem Raj ` (6 subsequent siblings) 18 siblings, 0 replies; 20+ messages in thread From: Khem Raj @ 2017-07-01 14:23 UTC (permalink / raw) To: openembedded-core Signed-off-by: Khem Raj <raj.khem@gmail.com> --- .../icu/icu/0001-i18n-Drop-include-xlocale.h.patch | 31 ++++++++++++++++++++++ meta/recipes-support/icu/icu_58.2.bb | 3 ++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-support/icu/icu/0001-i18n-Drop-include-xlocale.h.patch diff --git a/meta/recipes-support/icu/icu/0001-i18n-Drop-include-xlocale.h.patch b/meta/recipes-support/icu/icu/0001-i18n-Drop-include-xlocale.h.patch new file mode 100644 index 0000000000..add0d765b7 --- /dev/null +++ b/meta/recipes-support/icu/icu/0001-i18n-Drop-include-xlocale.h.patch @@ -0,0 +1,31 @@ +From c4254fd8ff1888ca285e3242b812010357ce2b3e Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 24 Jun 2017 22:52:40 -0700 +Subject: [PATCH] i18n: Drop include <xlocale.h> + +glibc 2.26 drops this header + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Pending + + i18n/digitlst.cpp | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +Index: source/i18n/digitlst.cpp +=================================================================== +--- source.orig/i18n/digitlst.cpp ++++ source/i18n/digitlst.cpp +@@ -61,11 +61,7 @@ + #endif + + #if U_USE_STRTOD_L +-# if U_PLATFORM_USES_ONLY_WIN32_API || U_PLATFORM == U_PF_CYGWIN +-# include <locale.h> +-# else +-# include <xlocale.h> +-# endif ++# include <locale.h> + #endif + + // *************************************************************************** diff --git a/meta/recipes-support/icu/icu_58.2.bb b/meta/recipes-support/icu/icu_58.2.bb index 4d062ebf94..47684a6c8b 100644 --- a/meta/recipes-support/icu/icu_58.2.bb +++ b/meta/recipes-support/icu/icu_58.2.bb @@ -16,7 +16,8 @@ BASE_SRC_URI = "http://download.icu-project.org/files/icu4c/${PV}/icu4c-${ICU_PV SRC_URI = "${BASE_SRC_URI} \ file://icu-pkgdata-large-cmd.patch \ file://fix-install-manx.patch \ - " + file://0001-i18n-Drop-include-xlocale.h.patch \ + " SRC_URI_append_class-target = "\ file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \ -- 2.13.2 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 13/19] gstreamer1.0-plugins-bad: Fix missing library with bcm egl 2017-07-01 14:23 [PATCH 00/19] Rework GCC PIE and security flags (take 3) Khem Raj ` (11 preceding siblings ...) 2017-07-01 14:23 ` [PATCH 12/19] icu: Fix build with glibc 2.26 Khem Raj @ 2017-07-01 14:23 ` Khem Raj 2017-07-01 14:23 ` [PATCH 14/19] gcc-sanitizer: Fix build with glibc 2.26 Khem Raj ` (5 subsequent siblings) 18 siblings, 0 replies; 20+ messages in thread From: Khem Raj @ 2017-07-01 14:23 UTC (permalink / raw) To: openembedded-core userland graphics driver provided libegl for rpi depends upon symbols from vchostif library, therefore add it to linker cmdline helps with loadng gst-gl plugins on rpi Signed-off-by: Khem Raj <raj.khem@gmail.com> --- .../link-with-libvchostif.patch | 35 ++++++++++++++++++++++ .../gstreamer/gstreamer1.0-plugins-bad_1.10.4.bb | 1 + 2 files changed, 36 insertions(+) create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/link-with-libvchostif.patch diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/link-with-libvchostif.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/link-with-libvchostif.patch new file mode 100644 index 0000000000..c382b17586 --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/link-with-libvchostif.patch @@ -0,0 +1,35 @@ +Add -lvchostif to link when using -lEGL on rpi + +This is required because libEGL from userland uses sybols +from this library. + +lib/libEGL.so.1.0.0 121: 00000000 0 FUNC GLOBAL DEFAULT UND vc_dispmanx_element_add + 1552: 00000000 0 FUNC GLOBAL DEFAULT UND vc_dispmanx_element_add + +These symbols are provided by libvchostif as seen below + +lib/libvchostif.so + 252: 0000b161 192 FUNC GLOBAL DEFAULT 9 vc_dispmanx_element_add + 809: 0000b161 192 FUNC GLOBAL DEFAULT 9 vc_dispmanx_element_add + +With this explicit link, plugins fail during runtime + +(gst-plugin-scanner:571): GStreamer-WARNING **: Failed to load plugin '/usr/lib/gstreamer-1.0/libgstomx.so': Error relocating /usr/lib/libgstgl-1.0.so.0: vc_dispmanx_element_add: symbol not found +(gst-plugin-scanner:571): GStreamer-WARNING **: Failed to load plugin '/usr/lib/gstreamer-1.0/libgstopengl.so': Error relocating /usr/lib/libgstgl-1.0.so.0: vc_dispmanx_element_add: symbol not found + +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +Upstream-Status: Pending +Index: gst-plugins-bad-1.10.4/configure.ac +=================================================================== +--- gst-plugins-bad-1.10.4.orig/configure.ac ++++ gst-plugins-bad-1.10.4/configure.ac +@@ -785,7 +785,7 @@ case $host in + HAVE_EGL=yes + HAVE_GLES2=yes + HAVE_EGL_RPI=yes +- EGL_LIBS="-lbcm_host -lvcos -lvchiq_arm" ++ EGL_LIBS="-lbcm_host -lvchostif -lvcos -lvchiq_arm" + EGL_CFLAGS="" + AC_DEFINE(USE_EGL_RPI, [1], [Use RPi platform]) + ]) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.10.4.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.10.4.bb index 0bb4053e43..def03a9b81 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.10.4.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.10.4.bb @@ -18,6 +18,7 @@ SRC_URI = " \ file://0001-smoothstreaming-implement-adaptivedemux-s-get_live_s.patch \ file://0001-smoothstreaming-use-the-duration-from-the-list-of-fr.patch \ file://0001-mssdemux-improved-live-playback-support.patch \ + file://link-with-libvchostif.patch \ " SRC_URI[md5sum] = "2757103e57a096a1a05b3ab85b8381af" SRC_URI[sha256sum] = "23ddae506b3a223b94869a0d3eea3e9a12e847f94d2d0e0b97102ce13ecd6966" -- 2.13.2 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 14/19] gcc-sanitizer: Fix build with glibc 2.26 2017-07-01 14:23 [PATCH 00/19] Rework GCC PIE and security flags (take 3) Khem Raj ` (12 preceding siblings ...) 2017-07-01 14:23 ` [PATCH 13/19] gstreamer1.0-plugins-bad: Fix missing library with bcm egl Khem Raj @ 2017-07-01 14:23 ` Khem Raj 2017-07-01 14:23 ` [PATCH 15/19] gcc: Use ucontext_t instead of ucontext Khem Raj ` (4 subsequent siblings) 18 siblings, 0 replies; 20+ messages in thread From: Khem Raj @ 2017-07-01 14:23 UTC (permalink / raw) To: openembedded-core sigaltstack is no more exposed by glibc see (bug 21517) therefore adjust to use stack_t instead Use res_state typedef instead of referring to __res_state struct Signed-off-by: Khem Raj <raj.khem@gmail.com> --- meta/recipes-devtools/gcc/gcc-7.1.inc | 1 + ...r-Use-stack_t-instead-of-struct-sigaltsta.patch | 160 +++++++++++++++++++++ 2 files changed, 161 insertions(+) create mode 100644 meta/recipes-devtools/gcc/gcc-7.1/0049-libsanitizer-Use-stack_t-instead-of-struct-sigaltsta.patch diff --git a/meta/recipes-devtools/gcc/gcc-7.1.inc b/meta/recipes-devtools/gcc/gcc-7.1.inc index 96fc11c943..f30a73c31c 100644 --- a/meta/recipes-devtools/gcc/gcc-7.1.inc +++ b/meta/recipes-devtools/gcc/gcc-7.1.inc @@ -73,6 +73,7 @@ SRC_URI = "\ file://0046-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch \ file://0047-sync-gcc-stddef.h-with-musl.patch \ file://0048-gcc-Enable-static-PIE.patch \ + file://0049-libsanitizer-Use-stack_t-instead-of-struct-sigaltsta.patch \ ${BACKPORTS} \ " BACKPORTS = "\ diff --git a/meta/recipes-devtools/gcc/gcc-7.1/0049-libsanitizer-Use-stack_t-instead-of-struct-sigaltsta.patch b/meta/recipes-devtools/gcc/gcc-7.1/0049-libsanitizer-Use-stack_t-instead-of-struct-sigaltsta.patch new file mode 100644 index 0000000000..ee15c6cac8 --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-7.1/0049-libsanitizer-Use-stack_t-instead-of-struct-sigaltsta.patch @@ -0,0 +1,160 @@ +From 4c07606bb77bbd30f02adb947d480516da3fa3f7 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 11 Jun 2017 10:09:13 -0700 +Subject: [PATCH] libsanitizer: Use stack_t instead of struct sigaltstack + +Upstream-Status: Submitted + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + libsanitizer/sanitizer_common/sanitizer_linux.cc | 4 ++-- + libsanitizer/sanitizer_common/sanitizer_linux.h | 6 +++--- + .../sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc | 3 ++- + 3 files changed, 7 insertions(+), 6 deletions(-) + +Index: gcc-7.1.0/libsanitizer/sanitizer_common/sanitizer_linux.cc +=================================================================== +--- gcc-7.1.0.orig/libsanitizer/sanitizer_common/sanitizer_linux.cc ++++ gcc-7.1.0/libsanitizer/sanitizer_common/sanitizer_linux.cc +@@ -14,6 +14,10 @@ + + #if SANITIZER_FREEBSD || SANITIZER_LINUX + ++#if !SANITIZER_ANDROID ++#include <sys/signal.h> ++#endif ++ + #include "sanitizer_common.h" + #include "sanitizer_flags.h" + #include "sanitizer_internal_defs.h" +@@ -71,10 +75,6 @@ extern "C" { + extern char **environ; // provided by crt1 + #endif // SANITIZER_FREEBSD + +-#if !SANITIZER_ANDROID +-#include <sys/signal.h> +-#endif +- + #if SANITIZER_LINUX + // <linux/time.h> + struct kernel_timeval { +@@ -605,8 +605,8 @@ uptr internal_prctl(int option, uptr arg + } + #endif + +-uptr internal_sigaltstack(const struct sigaltstack *ss, +- struct sigaltstack *oss) { ++uptr internal_sigaltstack(const stack_t *ss, ++ stack_t *oss) { + return internal_syscall(SYSCALL(sigaltstack), (uptr)ss, (uptr)oss); + } + +Index: gcc-7.1.0/libsanitizer/sanitizer_common/sanitizer_linux.h +=================================================================== +--- gcc-7.1.0.orig/libsanitizer/sanitizer_common/sanitizer_linux.h ++++ gcc-7.1.0/libsanitizer/sanitizer_common/sanitizer_linux.h +@@ -19,7 +19,10 @@ + #include "sanitizer_platform_limits_posix.h" + + struct link_map; // Opaque type returned by dlopen(). +-struct sigaltstack; ++ ++#ifndef __stack_t_defined ++struct stack_t; ++#endif + + namespace __sanitizer { + // Dirent structure for getdents(). Note that this structure is different from +@@ -28,8 +31,8 @@ struct linux_dirent; + + // Syscall wrappers. + uptr internal_getdents(fd_t fd, struct linux_dirent *dirp, unsigned int count); +-uptr internal_sigaltstack(const struct sigaltstack* ss, +- struct sigaltstack* oss); ++uptr internal_sigaltstack(const stack_t* ss, ++ stack_t* oss); + uptr internal_sigprocmask(int how, __sanitizer_sigset_t *set, + __sanitizer_sigset_t *oldset); + +Index: gcc-7.1.0/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc +=================================================================== +--- gcc-7.1.0.orig/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc ++++ gcc-7.1.0/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc +@@ -16,6 +16,7 @@ + defined(__aarch64__) || defined(__powerpc64__) || \ + defined(__s390__)) + ++#include <signal.h> + #include "sanitizer_stoptheworld.h" + + #include "sanitizer_platform_limits_posix.h" +@@ -273,7 +274,7 @@ static int TracerThread(void* argument) + + // Alternate stack for signal handling. + InternalScopedBuffer<char> handler_stack_memory(kHandlerStackSize); +- struct sigaltstack handler_stack; ++ stack_t handler_stack; + internal_memset(&handler_stack, 0, sizeof(handler_stack)); + handler_stack.ss_sp = handler_stack_memory.data(); + handler_stack.ss_size = kHandlerStackSize; +Index: gcc-7.1.0/libsanitizer/tsan/tsan_platform_linux.cc +=================================================================== +--- gcc-7.1.0.orig/libsanitizer/tsan/tsan_platform_linux.cc ++++ gcc-7.1.0/libsanitizer/tsan/tsan_platform_linux.cc +@@ -14,6 +14,7 @@ + #include "sanitizer_common/sanitizer_platform.h" + #if SANITIZER_LINUX || SANITIZER_FREEBSD + ++#include <signal.h> + #include "sanitizer_common/sanitizer_common.h" + #include "sanitizer_common/sanitizer_libc.h" + #include "sanitizer_common/sanitizer_linux.h" +@@ -28,7 +29,6 @@ + + #include <fcntl.h> + #include <pthread.h> +-#include <signal.h> + #include <stdio.h> + #include <stdlib.h> + #include <string.h> +@@ -287,7 +287,7 @@ void InitializePlatform() { + int ExtractResolvFDs(void *state, int *fds, int nfd) { + #if SANITIZER_LINUX && !SANITIZER_ANDROID + int cnt = 0; +- __res_state *statp = (__res_state*)state; ++ res_state statp = (res_state)state; + for (int i = 0; i < MAXNS && cnt < nfd; i++) { + if (statp->_u._ext.nsaddrs[i] && statp->_u._ext.nssocks[i] != -1) + fds[cnt++] = statp->_u._ext.nssocks[i]; +Index: gcc-7.1.0/libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cc +=================================================================== +--- gcc-7.1.0.orig/libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cc ++++ gcc-7.1.0/libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cc +@@ -14,6 +14,7 @@ + + #if SANITIZER_FREEBSD || SANITIZER_LINUX + ++#include <signal.h> + #include "sanitizer_allocator_internal.h" + #include "sanitizer_atomic.h" + #include "sanitizer_common.h" +@@ -30,7 +31,6 @@ + + #include <link.h> + #include <pthread.h> +-#include <signal.h> + #include <sys/resource.h> + #include <syslog.h> + +Index: gcc-7.1.0/libsanitizer/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc +=================================================================== +--- gcc-7.1.0.orig/libsanitizer/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc ++++ gcc-7.1.0/libsanitizer/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc +@@ -12,6 +12,7 @@ + + #include "sanitizer_platform.h" + #if SANITIZER_POSIX ++#include <signal.h> + #include "sanitizer_allocator_internal.h" + #include "sanitizer_common.h" + #include "sanitizer_flags.h" -- 2.13.2 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 15/19] gcc: Use ucontext_t instead of ucontext 2017-07-01 14:23 [PATCH 00/19] Rework GCC PIE and security flags (take 3) Khem Raj ` (13 preceding siblings ...) 2017-07-01 14:23 ` [PATCH 14/19] gcc-sanitizer: Fix build with glibc 2.26 Khem Raj @ 2017-07-01 14:23 ` Khem Raj 2017-07-01 14:23 ` [PATCH 16/19] valgrind: Fix build with glibc 2.26 Khem Raj ` (3 subsequent siblings) 18 siblings, 0 replies; 20+ messages in thread From: Khem Raj @ 2017-07-01 14:23 UTC (permalink / raw) To: openembedded-core glibc 2.26 does not expose struct ucontext anymore Signed-off-by: Khem Raj <raj.khem@gmail.com> --- meta/recipes-devtools/gcc/gcc-7.1.inc | 1 + ...0-replace-struct-ucontext-with-ucontext_t.patch | 149 +++++++++++++++++++++ 2 files changed, 150 insertions(+) create mode 100644 meta/recipes-devtools/gcc/gcc-7.1/0050-replace-struct-ucontext-with-ucontext_t.patch diff --git a/meta/recipes-devtools/gcc/gcc-7.1.inc b/meta/recipes-devtools/gcc/gcc-7.1.inc index f30a73c31c..3f1c06dafd 100644 --- a/meta/recipes-devtools/gcc/gcc-7.1.inc +++ b/meta/recipes-devtools/gcc/gcc-7.1.inc @@ -74,6 +74,7 @@ SRC_URI = "\ file://0047-sync-gcc-stddef.h-with-musl.patch \ file://0048-gcc-Enable-static-PIE.patch \ file://0049-libsanitizer-Use-stack_t-instead-of-struct-sigaltsta.patch \ + file://0050-replace-struct-ucontext-with-ucontext_t.patch \ ${BACKPORTS} \ " BACKPORTS = "\ diff --git a/meta/recipes-devtools/gcc/gcc-7.1/0050-replace-struct-ucontext-with-ucontext_t.patch b/meta/recipes-devtools/gcc/gcc-7.1/0050-replace-struct-ucontext-with-ucontext_t.patch new file mode 100644 index 0000000000..e814992e44 --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-7.1/0050-replace-struct-ucontext-with-ucontext_t.patch @@ -0,0 +1,149 @@ +From 7b3cb36ab07d0c36b500bb5d0548b190d4b5a9f6 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 28 Jun 2017 00:25:57 -0700 +Subject: [PATCH 50/50] replace struct ucontext with ucontext_t + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + libgcc/config/aarch64/linux-unwind.h | 2 +- + libgcc/config/alpha/linux-unwind.h | 2 +- + libgcc/config/bfin/linux-unwind.h | 2 +- + libgcc/config/i386/linux-unwind.h | 4 ++-- + libgcc/config/pa/linux-unwind.h | 2 +- + libgcc/config/riscv/linux-unwind.h | 2 +- + libgcc/config/sh/linux-unwind.h | 2 +- + libgcc/config/tilepro/linux-unwind.h | 2 +- + libgcc/config/xtensa/linux-unwind.h | 2 +- + 9 files changed, 10 insertions(+), 10 deletions(-) + +diff --git a/libgcc/config/aarch64/linux-unwind.h b/libgcc/config/aarch64/linux-unwind.h +index d5d6980442f..d46d5f53be3 100644 +--- a/libgcc/config/aarch64/linux-unwind.h ++++ b/libgcc/config/aarch64/linux-unwind.h +@@ -55,7 +55,7 @@ aarch64_fallback_frame_state (struct _Unwind_Context *context, + struct rt_sigframe + { + siginfo_t info; +- struct ucontext uc; ++ ucontext_t uc; + }; + + struct rt_sigframe *rt_; +diff --git a/libgcc/config/alpha/linux-unwind.h b/libgcc/config/alpha/linux-unwind.h +index a91a5f4fe26..7202516581d 100644 +--- a/libgcc/config/alpha/linux-unwind.h ++++ b/libgcc/config/alpha/linux-unwind.h +@@ -51,7 +51,7 @@ alpha_fallback_frame_state (struct _Unwind_Context *context, + { + struct rt_sigframe { + siginfo_t info; +- struct ucontext uc; ++ ucontext_t uc; + } *rt_ = context->cfa; + sc = &rt_->uc.uc_mcontext; + } +diff --git a/libgcc/config/bfin/linux-unwind.h b/libgcc/config/bfin/linux-unwind.h +index 9412c7652b8..37e9feb6965 100644 +--- a/libgcc/config/bfin/linux-unwind.h ++++ b/libgcc/config/bfin/linux-unwind.h +@@ -52,7 +52,7 @@ bfin_fallback_frame_state (struct _Unwind_Context *context, + void *puc; + char retcode[8]; + siginfo_t info; +- struct ucontext uc; ++ ucontext_t uc; + } *rt_ = context->cfa; + + /* The void * cast is necessary to avoid an aliasing warning. +diff --git a/libgcc/config/i386/linux-unwind.h b/libgcc/config/i386/linux-unwind.h +index b1d5040a687..2009ad72260 100644 +--- a/libgcc/config/i386/linux-unwind.h ++++ b/libgcc/config/i386/linux-unwind.h +@@ -58,7 +58,7 @@ x86_64_fallback_frame_state (struct _Unwind_Context *context, + if (*(unsigned char *)(pc+0) == 0x48 + && *(unsigned long long *)(pc+1) == RT_SIGRETURN_SYSCALL) + { +- struct ucontext *uc_ = context->cfa; ++ ucontext_t *uc_ = context->cfa; + /* The void * cast is necessary to avoid an aliasing warning. + The aliasing warning is correct, but should not be a problem + because it does not alias anything. */ +@@ -138,7 +138,7 @@ x86_fallback_frame_state (struct _Unwind_Context *context, + siginfo_t *pinfo; + void *puc; + siginfo_t info; +- struct ucontext uc; ++ ucontext_t uc; + } *rt_ = context->cfa; + /* The void * cast is necessary to avoid an aliasing warning. + The aliasing warning is correct, but should not be a problem +diff --git a/libgcc/config/pa/linux-unwind.h b/libgcc/config/pa/linux-unwind.h +index 580c18dad69..c2c3409bcc1 100644 +--- a/libgcc/config/pa/linux-unwind.h ++++ b/libgcc/config/pa/linux-unwind.h +@@ -80,7 +80,7 @@ pa32_fallback_frame_state (struct _Unwind_Context *context, + struct sigcontext *sc; + struct rt_sigframe { + siginfo_t info; +- struct ucontext uc; ++ ucontext_t uc; + } *frame; + + /* rt_sigreturn trampoline: +diff --git a/libgcc/config/riscv/linux-unwind.h b/libgcc/config/riscv/linux-unwind.h +index a051a2869d4..1c8aeff7ef0 100644 +--- a/libgcc/config/riscv/linux-unwind.h ++++ b/libgcc/config/riscv/linux-unwind.h +@@ -42,7 +42,7 @@ riscv_fallback_frame_state (struct _Unwind_Context *context, + struct rt_sigframe + { + siginfo_t info; +- struct ucontext uc; ++ ucontext_t uc; + }; + + struct rt_sigframe *rt_; +diff --git a/libgcc/config/sh/linux-unwind.h b/libgcc/config/sh/linux-unwind.h +index 1038caeb5c3..a8c98220282 100644 +--- a/libgcc/config/sh/linux-unwind.h ++++ b/libgcc/config/sh/linux-unwind.h +@@ -82,7 +82,7 @@ sh_fallback_frame_state (struct _Unwind_Context *context, + { + struct rt_sigframe { + siginfo_t info; +- struct ucontext uc; ++ ucontext_t uc; + } *rt_ = context->cfa; + /* The void * cast is necessary to avoid an aliasing warning. + The aliasing warning is correct, but should not be a problem +diff --git a/libgcc/config/tilepro/linux-unwind.h b/libgcc/config/tilepro/linux-unwind.h +index a8dc4405715..dba3b410279 100644 +--- a/libgcc/config/tilepro/linux-unwind.h ++++ b/libgcc/config/tilepro/linux-unwind.h +@@ -61,7 +61,7 @@ tile_fallback_frame_state (struct _Unwind_Context *context, + struct rt_sigframe { + unsigned char save_area[C_ABI_SAVE_AREA_SIZE]; + siginfo_t info; +- struct ucontext uc; ++ ucontext_t uc; + } *rt_; + + /* Return if this is not a signal handler. */ +diff --git a/libgcc/config/xtensa/linux-unwind.h b/libgcc/config/xtensa/linux-unwind.h +index 67c272820d0..b37b8b31bbf 100644 +--- a/libgcc/config/xtensa/linux-unwind.h ++++ b/libgcc/config/xtensa/linux-unwind.h +@@ -67,7 +67,7 @@ xtensa_fallback_frame_state (struct _Unwind_Context *context, + + struct rt_sigframe { + siginfo_t info; +- struct ucontext uc; ++ struct ucontext_t uc; + } *rt_; + + /* movi a2, __NR_rt_sigreturn; syscall */ +-- +2.13.2 + -- 2.13.2 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 16/19] valgrind: Fix build with glibc 2.26 2017-07-01 14:23 [PATCH 00/19] Rework GCC PIE and security flags (take 3) Khem Raj ` (14 preceding siblings ...) 2017-07-01 14:23 ` [PATCH 15/19] gcc: Use ucontext_t instead of ucontext Khem Raj @ 2017-07-01 14:23 ` Khem Raj 2017-07-01 14:23 ` [PATCH 17/19] strace: upgrade to 4.17 Khem Raj ` (2 subsequent siblings) 18 siblings, 0 replies; 20+ messages in thread From: Khem Raj @ 2017-07-01 14:23 UTC (permalink / raw) To: openembedded-core Signed-off-by: Khem Raj <raj.khem@gmail.com> --- ...sts-Use-ucontext_t-instead-of-struct-ucon.patch | 30 ++++++++++++++++++++++ meta/recipes-devtools/valgrind/valgrind_3.12.0.bb | 1 + 2 files changed, 31 insertions(+) create mode 100644 meta/recipes-devtools/valgrind/valgrind/0001-memcheck-tests-Use-ucontext_t-instead-of-struct-ucon.patch diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-memcheck-tests-Use-ucontext_t-instead-of-struct-ucon.patch b/meta/recipes-devtools/valgrind/valgrind/0001-memcheck-tests-Use-ucontext_t-instead-of-struct-ucon.patch new file mode 100644 index 0000000000..bf16a1adfe --- /dev/null +++ b/meta/recipes-devtools/valgrind/valgrind/0001-memcheck-tests-Use-ucontext_t-instead-of-struct-ucon.patch @@ -0,0 +1,30 @@ +From 629ac492b1d9bc709d17337eb9b1c28603eca250 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 28 Jun 2017 11:01:25 -0700 +Subject: [PATCH] memcheck/tests: Use ucontext_t instead of struct ucontext + +glibc 2.26 does not expose struct ucontext anymore + +Upstream-Status: Submitted [https://bugs.kde.org/show_bug.cgi?id=381769] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + memcheck/tests/linux/stack_changes.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/memcheck/tests/linux/stack_changes.c b/memcheck/tests/linux/stack_changes.c +index ffb49c6..acc4109 100644 +--- a/memcheck/tests/linux/stack_changes.c ++++ b/memcheck/tests/linux/stack_changes.c +@@ -11,7 +11,7 @@ + // checks that Valgrind notices their stack changes properly. + + #ifdef __GLIBC__ +-typedef struct ucontext mycontext; ++typedef ucontext_t mycontext; + + mycontext ctx1, ctx2, oldc; + int count; +-- +2.13.2 + diff --git a/meta/recipes-devtools/valgrind/valgrind_3.12.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.12.0.bb index 888b132ec7..4cf8062031 100644 --- a/meta/recipes-devtools/valgrind/valgrind_3.12.0.bb +++ b/meta/recipes-devtools/valgrind/valgrind_3.12.0.bb @@ -31,6 +31,7 @@ SRC_URI = "http://www.valgrind.org/downloads/valgrind-${PV}.tar.bz2 \ file://0004-pth_atfork1.c-Define-error-API-for-musl.patch \ file://0005-tc20_verifywrap.c-Fake-__GLIBC_PREREQ-with-musl.patch \ file://0006-pth_detached3.c-Dereference-pthread_t-before-adding-.patch \ + file://0001-memcheck-tests-Use-ucontext_t-instead-of-struct-ucon.patch \ " SRC_URI_append_libc-musl = "\ file://0001-fix-build-for-musl-targets.patch \ -- 2.13.2 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 17/19] strace: upgrade to 4.17 2017-07-01 14:23 [PATCH 00/19] Rework GCC PIE and security flags (take 3) Khem Raj ` (15 preceding siblings ...) 2017-07-01 14:23 ` [PATCH 16/19] valgrind: Fix build with glibc 2.26 Khem Raj @ 2017-07-01 14:23 ` Khem Raj 2017-07-01 14:23 ` [PATCH 18/19] qemu: Replace use of struct ucontext with ucontext_t Khem Raj 2017-07-01 14:23 ` [PATCH 19/19] epiphany: Fix build errors when compiling with security flags Khem Raj 18 siblings, 0 replies; 20+ messages in thread From: Khem Raj @ 2017-07-01 14:23 UTC (permalink / raw) To: openembedded-core Fix build with upcoming glibc 2.26 Signed-off-by: Khem Raj <raj.khem@gmail.com> --- ...8-replace-struct-ucontext-with-ucontext_t.patch | 31 ++++++++++++++++++++++ .../strace/strace/Makefile-ptest.patch | 19 ++++++++----- .../strace/{strace_4.16.bb => strace_4.17.bb} | 5 ++-- 3 files changed, 47 insertions(+), 8 deletions(-) create mode 100644 meta/recipes-devtools/strace/strace/0008-replace-struct-ucontext-with-ucontext_t.patch rename meta/recipes-devtools/strace/{strace_4.16.bb => strace_4.17.bb} (87%) diff --git a/meta/recipes-devtools/strace/strace/0008-replace-struct-ucontext-with-ucontext_t.patch b/meta/recipes-devtools/strace/strace/0008-replace-struct-ucontext-with-ucontext_t.patch new file mode 100644 index 0000000000..1985d8104d --- /dev/null +++ b/meta/recipes-devtools/strace/strace/0008-replace-struct-ucontext-with-ucontext_t.patch @@ -0,0 +1,31 @@ +From 07f71a12cb88919c6113284fc43bf4967e5e2bc1 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 28 Jun 2017 11:36:57 -0700 +Subject: [PATCH 8/8] replace struct ucontext with ucontext_t + +glibc >= 2.26 has dropped the tag struct ucontext +from ucontext_t type + +Upstream-Status: Submitted + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + linux/arm/arch_sigreturn.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/linux/arm/arch_sigreturn.c b/linux/arm/arch_sigreturn.c +index b60dad8..a2b7100 100644 +--- a/linux/arm/arch_sigreturn.c ++++ b/linux/arm/arch_sigreturn.c +@@ -9,7 +9,7 @@ arch_sigreturn(struct tcb *tcp) + #ifdef AARCH64 + tcp->currpers == 0 ? + (*aarch64_sp_ptr + SIZEOF_STRUCT_SIGINFO + +- offsetof(struct ucontext, uc_sigmask)) : ++ offsetof(ucontext_t, uc_sigmask)) : + #endif + (*arm_sp_ptr + + OFFSETOF_STRUCT_UCONTEXT_UC_SIGMASK); +-- +2.13.2 + diff --git a/meta/recipes-devtools/strace/strace/Makefile-ptest.patch b/meta/recipes-devtools/strace/strace/Makefile-ptest.patch index 876c2d8629..07ea0b37f2 100644 --- a/meta/recipes-devtools/strace/strace/Makefile-ptest.patch +++ b/meta/recipes-devtools/strace/strace/Makefile-ptest.patch @@ -1,19 +1,23 @@ -strace: Add ptest +From 0574ae9926308dcbca78bd8cd0f0f143f19cbcb5 Mon Sep 17 00:00:00 2001 +From: Gabriel Barbu <gabriel.barbu@enea.com> +Date: Thu, 25 Jul 2013 15:28:33 +0200 +Subject: [PATCH 4/8] strace: Add ptest Upstream-Status: Inappropriate Signed-off-by: Gabriel Barbu <gabriel.barbu@enea.com> Signed-off-by: Chong Lu <Chong.Lu@windriver.com> + --- configure.ac | 2 +- tests/Makefile.am | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index b2b03c6..464a9dc 100644 +index 61d6425..6387c24 100644 --- a/configure.ac +++ b/configure.ac -@@ -39,7 +39,7 @@ AC_COPYRIGHT([Copyright (C) 1999-2017 The strace developers.]) +@@ -41,7 +41,7 @@ AC_COPYRIGHT([Copyright (C) 1999-]copyright_year[ The strace developers.]) AC_CONFIG_SRCDIR([strace.c]) AC_CONFIG_AUX_DIR([.]) AC_CONFIG_HEADERS([config.h]) @@ -23,11 +27,11 @@ index b2b03c6..464a9dc 100644 AM_MAINTAINER_MODE AC_CANONICAL_HOST diff --git a/tests/Makefile.am b/tests/Makefile.am -index 311d3bb..72f9022 100644 +index 5aa7f89..a55a355 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am -@@ -960,3 +960,21 @@ $(objects): scno.h - CLEANFILES = ksysent.h $(TESTS:=.tmp) +@@ -379,3 +379,21 @@ clean-local-check: + CLEANFILES = ksysent.h include ../scno.am + @@ -48,3 +52,6 @@ index 311d3bb..72f9022 100644 + sed -i -e 's/$${srcdir=.}/./g' $(DESTDIR)/$(TESTDIR)/$$file; \ + done + for i in net net-fd scm_rights-fd sigaction; do sed -i -e 's/$$srcdir/./g' $(DESTDIR)/$(TESTDIR)/$$i.test; done +-- +2.13.2 + diff --git a/meta/recipes-devtools/strace/strace_4.16.bb b/meta/recipes-devtools/strace/strace_4.17.bb similarity index 87% rename from meta/recipes-devtools/strace/strace_4.16.bb rename to meta/recipes-devtools/strace/strace_4.17.bb index b6cd2ac9b9..72fa994489 100644 --- a/meta/recipes-devtools/strace/strace_4.16.bb +++ b/meta/recipes-devtools/strace/strace_4.17.bb @@ -13,10 +13,11 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.xz \ file://0001-Fix-build-when-using-non-glibc-libc-implementation-o.patch \ file://mips-SIGEMT.patch \ file://0001-caps-abbrev.awk-fix-gawk-s-path.patch \ + file://0008-replace-struct-ucontext-with-ucontext_t.patch \ " -SRC_URI[md5sum] = "2873366cac98770efcbed6e748d5ef23" -SRC_URI[sha256sum] = "98487cb5178ec1259986cc9f6e2a844f50e5d1208c112cc22431a1e4d9adf0ef" +SRC_URI[md5sum] = "8d7eb10eba68bad83a269197e634b626" +SRC_URI[sha256sum] = "81f35b085fbb3cfa806eb521a8522ac3406deaccfe121ce35064bad268237419" inherit autotools ptest bluetooth -- 2.13.2 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 18/19] qemu: Replace use of struct ucontext with ucontext_t 2017-07-01 14:23 [PATCH 00/19] Rework GCC PIE and security flags (take 3) Khem Raj ` (16 preceding siblings ...) 2017-07-01 14:23 ` [PATCH 17/19] strace: upgrade to 4.17 Khem Raj @ 2017-07-01 14:23 ` Khem Raj 2017-07-01 14:23 ` [PATCH 19/19] epiphany: Fix build errors when compiling with security flags Khem Raj 18 siblings, 0 replies; 20+ messages in thread From: Khem Raj @ 2017-07-01 14:23 UTC (permalink / raw) To: openembedded-core Signed-off-by: Khem Raj <raj.khem@gmail.com> --- ...lace-struct-ucontext-with-ucontext_t-type.patch | 265 +++++++++++++++++++++ meta/recipes-devtools/qemu/qemu_2.8.1.1.bb | 46 ++-- 2 files changed, 286 insertions(+), 25 deletions(-) create mode 100644 meta/recipes-devtools/qemu/qemu/0001-replace-struct-ucontext-with-ucontext_t-type.patch diff --git a/meta/recipes-devtools/qemu/qemu/0001-replace-struct-ucontext-with-ucontext_t-type.patch b/meta/recipes-devtools/qemu/qemu/0001-replace-struct-ucontext-with-ucontext_t-type.patch new file mode 100644 index 0000000000..c3eb543ec0 --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/0001-replace-struct-ucontext-with-ucontext_t-type.patch @@ -0,0 +1,265 @@ +From 80954c03163fdbf8b905595a69008093096ee2f6 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 28 Jun 2017 13:28:37 -0700 +Subject: [PATCH] replace struct ucontext with ucontext_t type + +The ucontext_t type had a tag struct ucontext until now +but newer glibc will drop it so we need to adjust and use +the exposed type instead + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Cc: Kamil Rytarowski <kamil@netbsd.org> +Cc: Riku Voipio <riku.voipio@iki.fi> +Cc: Laurent Vivier <laurent@vivier.eu> +Cc: Paolo Bonzini <pbonzini@redhat.com> + +Upstream-Status: Submitted +--- + linux-user/host/aarch64/hostdep.h | 2 +- + linux-user/host/arm/hostdep.h | 2 +- + linux-user/host/i386/hostdep.h | 2 +- + linux-user/host/ppc64/hostdep.h | 2 +- + linux-user/host/s390x/hostdep.h | 2 +- + linux-user/host/x86_64/hostdep.h | 2 +- + linux-user/signal.c | 10 +++++----- + tests/tcg/test-i386.c | 4 ++-- + user-exec.c | 18 +++++++++--------- + 9 files changed, 22 insertions(+), 22 deletions(-) + +diff --git a/linux-user/host/aarch64/hostdep.h b/linux-user/host/aarch64/hostdep.h +index 64f75cef49..a8d41a21ad 100644 +--- a/linux-user/host/aarch64/hostdep.h ++++ b/linux-user/host/aarch64/hostdep.h +@@ -24,7 +24,7 @@ extern char safe_syscall_end[]; + /* Adjust the signal context to rewind out of safe-syscall if we're in it */ + static inline void rewind_if_in_safe_syscall(void *puc) + { +- struct ucontext *uc = puc; ++ ucontext_t *uc = puc; + __u64 *pcreg = &uc->uc_mcontext.pc; + + if (*pcreg > (uintptr_t)safe_syscall_start +diff --git a/linux-user/host/arm/hostdep.h b/linux-user/host/arm/hostdep.h +index 5c1ae60120..9276fe6ceb 100644 +--- a/linux-user/host/arm/hostdep.h ++++ b/linux-user/host/arm/hostdep.h +@@ -24,7 +24,7 @@ extern char safe_syscall_end[]; + /* Adjust the signal context to rewind out of safe-syscall if we're in it */ + static inline void rewind_if_in_safe_syscall(void *puc) + { +- struct ucontext *uc = puc; ++ ucontext_t *uc = puc; + unsigned long *pcreg = &uc->uc_mcontext.arm_pc; + + if (*pcreg > (uintptr_t)safe_syscall_start +diff --git a/linux-user/host/i386/hostdep.h b/linux-user/host/i386/hostdep.h +index d834bd80ea..073be74d87 100644 +--- a/linux-user/host/i386/hostdep.h ++++ b/linux-user/host/i386/hostdep.h +@@ -24,7 +24,7 @@ extern char safe_syscall_end[]; + /* Adjust the signal context to rewind out of safe-syscall if we're in it */ + static inline void rewind_if_in_safe_syscall(void *puc) + { +- struct ucontext *uc = puc; ++ ucontext_t *uc = puc; + greg_t *pcreg = &uc->uc_mcontext.gregs[REG_EIP]; + + if (*pcreg > (uintptr_t)safe_syscall_start +diff --git a/linux-user/host/ppc64/hostdep.h b/linux-user/host/ppc64/hostdep.h +index 0b0f5f7821..98979ad917 100644 +--- a/linux-user/host/ppc64/hostdep.h ++++ b/linux-user/host/ppc64/hostdep.h +@@ -24,7 +24,7 @@ extern char safe_syscall_end[]; + /* Adjust the signal context to rewind out of safe-syscall if we're in it */ + static inline void rewind_if_in_safe_syscall(void *puc) + { +- struct ucontext *uc = puc; ++ ucontext_t *uc = puc; + unsigned long *pcreg = &uc->uc_mcontext.gp_regs[PT_NIP]; + + if (*pcreg > (uintptr_t)safe_syscall_start +diff --git a/linux-user/host/s390x/hostdep.h b/linux-user/host/s390x/hostdep.h +index 6f9da9c608..4f0171f36f 100644 +--- a/linux-user/host/s390x/hostdep.h ++++ b/linux-user/host/s390x/hostdep.h +@@ -24,7 +24,7 @@ extern char safe_syscall_end[]; + /* Adjust the signal context to rewind out of safe-syscall if we're in it */ + static inline void rewind_if_in_safe_syscall(void *puc) + { +- struct ucontext *uc = puc; ++ ucontext_t *uc = puc; + unsigned long *pcreg = &uc->uc_mcontext.psw.addr; + + if (*pcreg > (uintptr_t)safe_syscall_start +diff --git a/linux-user/host/x86_64/hostdep.h b/linux-user/host/x86_64/hostdep.h +index 3b4259633e..a4fefb5114 100644 +--- a/linux-user/host/x86_64/hostdep.h ++++ b/linux-user/host/x86_64/hostdep.h +@@ -24,7 +24,7 @@ extern char safe_syscall_end[]; + /* Adjust the signal context to rewind out of safe-syscall if we're in it */ + static inline void rewind_if_in_safe_syscall(void *puc) + { +- struct ucontext *uc = puc; ++ ucontext_t *uc = puc; + greg_t *pcreg = &uc->uc_mcontext.gregs[REG_RIP]; + + if (*pcreg > (uintptr_t)safe_syscall_start +diff --git a/linux-user/signal.c b/linux-user/signal.c +index c750053edd..4638123dd8 100644 +--- a/linux-user/signal.c ++++ b/linux-user/signal.c +@@ -3170,7 +3170,7 @@ static void setup_rt_frame(int sig, struct target_sigaction *ka, + * + * a0 = signal number + * a1 = pointer to siginfo_t +- * a2 = pointer to struct ucontext ++ * a2 = pointer to ucontext_t + * + * $25 and PC point to the signal handler, $29 points to the + * struct sigframe. +@@ -3557,7 +3557,7 @@ struct target_signal_frame { + + struct rt_signal_frame { + siginfo_t info; +- struct ucontext uc; ++ ucontext_t uc; + uint32_t tramp[2]; + }; + +@@ -3773,7 +3773,7 @@ struct rt_signal_frame { + siginfo_t *pinfo; + void *puc; + siginfo_t info; +- struct ucontext uc; ++ ucontext_t uc; + uint16_t retcode[4]; /* Trampoline code. */ + }; + +@@ -4074,7 +4074,7 @@ static void setup_rt_frame(int sig, struct target_sigaction *ka, + tswap_siginfo(&frame->info, info); + } + +- /*err |= __clear_user(&frame->uc, offsetof(struct ucontext, uc_mcontext));*/ ++ /*err |= __clear_user(&frame->uc, offsetof(ucontext_t, uc_mcontext));*/ + __put_user(0, &frame->uc.tuc_flags); + __put_user(0, &frame->uc.tuc_link); + __put_user(target_sigaltstack_used.ss_sp, +@@ -4565,7 +4565,7 @@ enum { + + struct target_ucontext { + target_ulong tuc_flags; +- target_ulong tuc_link; /* struct ucontext __user * */ ++ target_ulong tuc_link; /* ucontext_t __user * */ + struct target_sigaltstack tuc_stack; + #if !defined(TARGET_PPC64) + int32_t tuc_pad[7]; +diff --git a/tests/tcg/test-i386.c b/tests/tcg/test-i386.c +index 0f7b943b0c..9599204895 100644 +--- a/tests/tcg/test-i386.c ++++ b/tests/tcg/test-i386.c +@@ -1720,7 +1720,7 @@ int tab[2]; + + void sig_handler(int sig, siginfo_t *info, void *puc) + { +- struct ucontext *uc = puc; ++ ucontext_t *uc = puc; + + printf("si_signo=%d si_errno=%d si_code=%d", + info->si_signo, info->si_errno, info->si_code); +@@ -1912,7 +1912,7 @@ void test_exceptions(void) + /* specific precise single step test */ + void sig_trap_handler(int sig, siginfo_t *info, void *puc) + { +- struct ucontext *uc = puc; ++ ucontext_t *uc = puc; + printf("EIP=" FMTLX "\n", (long)uc->uc_mcontext.gregs[REG_EIP]); + } + +diff --git a/user-exec.c b/user-exec.c +index 6db075884d..3f1b899e3d 100644 +--- a/user-exec.c ++++ b/user-exec.c +@@ -155,7 +155,7 @@ int cpu_signal_handler(int host_signum, void *pinfo, + #elif defined(__OpenBSD__) + struct sigcontext *uc = puc; + #else +- struct ucontext *uc = puc; ++ ucontext_t *uc = puc; + #endif + unsigned long pc; + int trapno; +@@ -210,7 +210,7 @@ int cpu_signal_handler(int host_signum, void *pinfo, + #elif defined(__OpenBSD__) + struct sigcontext *uc = puc; + #else +- struct ucontext *uc = puc; ++ ucontext_t *uc = puc; + #endif + + pc = PC_sig(uc); +@@ -277,7 +277,7 @@ int cpu_signal_handler(int host_signum, void *pinfo, + #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + ucontext_t *uc = puc; + #else +- struct ucontext *uc = puc; ++ ucontext_t *uc = puc; + #endif + unsigned long pc; + int is_write; +@@ -304,7 +304,7 @@ int cpu_signal_handler(int host_signum, void *pinfo, + void *puc) + { + siginfo_t *info = pinfo; +- struct ucontext *uc = puc; ++ ucontext_t *uc = puc; + uint32_t *pc = uc->uc_mcontext.sc_pc; + uint32_t insn = *pc; + int is_write = 0; +@@ -402,7 +402,7 @@ int cpu_signal_handler(int host_signum, void *pinfo, + #if defined(__NetBSD__) + ucontext_t *uc = puc; + #else +- struct ucontext *uc = puc; ++ ucontext_t *uc = puc; + #endif + unsigned long pc; + int is_write; +@@ -429,7 +429,7 @@ int cpu_signal_handler(int host_signum, void *pinfo, + int cpu_signal_handler(int host_signum, void *pinfo, void *puc) + { + siginfo_t *info = pinfo; +- struct ucontext *uc = puc; ++ ucontext_t *uc = puc; + uintptr_t pc = uc->uc_mcontext.pc; + uint32_t insn = *(uint32_t *)pc; + bool is_write; +@@ -462,7 +462,7 @@ int cpu_signal_handler(int host_signum, void *pinfo, void *puc) + int cpu_signal_handler(int host_signum, void *pinfo, void *puc) + { + siginfo_t *info = pinfo; +- struct ucontext *uc = puc; ++ ucontext_t *uc = puc; + unsigned long ip; + int is_write = 0; + +@@ -493,7 +493,7 @@ int cpu_signal_handler(int host_signum, void *pinfo, + void *puc) + { + siginfo_t *info = pinfo; +- struct ucontext *uc = puc; ++ ucontext_t *uc = puc; + unsigned long pc; + uint16_t *pinsn; + int is_write = 0; +@@ -546,7 +546,7 @@ int cpu_signal_handler(int host_signum, void *pinfo, + void *puc) + { + siginfo_t *info = pinfo; +- struct ucontext *uc = puc; ++ ucontext_t *uc = puc; + greg_t pc = uc->uc_mcontext.pc; + int is_write; + +-- +2.13.2 + diff --git a/meta/recipes-devtools/qemu/qemu_2.8.1.1.bb b/meta/recipes-devtools/qemu/qemu_2.8.1.1.bb index d37dd49064..a5dc70469d 100644 --- a/meta/recipes-devtools/qemu/qemu_2.8.1.1.bb +++ b/meta/recipes-devtools/qemu/qemu_2.8.1.1.bb @@ -7,37 +7,33 @@ RDEPENDS_${PN}-ptest = "bash make" LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913" -SRC_URI += " \ - file://powerpc_rom.bin \ - file://disable-grabs.patch \ - file://exclude-some-arm-EABI-obsolete-syscalls.patch \ - file://wacom.patch \ - file://add-ptest-in-makefile.patch \ - file://run-ptest \ - file://configure-fix-Darwin-target-detection.patch \ - file://qemu-enlarge-env-entry-size.patch \ - file://no-valgrind.patch \ - file://pathlimit.patch \ - file://qemu-2.5.0-cflags.patch \ - file://glibc-2.25.patch \ -" - -SRC_URI += " \ - file://0001-Provide-support-for-the-CUSE-TPM.patch \ - file://0002-Introduce-condition-to-notify-waiters-of-completed-c.patch \ - file://0003-Introduce-condition-in-TPM-backend-for-notification.patch \ - file://0004-Add-support-for-VM-suspend-resume-for-TPM-TIS.patch \ - file://CVE-2016-9908.patch \ - file://CVE-2016-9912.patch \ -" +SRC_URI = "http://wiki.qemu-project.org/download/${BP}.tar.bz2 \ + file://powerpc_rom.bin \ + file://disable-grabs.patch \ + file://exclude-some-arm-EABI-obsolete-syscalls.patch \ + file://wacom.patch \ + file://add-ptest-in-makefile.patch \ + file://run-ptest \ + file://configure-fix-Darwin-target-detection.patch \ + file://qemu-enlarge-env-entry-size.patch \ + file://no-valgrind.patch \ + file://pathlimit.patch \ + file://qemu-2.5.0-cflags.patch \ + file://glibc-2.25.patch \ + file://0001-Provide-support-for-the-CUSE-TPM.patch \ + file://0002-Introduce-condition-to-notify-waiters-of-completed-c.patch \ + file://0003-Introduce-condition-in-TPM-backend-for-notification.patch \ + file://0004-Add-support-for-VM-suspend-resume-for-TPM-TIS.patch \ + file://CVE-2016-9908.patch \ + file://CVE-2016-9912.patch \ + file://0001-replace-struct-ucontext-with-ucontext_t-type.patch \ + " SRC_URI_append_class-native = " \ file://fix-libcap-header-issue-on-some-distro.patch \ file://cpus.c-qemu_cpu_kick_thread_debugging.patch \ " -SRC_URI =+ "http://wiki.qemu-project.org/download/${BP}.tar.bz2" - SRC_URI[md5sum] = "a6a23a0c59fd0f8ec564b0fb89a79954" SRC_URI[sha256sum] = "f62ab18a1fb9ff5b4c81ed44becc945b11581eff777618141bdb787da55d3638" -- 2.13.2 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 19/19] epiphany: Fix build errors when compiling with security flags 2017-07-01 14:23 [PATCH 00/19] Rework GCC PIE and security flags (take 3) Khem Raj ` (17 preceding siblings ...) 2017-07-01 14:23 ` [PATCH 18/19] qemu: Replace use of struct ucontext with ucontext_t Khem Raj @ 2017-07-01 14:23 ` Khem Raj 18 siblings, 0 replies; 20+ messages in thread From: Khem Raj @ 2017-07-01 14:23 UTC (permalink / raw) To: openembedded-core We need to have some level of optimization level for FORTIFY_SOURCE to work therefore set --enable-debug=no Add a patch to fix build error due to unused result of fread Signed-off-by: Khem Raj <raj.khem@gmail.com> --- meta/recipes-gnome/epiphany/epiphany_3.24.2.bb | 6 ++-- ...bookmarks-Check-for-return-value-of-fread.patch | 32 ++++++++++++++++++++++ 2 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-gnome/epiphany/files/0001-bookmarks-Check-for-return-value-of-fread.patch diff --git a/meta/recipes-gnome/epiphany/epiphany_3.24.2.bb b/meta/recipes-gnome/epiphany/epiphany_3.24.2.bb index 77c19331cb..dafad8a793 100644 --- a/meta/recipes-gnome/epiphany/epiphany_3.24.2.bb +++ b/meta/recipes-gnome/epiphany/epiphany_3.24.2.bb @@ -9,11 +9,13 @@ DEPENDS = "libsoup-2.4 webkitgtk gtk+3 iso-codes avahi libnotify gcr \ inherit gnomebase gsettings distro_features_check upstream-version-is-even gettext REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI += "file://0001-yelp.m4-drop-the-check-for-itstool.patch" +SRC_URI += "file://0001-yelp.m4-drop-the-check-for-itstool.patch \ + file://0001-bookmarks-Check-for-return-value-of-fread.patch \ + " SRC_URI[archive.md5sum] = "e035dc6f64f0c1909de823e03f16b2f3" SRC_URI[archive.sha256sum] = "5abc0d0c60591df5236ac9b8979dc9f7d9acbb8ad0902b4772d2b7beea81c58d" -EXTRA_OECONF += " --with-distributor-name=${DISTRO}" +EXTRA_OECONF += " --with-distributor-name=${DISTRO} --enable-debug=no" do_configure_prepend() { sed -i -e s:help::g ${S}/Makefile.am diff --git a/meta/recipes-gnome/epiphany/files/0001-bookmarks-Check-for-return-value-of-fread.patch b/meta/recipes-gnome/epiphany/files/0001-bookmarks-Check-for-return-value-of-fread.patch new file mode 100644 index 0000000000..ddcd39400c --- /dev/null +++ b/meta/recipes-gnome/epiphany/files/0001-bookmarks-Check-for-return-value-of-fread.patch @@ -0,0 +1,32 @@ +From aa2176be32eed2578da82f34d31148f934c11c34 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 28 Jun 2017 17:03:45 -0700 +Subject: [PATCH] bookmarks: Check for return value of fread() + +Fixes below compiler error +ignoring return value of 'fread', declared with attribute warn_unused_result + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/bookmarks/ephy-bookmark.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/bookmarks/ephy-bookmark.c b/src/bookmarks/ephy-bookmark.c +index ff0239b..8633ce4 100644 +--- a/src/bookmarks/ephy-bookmark.c ++++ b/src/bookmarks/ephy-bookmark.c +@@ -217,7 +217,8 @@ ephy_bookmark_init (EphyBookmark *self) + bytes = g_malloc (num_bytes); + + fp = fopen ("/dev/urandom", "r"); +- fread (bytes, sizeof (guint8), num_bytes, fp); ++ if (fread (bytes, sizeof (guint8), num_bytes, fp) != num_bytes) ++ g_warning("Unable to read data from /dev/urandom\n"); + + self->id = g_malloc0 (ID_LEN + 1); + for (gsize i = 0; i < num_bytes; i++) { +-- +2.13.2 + -- 2.13.2 ^ permalink raw reply related [flat|nested] 20+ messages in thread
end of thread, other threads:[~2017-07-01 14:24 UTC | newest] Thread overview: 20+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2017-07-01 14:23 [PATCH 00/19] Rework GCC PIE and security flags (take 3) Khem Raj 2017-07-01 14:23 ` [PATCH 01/19] glibc: Upgrade to 2.25.90 Khem Raj 2017-07-01 14:23 ` [PATCH 02/19] glibc: Drop obsoleted bits/string.h from multilibbing Khem Raj 2017-07-01 14:23 ` [PATCH 03/19] glibc: Enable obsoleted nsl Khem Raj 2017-07-01 14:23 ` [PATCH 04/19] gcc: Introduce a knob to configure gcc to default to PIE Khem Raj 2017-07-01 14:23 ` [PATCH 05/19] security_flags.inc: Delete pinnings for SECURITY_NO_PIE_CFLAGS Khem Raj 2017-07-01 14:23 ` [PATCH 06/19] distutils, setuptools: Delete use of SECURITY_NO_PIE_CFLAGS Khem Raj 2017-07-01 14:23 ` [PATCH 07/19] gcc7: Enable static PIE Khem Raj 2017-07-01 14:23 ` [PATCH 08/19] gcc: Link libssp_nonshared.a only on musl targets Khem Raj 2017-07-01 14:23 ` [PATCH 09/19] sysklogd: Improve build and fix runtime crash Khem Raj 2017-07-01 14:23 ` [PATCH 10/19] libunwind: We set -fPIE in security flags now if gcc is not configured for default PIE Khem Raj 2017-07-01 14:23 ` [PATCH 11/19] valgrind: Remove -no-pie from cflags Khem Raj 2017-07-01 14:23 ` [PATCH 12/19] icu: Fix build with glibc 2.26 Khem Raj 2017-07-01 14:23 ` [PATCH 13/19] gstreamer1.0-plugins-bad: Fix missing library with bcm egl Khem Raj 2017-07-01 14:23 ` [PATCH 14/19] gcc-sanitizer: Fix build with glibc 2.26 Khem Raj 2017-07-01 14:23 ` [PATCH 15/19] gcc: Use ucontext_t instead of ucontext Khem Raj 2017-07-01 14:23 ` [PATCH 16/19] valgrind: Fix build with glibc 2.26 Khem Raj 2017-07-01 14:23 ` [PATCH 17/19] strace: upgrade to 4.17 Khem Raj 2017-07-01 14:23 ` [PATCH 18/19] qemu: Replace use of struct ucontext with ucontext_t Khem Raj 2017-07-01 14:23 ` [PATCH 19/19] epiphany: Fix build errors when compiling with security flags Khem Raj
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.