diff options
author | Koen Kooi <koen.kooi@linaro.org> | 2014-08-04 12:03:36 +0200 |
---|---|---|
committer | Koen Kooi <koen.kooi@linaro.org> | 2014-08-04 12:05:27 +0200 |
commit | 6cfb07ddb9cc5e66cfa234696b17252227b76806 (patch) | |
tree | f7019977d7de4214f4f6e31a19ec90a20e37a983 /meta-linaro-toolchain/recipes-core | |
parent | 384a45658c0df5d6e0bb4cedeb62bda502597054 (diff) |
eglibc 2.19: sync patches with OE-core
This fixes problems with ldconfig/sln installation into /sbin
Change-Id: Ic69cec5dac1d1341a9c547ac1b2e5d69b78ab7c1
Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
Diffstat (limited to 'meta-linaro-toolchain/recipes-core')
6 files changed, 164 insertions, 0 deletions
diff --git a/meta-linaro-toolchain/recipes-core/eglibc/eglibc-linaro-2.19/fix_am_rootsbindir.patch b/meta-linaro-toolchain/recipes-core/eglibc/eglibc-linaro-2.19/fix_am_rootsbindir.patch new file mode 100644 index 00000000..ac1e2e82 --- /dev/null +++ b/meta-linaro-toolchain/recipes-core/eglibc/eglibc-linaro-2.19/fix_am_rootsbindir.patch @@ -0,0 +1,32 @@ +sysdeps/gnu/configure.ac: handle correctly $libc_cv_rootsbindir + +Upstream-Status:Pending +Signed-off-by: Matthieu Crapet <Matthieu.Crapet@ingenico.com> + +diff --git a/libc/sysdeps/gnu/configure b/libc/sysdeps/gnu/configure +index e7f0e43..687beab 100644 +--- a/libc/sysdeps/gnu/configure ++++ b/libc/sysdeps/gnu/configure +@@ -42,6 +42,6 @@ case "$prefix" in + else + libc_cv_localstatedir=$localstatedir + fi +- libc_cv_rootsbindir=/sbin ++ test -n "$libc_cv_rootsbindir" || libc_cv_rootsbindir=/sbin + ;; + esac +diff --git a/libc/sysdeps/gnu/configure.ac b/libc/sysdeps/gnu/configure.ac +index ce251df..57c1e77 100644 +--- a/libc/sysdeps/gnu/configure.ac ++++ b/libc/sysdeps/gnu/configure.ac +@@ -42,6 +42,6 @@ case "$prefix" in + else + libc_cv_localstatedir=$localstatedir + fi +- libc_cv_rootsbindir=/sbin ++ test -n "$libc_cv_rootsbindir" || libc_cv_rootsbindir=/sbin + ;; + esac +-- +2.0.0 + diff --git a/meta-linaro-toolchain/recipes-core/eglibc/eglibc-linaro-2.19/glibc.fix_sqrt2.patch b/meta-linaro-toolchain/recipes-core/eglibc/eglibc-linaro-2.19/glibc.fix_sqrt2.patch index 037feeb5..689b79c6 100644 --- a/meta-linaro-toolchain/recipes-core/eglibc/eglibc-linaro-2.19/glibc.fix_sqrt2.patch +++ b/meta-linaro-toolchain/recipes-core/eglibc/eglibc-linaro-2.19/glibc.fix_sqrt2.patch @@ -1477,6 +1477,13 @@ Index: libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/603e/fpu/Implies +++ libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/603e/fpu/Implies @@ -0,0 +1 @@ +powerpc/powerpc32/603e/fpu +Index: libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/e300c3/fpu/Implies +=================================================================== +--- /dev/null ++++ libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/e300c3/fpu/Implies +@@ -0,0 +1,2 @@ ++# e300c3 is a variant of 603e so use the same optimizations for sqrt ++powerpc/powerpc32/603e/fpu Index: libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500mc/fpu/Implies =================================================================== --- /dev/null diff --git a/meta-linaro-toolchain/recipes-core/eglibc/eglibc-linaro-2.19/grok_gold.patch b/meta-linaro-toolchain/recipes-core/eglibc/eglibc-linaro-2.19/grok_gold.patch new file mode 100644 index 00000000..d46737af --- /dev/null +++ b/meta-linaro-toolchain/recipes-core/eglibc/eglibc-linaro-2.19/grok_gold.patch @@ -0,0 +1,34 @@ +Make ld --version output matching grok gold's output + +adapted from from upstream branch roland/gold-vs-libc + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Backport + + +Index: libc/configure +=================================================================== +--- libc.orig/configure ++++ libc/configure +@@ -4654,7 +4654,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-9][0-9]*|[3-9].*|[1-9][0-9]*) +Index: libc/configure.ac +=================================================================== +--- libc.orig/configure.ac ++++ libc/configure.ac +@@ -990,7 +990,7 @@ AC_CHECK_PROG_VER(AS, $AS, --version, + [GNU assembler.* \([0-9]*\.[0-9.]*\)], + [2.1[0-9][0-9]*|2.[2-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-9][0-9]*|[3-9].*|[1-9][0-9]*], LD=: critic_missing="$critic_missing ld") + + # These programs are version sensitive. diff --git a/meta-linaro-toolchain/recipes-core/eglibc/eglibc-linaro-2.19/ppce6500-32b_slow_ieee754_sqrt.patch b/meta-linaro-toolchain/recipes-core/eglibc/eglibc-linaro-2.19/ppce6500-32b_slow_ieee754_sqrt.patch new file mode 100644 index 00000000..4c6c1070 --- /dev/null +++ b/meta-linaro-toolchain/recipes-core/eglibc/eglibc-linaro-2.19/ppce6500-32b_slow_ieee754_sqrt.patch @@ -0,0 +1,47 @@ + __ieee754_sqrt{,f} are now inline functions and call out __slow versions + + +Signed-off-by: chunrong guo <B40290@freescale.com> +Upstream-Status: Pending + +diff -rNu libc-orig/sysdeps/powerpc/powerpc32/e6500/fpu/e_sqrt.c libc/sysdeps/powerpc/powerpc32/e6500/fpu/e_sqrt.c +--- libc-orig/sysdeps/powerpc/powerpc32/e6500/fpu/e_sqrt.c 2014-04-08 04:39:58.487229887 -0500 ++++ libc/sysdeps/powerpc/powerpc32/e6500/fpu/e_sqrt.c 2014-04-08 04:40:52.643069198 -0500 +@@ -41,10 +41,10 @@ + + #ifdef __STDC__ + double +-__ieee754_sqrt (double b) ++__slow_ieee754_sqrt (double b) + #else + double +-__ieee754_sqrt (b) ++__slow_ieee754_sqrt (b) + double b; + #endif + { +@@ -83,7 +83,7 @@ + + /* Handle small numbers by scaling. */ + if (__builtin_expect ((u.parts.msw & 0x7ff00000) <= 0x02000000, 0)) +- return __ieee754_sqrt (b * two108) * twom54; ++ return __slow_ieee754_sqrt (b * two108) * twom54; + + #define FMADD(a_, c_, b_) \ + ({ double __r; \ +diff -rNu libc-orig/sysdeps/powerpc/powerpc32/e6500/fpu/e_sqrtf.c libc/sysdeps/powerpc/powerpc32/e6500/fpu/e_sqrtf.c +--- libc-orig/sysdeps/powerpc/powerpc32/e6500/fpu/e_sqrtf.c 2014-04-08 04:39:58.487229887 -0500 ++++ libc/sysdeps/powerpc/powerpc32/e6500/fpu/e_sqrtf.c 2014-04-08 04:41:26.017067682 -0500 +@@ -39,10 +39,10 @@ + + #ifdef __STDC__ + float +-__ieee754_sqrtf (float b) ++__slow_ieee754_sqrtf (float b) + #else + float +-__ieee754_sqrtf (b) ++__slow_ieee754_sqrtf (b) + float b; + #endif + { diff --git a/meta-linaro-toolchain/recipes-core/eglibc/eglibc-linaro-2.19/timezone-re-written-tzselect-as-posix-sh.patch b/meta-linaro-toolchain/recipes-core/eglibc/eglibc-linaro-2.19/timezone-re-written-tzselect-as-posix-sh.patch new file mode 100644 index 00000000..1477ea2c --- /dev/null +++ b/meta-linaro-toolchain/recipes-core/eglibc/eglibc-linaro-2.19/timezone-re-written-tzselect-as-posix-sh.patch @@ -0,0 +1,40 @@ +timezone: re-written tzselect as posix sh + +To avoid the bash dependency. + +Upstream-Status: Pending + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + timezone/Makefile | 2 +- + timezone/tzselect.ksh | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/timezone/Makefile b/timezone/Makefile +--- a/timezone/Makefile ++++ b/timezone/Makefile +@@ -113,7 +113,7 @@ $(testdata)/Asia/Tokyo: asia $(zic-deps) + + + $(objpfx)tzselect: tzselect.ksh $(common-objpfx)config.make +- sed -e 's|/bin/bash|$(KSH)|g' \ ++ sed -e 's|/bin/bash|/bin/sh|g' \ + -e '/TZDIR=/s|\$$(pwd)|$(zonedir)|' \ + -e '/TZVERSION=/s|see_Makefile|"$(version)"|' \ + -e '/PKGVERSION=/s|=.*|="$(PKGVERSION)"|' \ +diff --git a/timezone/tzselect.ksh b/timezone/tzselect.ksh +index 9d70691..25f45a8 100644 +--- a/timezone/tzselect.ksh ++++ b/timezone/tzselect.ksh +@@ -35,7 +35,7 @@ REPORT_BUGS_TO=tz@iana.org + + # Specify default values for environment variables if they are unset. + : ${AWK=awk} +-: ${TZDIR=`pwd`} ++: ${TZDIR=$(pwd)} + + # Check for awk Posix compliance. + ($AWK -v x=y 'BEGIN { exit 123 }') </dev/null >/dev/null 2>&1 +-- +1.8.1.2 + diff --git a/meta-linaro-toolchain/recipes-core/eglibc/eglibc_linaro-2.19.bb b/meta-linaro-toolchain/recipes-core/eglibc/eglibc_linaro-2.19.bb index 95b4eeb8..5dc70ea5 100644 --- a/meta-linaro-toolchain/recipes-core/eglibc/eglibc_linaro-2.19.bb +++ b/meta-linaro-toolchain/recipes-core/eglibc/eglibc_linaro-2.19.bb @@ -28,6 +28,10 @@ SRC_URI = "http://cbuild.validation.linaro.org/snapshots/eglibc-${PV}-${RELEASE} file://0001-R_ARM_TLS_DTPOFF32.patch \ file://0001-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch \ file://fix-tibetian-locales.patch \ + file://ppce6500-32b_slow_ieee754_sqrt.patch \ + file://grok_gold.patch \ + file://fix_am_rootsbindir.patch;striplevel=2 \ + file://timezone-re-written-tzselect-as-posix-sh.patch \ " SRC_URI[md5sum] = "c42d9c78fcdab4c7fea861674e480583" |