From 821b74d1c59559496ed7e7e86531fe3f76f4dade Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Mon, 6 Oct 2008 19:14:33 +0000 Subject: gcc-4.3.2: use multilib on sh4, so kernel can compile without fpu registers * add patch gcc-4.2.3-linux-multilib-fix.patch used by various other linux distributions * put the mulitlib config in gcc-cross4.inc because gcc-3 works without that * need to bump PR because we pushed in earlier changes on sh4 without bumping --- packages/gcc/gcc-4.3.2.inc | 2 +- .../gcc-4.3.2/gcc-4.2.3-linux-multilib-fix.patch | 23 ++++++++++++++++++++++ packages/gcc/gcc-cross4.inc | 2 ++ packages/gcc/gcc-cross_4.3.2.bb | 2 +- 4 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 packages/gcc/gcc-4.3.2/gcc-4.2.3-linux-multilib-fix.patch (limited to 'packages') diff --git a/packages/gcc/gcc-4.3.2.inc b/packages/gcc/gcc-4.3.2.inc index 21c08ffccc..74ed254694 100644 --- a/packages/gcc/gcc-4.3.2.inc +++ b/packages/gcc/gcc-4.3.2.inc @@ -60,8 +60,8 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ SRC_URI_append_sh3 = " file://sh3-installfix-fixheaders.patch;patch=1 " SRC_URI_append_sh4 = " file://sh_unwind.patch;patch=1 \ + file://gcc-4.2.3-linux-multilib-fix.patch;patch=1 \ " - # Language Overrides FORTRAN = "" JAVA = "" diff --git a/packages/gcc/gcc-4.3.2/gcc-4.2.3-linux-multilib-fix.patch b/packages/gcc/gcc-4.3.2/gcc-4.2.3-linux-multilib-fix.patch new file mode 100644 index 0000000000..81522a8f57 --- /dev/null +++ b/packages/gcc/gcc-4.3.2/gcc-4.2.3-linux-multilib-fix.patch @@ -0,0 +1,23 @@ +Change gcc build : Enable m4 and m4-nofpu (needed for kernel) for sh4-gnu-linux + +Signed-off-by: Carl Shaw + +Index: gcc/gcc/config.gcc +=================================================================== +--- gcc.orig/gcc/config.gcc 2008-07-18 10:37:54.000000000 +0100 ++++ gcc/gcc/config.gcc 2008-07-18 11:00:42.000000000 +0100 +@@ -2097,11 +2097,12 @@ + if test x${sh_multilibs} = x ; then + case ${target} in + sh64-superh-linux* | \ +- sh[1234]*) sh_multilibs=${sh_cpu_target} ;; + sh64* | sh5*) sh_multilibs=m5-32media,m5-32media-nofpu,m5-compact,m5-compact-nofpu,m5-64media,m5-64media-nofpu ;; +- sh-superh-*) sh_multilibs=m4,m4-single,m4-single-only,m4-nofpu ;; ++ sh-superh-* | \ ++ sh4-*-linux*) sh_multilibs=m4,m4-nofpu ;; + sh*-*-linux*) sh_multilibs=m1,m3e,m4 ;; + sh*-*-netbsd*) sh_multilibs=m3,m3e,m4 ;; ++ sh[1234]*) sh_multilibs=${sh_cpu_target} ;; + *) sh_multilibs=m1,m2,m2e,m4,m4-single,m4-single-only,m2a,m2a-single ;; + esac + if test x$with_fp = xno; then diff --git a/packages/gcc/gcc-cross4.inc b/packages/gcc/gcc-cross4.inc index 3d3403737a..77a55968fa 100644 --- a/packages/gcc/gcc-cross4.inc +++ b/packages/gcc/gcc-cross4.inc @@ -1,3 +1,5 @@ require gcc-cross.inc DEPENDS += "gmp-native mpfr-native" + +EXTRA_OECONF_append_sh4 = " --with-multilib-list=m4,m4-nofpu " diff --git a/packages/gcc/gcc-cross_4.3.2.bb b/packages/gcc/gcc-cross_4.3.2.bb index 526ec1508b..18d5abd32e 100644 --- a/packages/gcc/gcc-cross_4.3.2.bb +++ b/packages/gcc/gcc-cross_4.3.2.bb @@ -1,4 +1,4 @@ -PR = "r4" +PR = "r5" require gcc-${PV}.inc require gcc-cross4.inc require gcc-configure-cross.inc -- cgit v1.2.3 From 36bb8829f31eebca4b864a9d8df604fdd3d0fbf0 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Mon, 6 Oct 2008 19:14:34 +0000 Subject: task-opie-all: remove opie-cardmon (replaced by opie-cardapplet) --- packages/tasks/task-opie-all.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/tasks/task-opie-all.bb b/packages/tasks/task-opie-all.bb index 47d2eba229..9f1403f050 100644 --- a/packages/tasks/task-opie-all.bb +++ b/packages/tasks/task-opie-all.bb @@ -14,7 +14,7 @@ PACKAGES = "task-opie-applets task-opie-inputmethods task-opie-styles \ # all OPIE stuff # RDEPENDS_task-opie-applets = "opie-aboutapplet opie-autorotateapplet opie-batteryapplet \ - opie-bluetoothapplet opie-brightnessapplet opie-cardmon \ + opie-bluetoothapplet opie-brightnessapplet \ opie-clipboardapplet opie-clockapplet opie-homeapplet \ opie-irdaapplet opie-lockapplet opie-logoutapplet \ opie-mailapplet opie-memoryapplet opie-multikeyapplet \ -- cgit v1.2.3