summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRod Whitby <rod@whitby.id.au>2006-12-10 19:31:47 +0000
committerRod Whitby <rod@whitby.id.au>2006-12-10 19:31:47 +0000
commit86ab268f5f8e0057a42ccbeec66fa3231845ffc7 (patch)
tree5e70963a6df76403607acf8c9ae00a22c881b07e
parente5432214e5f7e4e1689b88d55c5f8609c6a30de6 (diff)
parentbc9afc249ce775b24751661e0279b87e389c8af2 (diff)
merge of 4f9848c48a54fcfa48455fefb11c392a01772332
and 76f1fdf6dff425bfdddcd67c4430bf4bc23ab36c
-rw-r--r--conf/machine/efika.conf2
-rw-r--r--packages/glibc/glibc-2.4/powerpc-sqrt-hack.diff25
-rw-r--r--packages/glibc/glibc_2.5.bb2
3 files changed, 28 insertions, 1 deletions
diff --git a/conf/machine/efika.conf b/conf/machine/efika.conf
index 33fac1ae6a..d2a0e542d8 100644
--- a/conf/machine/efika.conf
+++ b/conf/machine/efika.conf
@@ -4,7 +4,7 @@
TARGET_ARCH = "powerpc"
-PACKAGE_EXTRA_ARCHS = "ppc"
+PACKAGE_EXTRA_ARCHS = "ppc ppc603e"
PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}"
diff --git a/packages/glibc/glibc-2.4/powerpc-sqrt-hack.diff b/packages/glibc/glibc-2.4/powerpc-sqrt-hack.diff
new file mode 100644
index 0000000000..1046efb2a1
--- /dev/null
+++ b/packages/glibc/glibc-2.4/powerpc-sqrt-hack.diff
@@ -0,0 +1,25 @@
+diff -Nurd ../glibc-initial-2.5-r4/glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c
+--- ../glibc-initial-2.5-r4/glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c 2006-04-14 07:44:30.000000000 +0200
++++ glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c 2006-12-08 12:53:32.202227000 +0100
+@@ -25,6 +25,9 @@
+ #include <sysdep.h>
+ #include <ldsodefs.h>
+
++#define __CPU_HAS_FSQRT ((GLRO(dl_hwcap) & PPC_FEATURE_64) != 0)
++
++
+ static const double almost_half = 0.5000000000000001; /* 0.5 + 2^-53 */
+ static const ieee_float_shape_type a_nan = {.word = 0x7fc00000 };
+ static const ieee_float_shape_type a_inf = {.word = 0x7f800000 };
+diff -Nurd ../glibc-initial-2.5-r4/glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c
+--- ../glibc-initial-2.5-r4/glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c 2006-04-14 07:44:30.000000000 +0200
++++ glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c 2006-12-08 12:53:36.992227000 +0100
+@@ -25,6 +25,8 @@
+ #include <sysdep.h>
+ #include <ldsodefs.h>
+
++#define __CPU_HAS_FSQRT ((GLRO(dl_hwcap) & PPC_FEATURE_64) != 0)
++
+ static const float almost_half = 0.50000006; /* 0.5 + 2^-24 */
+ static const ieee_float_shape_type a_nan = {.word = 0x7fc00000 };
+ static const ieee_float_shape_type a_inf = {.word = 0x7f800000 };
diff --git a/packages/glibc/glibc_2.5.bb b/packages/glibc/glibc_2.5.bb
index 07be0fa181..815038f0a6 100644
--- a/packages/glibc/glibc_2.5.bb
+++ b/packages/glibc/glibc_2.5.bb
@@ -72,6 +72,8 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.bz2 \
SRC_URI_append_sh3 = " file://no-z-defs.patch;patch=1"
SRC_URI_append_sh4 = " file://no-z-defs.patch;patch=1"
+SRC_URI_append_powerpc = " file://powerpc-sqrt-hack.diff;patch=1"
+
S = "${WORKDIR}/glibc-${PV}"
B = "${WORKDIR}/build-${TARGET_SYS}"