diff options
| author | Paul Sokolovsky <pmiscml@gmail.com> | 2007-05-03 21:54:34 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2007-05-03 21:54:34 +0000 |
| commit | eaef2ca148ef7e89336978934ee202f2b4f25151 (patch) | |
| tree | 42735d21af923d9c1baf6b9bdd923fd8d8814878 | |
| parent | d371adc14d8dcdf7a19ec63b92bb6d2624348b6c (diff) | |
| parent | 422e14bbbd341bcb0ae72b262ad83211c9a2f0ac (diff) | |
merge of 'bb4d307be1e1e6c7dcfacbb22b9b3a37de4f3a80'
and 'd8cede683cb063194640417f9789761e2613100f'
| -rw-r--r-- | packages/glibc/glibc-2.4/armeb-strlen.patch | 11 | ||||
| -rw-r--r-- | packages/glibc/glibc-2.5/armeb-strlen.patch | 11 | ||||
| -rw-r--r-- | packages/glibc/glibc_2.5.bb | 5 |
3 files changed, 1 insertions, 26 deletions
diff --git a/packages/glibc/glibc-2.4/armeb-strlen.patch b/packages/glibc/glibc-2.4/armeb-strlen.patch deleted file mode 100644 index 69a2e59d30..0000000000 --- a/packages/glibc/glibc-2.4/armeb-strlen.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- /tmp/strlen.S 2007-05-01 18:32:48.000000000 +0200 -+++ glibc-2.5/ports/sysdeps/arm/strlen.S 2007-05-01 18:33:29.665251000 +0200 -@@ -24,6 +24,8 @@ - * exit: r0 = len - */ - -+#define __ARMEB__ -+ - ENTRY(strlen) - bic r1, r0, $3 @ addr of word containing first byte - ldr r2, [r1], $4 @ get the first word diff --git a/packages/glibc/glibc-2.5/armeb-strlen.patch b/packages/glibc/glibc-2.5/armeb-strlen.patch deleted file mode 100644 index 69a2e59d30..0000000000 --- a/packages/glibc/glibc-2.5/armeb-strlen.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- /tmp/strlen.S 2007-05-01 18:32:48.000000000 +0200 -+++ glibc-2.5/ports/sysdeps/arm/strlen.S 2007-05-01 18:33:29.665251000 +0200 -@@ -24,6 +24,8 @@ - * exit: r0 = len - */ - -+#define __ARMEB__ -+ - ENTRY(strlen) - bic r1, r0, $3 @ addr of word containing first byte - ldr r2, [r1], $4 @ get the first word diff --git a/packages/glibc/glibc_2.5.bb b/packages/glibc/glibc_2.5.bb index f0981694e8..f14ce45a94 100644 --- a/packages/glibc/glibc_2.5.bb +++ b/packages/glibc/glibc_2.5.bb @@ -5,7 +5,7 @@ ARM_INSTRUCTION_SET = "arm" PACKAGES_DYNAMIC = "libc6*" RPROVIDES_${PN}-dev = "libc6-dev" -PR = "r5" +PR = "r6" # the -isystem in bitbake.conf screws up glibc do_stage BUILD_CPPFLAGS = "-I${STAGING_DIR}/${BUILD_SYS}/include" @@ -76,9 +76,6 @@ SRC_URI_append_powerpc= " file://ppc-sfp-machine.patch;patch=1 \ file://ppc-ports-ld-nofpu-20070114.patch;patch=1 \ file://powerpc-sqrt-hack.diff;patch=1"" -#armeb needs an extra define -SRC_URI_append_armeb = " file://armeb-strlen.patch;patch=1 " - S = "${WORKDIR}/glibc-${PV}" B = "${WORKDIR}/build-${TARGET_SYS}" |