This provides a patch maintaining __fpscr_values in libc. This is taken in in Debian and codesourcery.
This patch is necessary to have compatibility in these and openemdedded. Signed-off-by: Nobuhiro Iwamatsu <[email protected]> --- recipes/eglibc/eglibc_2.10.bb | 3 +- recipes/eglibc/eglibc_2.11.bb | 3 +- recipes/eglibc/eglibc_2.12.bb | 3 +- recipes/eglibc/eglibc_2.9.bb | 3 +- recipes/eglibc/eglibc_svn.bb | 1 + recipes/eglibc/files/sh4_local-fpscr_values.patch | 32 +++++++++++++++++++++ 6 files changed, 41 insertions(+), 4 deletions(-) create mode 100644 recipes/eglibc/files/sh4_local-fpscr_values.patch diff --git a/recipes/eglibc/eglibc_2.10.bb b/recipes/eglibc/eglibc_2.10.bb index 94835b6..6ac4fda 100644 --- a/recipes/eglibc/eglibc_2.10.bb +++ b/recipes/eglibc/eglibc_2.10.bb @@ -3,7 +3,7 @@ require eglibc.inc DEPENDS += "gperf-native" FILESPATHPKG =. "eglibc-svn:" PV = "2.10" -PR = "${INC_PR}.10" +PR = "${INC_PR}.11" PR_append = "+svnr${SRCPV}" SRCREV="10152" EGLIBC_BRANCH="eglibc-2_10" @@ -13,6 +13,7 @@ SRC_URI = "svn://svn.eglibc.org/branches;module=${EGLIBC_BRANCH};proto=svn \ file://IO-acquire-lock-fix.patch \ file://shorten-build-commands.patch \ file://sh4_set_fpscr.patch \ + file://sh4_local-fpscr_values.patch \ file://etc/ld.so.conf \ file://generate-supported.mk" S = "${WORKDIR}/${EGLIBC_BRANCH}/libc" diff --git a/recipes/eglibc/eglibc_2.11.bb b/recipes/eglibc/eglibc_2.11.bb index dafc301..d96b658 100644 --- a/recipes/eglibc/eglibc_2.11.bb +++ b/recipes/eglibc/eglibc_2.11.bb @@ -4,7 +4,7 @@ DEFAULT_PREFERENCE = "-1" DEPENDS += "gperf-native" FILESPATHPKG =. "eglibc-svn:" PV = "2.11" -PR = "${INC_PR}.7" +PR = "${INC_PR}.8" PR_append = "+svnr${SRCPV}" SRCREV="10690" EGLIBC_BRANCH="eglibc-2_11" @@ -13,6 +13,7 @@ SRC_URI = "svn://svn.eglibc.org/branches;module=${EGLIBC_BRANCH};proto=svn \ file://IO-acquire-lock-fix.patch \ file://shorten-build-commands.patch \ file://sh4_set_fpscr.patch \ + file://sh4_local-fpscr_values.patch \ file://etc/ld.so.conf \ file://generate-supported.mk" S = "${WORKDIR}/${EGLIBC_BRANCH}/libc" diff --git a/recipes/eglibc/eglibc_2.12.bb b/recipes/eglibc/eglibc_2.12.bb index e0a0ebe..c6acea2 100644 --- a/recipes/eglibc/eglibc_2.12.bb +++ b/recipes/eglibc/eglibc_2.12.bb @@ -4,7 +4,7 @@ DEFAULT_PREFERENCE = "-1" DEPENDS += "gperf-native" FILESPATHPKG =. "eglibc-svn:" PV = "2.12" -PR = "${INC_PR}.4" +PR = "${INC_PR}.5" PR_append = "+svnr${SRCPV}" SRCREV="11306" EGLIBC_BRANCH="eglibc-2_12" @@ -13,6 +13,7 @@ SRC_URI = "svn://svn.eglibc.org/branches;module=${EGLIBC_BRANCH};proto=svn \ file://IO-acquire-lock-fix.patch \ file://shorten-build-commands.patch \ file://sh4_set_fpscr_2.12.patch \ + file://sh4_local-fpscr_values.patch \ file://etc/ld.so.conf \ file://generate-supported.mk" S = "${WORKDIR}/${EGLIBC_BRANCH}/libc" diff --git a/recipes/eglibc/eglibc_2.9.bb b/recipes/eglibc/eglibc_2.9.bb index 39ee76d..cd2b5e6 100644 --- a/recipes/eglibc/eglibc_2.9.bb +++ b/recipes/eglibc/eglibc_2.9.bb @@ -3,7 +3,7 @@ require eglibc.inc DEPENDS += "gperf-native" FILESPATHPKG =. "eglibc-svn:" PV = "2.9" -PR = "${INC_PR}.10" +PR = "${INC_PR}.11" PR_append = "+svnr${SRCPV}" SRCREV="10153" EGLIBC_BRANCH="eglibc-2_9" @@ -13,6 +13,7 @@ SRC_URI = "svn://svn.eglibc.org/branches;module=${EGLIBC_BRANCH};proto=svn \ file://IO-acquire-lock-fix.patch \ file://shorten-build-commands.patch \ file://sh4_set_fpscr.patch \ + file://sh4_local-fpscr_values.patch \ file://etc/ld.so.conf \ file://generate-supported.mk" S = "${WORKDIR}/${EGLIBC_BRANCH}/libc" diff --git a/recipes/eglibc/eglibc_svn.bb b/recipes/eglibc/eglibc_svn.bb index a37c3ed..32679a0 100644 --- a/recipes/eglibc/eglibc_svn.bb +++ b/recipes/eglibc/eglibc_svn.bb @@ -11,6 +11,7 @@ SRC_URI = "svn://svn.eglibc.org;module=${EGLIBC_BRANCH} \ file://eglibc-svn-arm-lowlevellock-include-tls.patch \ file://IO-acquire-lock-fix.patch \ file://sh4_set_fpscr_2.12.patch \ + file://sh4_local-fpscr_values.patch \ file://etc/ld.so.conf \ file://generate-supported.mk" S = "${WORKDIR}/${EGLIBC_BRANCH}/libc" diff --git a/recipes/eglibc/files/sh4_local-fpscr_values.patch b/recipes/eglibc/files/sh4_local-fpscr_values.patch new file mode 100644 index 0000000..1685f6f --- /dev/null +++ b/recipes/eglibc/files/sh4_local-fpscr_values.patch @@ -0,0 +1,32 @@ +--- + sysdeps/unix/sysv/linux/sh/Versions | 1 + + sysdeps/unix/sysv/linux/sh/sysdep.S | 11 +++++++++++ + 2 files changed, 12 insertions(+) + +--- a/sysdeps/unix/sysv/linux/sh/Versions ++++ b/sysdeps/unix/sysv/linux/sh/Versions +@@ -2,6 +2,7 @@ + GLIBC_2.2 { + # functions used in other libraries + __xstat64; __fxstat64; __lxstat64; ++ __fpscr_values; + + # a* + alphasort64; +--- a/sysdeps/unix/sysv/linux/sh/sysdep.S ++++ b/sysdeps/unix/sysv/linux/sh/sysdep.S +@@ -32,3 +32,14 @@ + + #define __syscall_error __syscall_error_1 + #include <sysdeps/unix/sh/sysdep.S> ++ ++ .data ++ .align 3 ++ .globl ___fpscr_values ++ .type ___fpscr_values, @object ++ .size ___fpscr_values, 8 ++___fpscr_values: ++ .long 0 ++ .long 0x80000 ++weak_alias (___fpscr_values, __fpscr_values) ++ -- 1.7.1 _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
