diff options
author | Chunrong Guo <B40290@freescale.com> | 2014-04-08 10:17:29 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-04-09 09:53:14 +0100 |
commit | 9eb52498f8b0aa63422da219d4126d7545745708 (patch) | |
tree | 3abdbbc2a2c0477b7c4ca8abe7c7ab711d553076 | |
parent | 467b19efbaa9c0cb04d2665e8cd9a0919849a5ed (diff) | |
download | poky-9eb52498f8b0aa63422da219d4126d7545745708.tar.gz |
eglibc: __slow_ieee754_sqrt{, f} functions for ppc e6500-32b
*fix the following error:
|/sysdeps/powerpc/powerpc32/e6500/fpu/e_sqrt.c:138:1:
| error: redefinition of '__ieee754_sqrt'
| __ieee754_sqrt (double x)
(From OE-Core rev: 83a49c0fc5f6835c1385acb501380a0e351e4ac2)
Signed-off-by: Chunrong Guo <B40290@freescale.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-core/eglibc/eglibc-2.19/ppce6500-32b_slow_ieee754_sqrt.patch | 47 | ||||
-rw-r--r-- | meta/recipes-core/eglibc/eglibc_2.19.bb | 1 |
2 files changed, 48 insertions, 0 deletions
diff --git a/meta/recipes-core/eglibc/eglibc-2.19/ppce6500-32b_slow_ieee754_sqrt.patch b/meta/recipes-core/eglibc/eglibc-2.19/ppce6500-32b_slow_ieee754_sqrt.patch new file mode 100644 index 0000000000..4c6c1070c3 --- /dev/null +++ b/meta/recipes-core/eglibc/eglibc-2.19/ppce6500-32b_slow_ieee754_sqrt.patch | |||
@@ -0,0 +1,47 @@ | |||
1 | __ieee754_sqrt{,f} are now inline functions and call out __slow versions | ||
2 | |||
3 | |||
4 | Signed-off-by: chunrong guo <B40290@freescale.com> | ||
5 | Upstream-Status: Pending | ||
6 | |||
7 | diff -rNu libc-orig/sysdeps/powerpc/powerpc32/e6500/fpu/e_sqrt.c libc/sysdeps/powerpc/powerpc32/e6500/fpu/e_sqrt.c | ||
8 | --- libc-orig/sysdeps/powerpc/powerpc32/e6500/fpu/e_sqrt.c 2014-04-08 04:39:58.487229887 -0500 | ||
9 | +++ libc/sysdeps/powerpc/powerpc32/e6500/fpu/e_sqrt.c 2014-04-08 04:40:52.643069198 -0500 | ||
10 | @@ -41,10 +41,10 @@ | ||
11 | |||
12 | #ifdef __STDC__ | ||
13 | double | ||
14 | -__ieee754_sqrt (double b) | ||
15 | +__slow_ieee754_sqrt (double b) | ||
16 | #else | ||
17 | double | ||
18 | -__ieee754_sqrt (b) | ||
19 | +__slow_ieee754_sqrt (b) | ||
20 | double b; | ||
21 | #endif | ||
22 | { | ||
23 | @@ -83,7 +83,7 @@ | ||
24 | |||
25 | /* Handle small numbers by scaling. */ | ||
26 | if (__builtin_expect ((u.parts.msw & 0x7ff00000) <= 0x02000000, 0)) | ||
27 | - return __ieee754_sqrt (b * two108) * twom54; | ||
28 | + return __slow_ieee754_sqrt (b * two108) * twom54; | ||
29 | |||
30 | #define FMADD(a_, c_, b_) \ | ||
31 | ({ double __r; \ | ||
32 | diff -rNu libc-orig/sysdeps/powerpc/powerpc32/e6500/fpu/e_sqrtf.c libc/sysdeps/powerpc/powerpc32/e6500/fpu/e_sqrtf.c | ||
33 | --- libc-orig/sysdeps/powerpc/powerpc32/e6500/fpu/e_sqrtf.c 2014-04-08 04:39:58.487229887 -0500 | ||
34 | +++ libc/sysdeps/powerpc/powerpc32/e6500/fpu/e_sqrtf.c 2014-04-08 04:41:26.017067682 -0500 | ||
35 | @@ -39,10 +39,10 @@ | ||
36 | |||
37 | #ifdef __STDC__ | ||
38 | float | ||
39 | -__ieee754_sqrtf (float b) | ||
40 | +__slow_ieee754_sqrtf (float b) | ||
41 | #else | ||
42 | float | ||
43 | -__ieee754_sqrtf (b) | ||
44 | +__slow_ieee754_sqrtf (b) | ||
45 | float b; | ||
46 | #endif | ||
47 | { | ||
diff --git a/meta/recipes-core/eglibc/eglibc_2.19.bb b/meta/recipes-core/eglibc/eglibc_2.19.bb index 2bedf2613f..8f096769ee 100644 --- a/meta/recipes-core/eglibc/eglibc_2.19.bb +++ b/meta/recipes-core/eglibc/eglibc_2.19.bb | |||
@@ -24,6 +24,7 @@ SRC_URI = "http://downloads.yoctoproject.org/releases/eglibc/eglibc-${PV}-svnr25 | |||
24 | file://0001-R_ARM_TLS_DTPOFF32.patch \ | 24 | file://0001-R_ARM_TLS_DTPOFF32.patch \ |
25 | file://0001-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch \ | 25 | file://0001-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch \ |
26 | file://fix-tibetian-locales.patch \ | 26 | file://fix-tibetian-locales.patch \ |
27 | file://ppce6500-32b_slow_ieee754_sqrt.patch \ | ||
27 | " | 28 | " |
28 | SRC_URI[md5sum] = "197836c2ba42fb146e971222647198dd" | 29 | SRC_URI[md5sum] = "197836c2ba42fb146e971222647198dd" |
29 | SRC_URI[sha256sum] = "baaa030531fc308f7820c46acdf8e1b2f8e3c1f40bcd28b6e440d1c95d170d4c" | 30 | SRC_URI[sha256sum] = "baaa030531fc308f7820c46acdf8e1b2f8e3c1f40bcd28b6e440d1c95d170d4c" |