Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev

8 files changed, 33 insertions, 18 deletions

diff --git a/recipes/gcc/gcc-4.4.1.inc b/recipes/gcc/gcc-4.4.1.inc
index 9b47127486..9daff95224 100644
--- a/recipes/gcc/gcc-4.4.1.inc
+++ b/recipes/gcc/gcc-4.4.1.inc
@@ -7,7 +7,7 @@ LICENSE = "GPLv3"
 
 DEPENDS = "mpfr gmp"
 
-INC_PR = "r6"
+INC_PR = "r7"
 
 FILESPATHPKG .= ":gcc-$PV"
 
@@ -23,6 +23,7 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	file://gcc-ppc_single_precision_regs.patch;patch=1 \
 	file://gcc-ppc_add_d_constraint.patch;patch=1 \
 	file://gcc-pr41175.patch;patch=1 \
+	file://gcc-armv4-pass-fix-v4bx-to-ld.patch;patch=1 \
 	"
 # Language Overrides
 FORTRAN = ""
diff --git a/recipes/gcc/gcc-4.4.1/gcc-armv4-pass-fix-v4bx-to-ld.patch b/recipes/gcc/gcc-4.4.1/gcc-armv4-pass-fix-v4bx-to-ld.patch
new file mode 100644
index 0000000000..37670375e8
--- /dev/null
+++ b/recipes/gcc/gcc-4.4.1/gcc-armv4-pass-fix-v4bx-to-ld.patch
@@ -0,0 +1,28 @@
+The LINK_SPEC for linux gets overwritten by linux-eabi.h which
+means the value of TARGET_FIX_V4BX_SPEC gets lost and as a result
+the option is not passed to linker when chosing march=armv4
+This patch redefines this in linux-eabi.h and reinserts it
+for eabi defaulting toolchains.
+
+We might want to send it upstream
+
+-Khem
+Index: gcc-4.4.1/gcc/config/arm/linux-eabi.h
+===================================================================
+--- gcc-4.4.1.orig/gcc/config/arm/linux-eabi.h	2009-10-09 12:25:06.142471730 -0700
++++ gcc-4.4.1/gcc/config/arm/linux-eabi.h	2009-10-09 12:28:57.564946305 -0700
+@@ -63,10 +63,13 @@
+ #undef  GLIBC_DYNAMIC_LINKER
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.3"
+ 
++#undef TARGET_FIX_V4BX_SPEC
++#define TARGET_FIX_V4BX_SPEC " %{mcpu=arm8|mcpu=arm810|mcpu=strongarm*|march=armv4:--fix-v4bx}"
++
+ /* At this point, bpabi.h will have clobbered LINK_SPEC.  We want to
+    use the GNU/Linux version, not the generic BPABI version.  */
+ #undef  LINK_SPEC
+-#define LINK_SPEC LINUX_TARGET_LINK_SPEC
++#define LINK_SPEC LINUX_TARGET_LINK_SPEC TARGET_FIX_V4BX_SPEC
+ 
+ /* Use the default LIBGCC_SPEC, not the version in linux-elf.h, as we
+    do not use -lfloat.  */
diff --git a/recipes/linux/linux-omap_2.6.28.bb b/recipes/linux/linux-omap_2.6.28.bb
index 859321bdef..6475f49ad5 100644
--- a/recipes/linux/linux-omap_2.6.28.bb
+++ b/recipes/linux/linux-omap_2.6.28.bb
@@ -6,7 +6,6 @@ KERNEL_IMAGETYPE = "uImage"
 COMPATIBLE_MACHINE = "omap5912osk|omap1710h3|omap2430sdp|omap2420h4|beagleboard|omap3evm|omap3-pandora|overo"
 
 DEFAULT_PREFERENCE = "-1"
-DEFAULT_PREFERENCE_omap5912osk = "1"
 
 SRCREV = "79d042a081d3e467c735bb0d9569ed6296f85a3c"
 
diff --git a/recipes/linux/linux-omap_2.6.31.bb b/recipes/linux/linux-omap_2.6.31.bb
index 38d1b315ac..0fb9988ed8 100644
--- a/recipes/linux/linux-omap_2.6.31.bb
+++ b/recipes/linux/linux-omap_2.6.31.bb
@@ -7,6 +7,7 @@ COMPATIBLE_MACHINE = "omap5912osk|omap1710h3|omap2430sdp|omap2420h4|beagleboard|
 
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_omapzoom2 = "1"
+DEFAULT_PREFERENCE_omap5912osk = "1"
 
 SRCREV = "945044d157dd63c6af0f2ed40a5346382af94eb4"
 
diff --git a/recipes/lsof/lsof_4.78.bb b/recipes/lsof/lsof_4.78.bb
index 1bb540e422..02852a727f 100644
--- a/recipes/lsof/lsof_4.78.bb
+++ b/recipes/lsof/lsof_4.78.bb
@@ -21,7 +21,6 @@ export LSOF_OS = "${TARGET_OS}"
 LSOF_OS_linux-uclibc = "linux"
 LSOF_OS_linux-uclibceabi = "linux"
 LSOF_OS_linux-uclibspe = "linux"
-LSOF_OS_linux-gnu = "linux"
 LSOF_OS_linux-gnueabi = "linux"
 LSOF_OS_linux-gnuspe = "linux"
 export LSOF_INCLUDE = "${STAGING_INCDIR}"
diff --git a/recipes/openssl/openssl.inc b/recipes/openssl/openssl.inc
index 4c6e43543b..00f97824be 100644
--- a/recipes/openssl/openssl.inc
+++ b/recipes/openssl/openssl.inc
@@ -35,7 +35,7 @@ do_configure () {
 		os=linux
 	elif [ "x$os" = "xlinux-uclibceabi" ]; then
 		os=linux
-	elif [ "x$os" = "xlinux-gnu" ]; then
+	elif [ "x$os" = "xlinux-gnueabi" ]; then
 		os=linux
 	fi
 	target="$os-${HOST_ARCH}"
diff --git a/recipes/uclibc/uclibc-nptl/uclibc_arm_remove_duplicate_sysdep_defs.patch b/recipes/uclibc/uclibc-nptl/uclibc_arm_remove_duplicate_sysdep_defs.patch
index c871534ed8..ffcc62d698 100644
--- a/recipes/uclibc/uclibc-nptl/uclibc_arm_remove_duplicate_sysdep_defs.patch
+++ b/recipes/uclibc/uclibc-nptl/uclibc_arm_remove_duplicate_sysdep_defs.patch
@@ -1,16 +1,3 @@
---- a/libc/sysdeps/linux/common/Makefile.in.org	2009-09-30 17:22:18.652679321 -0700
-+++ a/libc/sysdeps/linux/common/Makefile.in	2009-09-30 17:21:15.599669303 -0700
-@@ -92,6 +92,10 @@ ifeq ($(TARGET_ARCH),i386)
- CSRC := $(filter-out vfork.c,$(CSRC))
- endif
- 
-+ifeq ($(TARGET_ARCH),arm)
-+CSRC := $(filter-out syscall.c,$(CSRC))
-+endif
-+
- # fails for some reason
- ifneq ($(strip $(ARCH_OBJS)),)
- CSRC := $(filter-out $(notdir $(ARCH_OBJS:.o=.c)),$(CSRC))
 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/arm/sysdep.h.orig	2009-09-30 17:12:46.571672582 -0700
 +++ a/libpthread/nptl/sysdeps/unix/sysv/linux/arm/sysdep.h	2009-09-30 17:10:12.255037520 -0700
 @@ -273,37 +273,6 @@ __local_syscall_error:						\
diff --git a/recipes/uclibc/uclibc_nptl.bb b/recipes/uclibc/uclibc_nptl.bb
index 0652c6ac94..aee29d86a5 100644
--- a/recipes/uclibc/uclibc_nptl.bb
+++ b/recipes/uclibc/uclibc_nptl.bb
@@ -7,7 +7,7 @@
 # on whether the base patches apply to the selected (SRCDATE) svn release.
 #
 UCLIBC_BASE ?= "0.9.30"
-SRCREV="072687ae9c54b55659431a5bd395d9956096ddea"
+SRCREV="af694a224ba5aa069d533931e10725c45295148d"
 PV = "${UCLIBC_BASE}+gitr${SRCREV}"
 DEFAULT_PREFERENCE = "-1"
 #DEFAULT_PREFERENCE is 0 (empty), releases have a preference of 1 so take