summaryrefslogtreecommitdiff
path: root/packages/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'packages/gcc')
-rw-r--r--packages/gcc/gcc-3.4.4.inc1
-rw-r--r--packages/gcc/gcc-3.4.4/jarfix.patch30
-rw-r--r--packages/gcc/gcc-4.0.0.inc2
-rw-r--r--packages/gcc/gcc-4.0.2.inc2
-rw-r--r--packages/gcc/gcc-4.1.0.inc2
-rw-r--r--packages/gcc/gcc-4.1.1.inc2
-rw-r--r--packages/gcc/gcc-4.1.2.inc4
-rw-r--r--packages/gcc/gcc-4.2.1.inc5
-rw-r--r--packages/gcc/gcc-4.2.1/gcc-pr32889.patch57
-rw-r--r--packages/gcc/gcc-4.2.2.inc3
-rw-r--r--packages/gcc/gcc-4.3.0.inc2
-rw-r--r--packages/gcc/gcc-configure-common.inc7
-rw-r--r--packages/gcc/gcc-cross-initial_csl-arm-2006q1.bb7
-rw-r--r--packages/gcc/gcc-cross-kernel-3.4.4_csl-arm-2005q3.bb7
-rw-r--r--packages/gcc/gcc-cross_4.1.0.bb2
-rw-r--r--packages/gcc/gcc-cross_4.2.1.bb9
-rw-r--r--packages/gcc/gcc-cross_4.2.2.bb7
-rw-r--r--packages/gcc/gcc-cross_4.3.0.bb7
-rw-r--r--packages/gcc/gcc-cross_csl-arm-2006q1.bb6
-rw-r--r--packages/gcc/gcc-csl-arm-2006q1.inc19
-rw-r--r--packages/gcc/gcc-csl-arm/gcc-new-makeinfo.patch35
-rw-r--r--packages/gcc/gcc-package-cross.inc15
-rw-r--r--packages/gcc/gcc-package-target.inc12
-rw-r--r--packages/gcc/gcc_4.2.1.bb2
-rw-r--r--packages/gcc/gcc_csl-arm-2006q1.bb5
25 files changed, 205 insertions, 45 deletions
diff --git a/packages/gcc/gcc-3.4.4.inc b/packages/gcc/gcc-3.4.4.inc
index 2cd2ddd4a4..704d9bc5c8 100644
--- a/packages/gcc/gcc-3.4.4.inc
+++ b/packages/gcc/gcc-3.4.4.inc
@@ -13,6 +13,7 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
file://gcc-3.4.0-arm-bigendian-uclibc.patch;patch=1 \
file://GCC3.4.0VisibilityPatch.diff;patch=1 \
file://15342.patch;patch=1 \
+ file://jarfix.patch;patch=1 \
file://always-fixincperm.patch;patch=1 \
file://GCOV_PREFIX_STRIP-cross-profile_3.4.patch;patch=1 \
file://zecke-xgcc-cpp.patch;patch=1 \
diff --git a/packages/gcc/gcc-3.4.4/jarfix.patch b/packages/gcc/gcc-3.4.4/jarfix.patch
new file mode 100644
index 0000000000..082daf4a7e
--- /dev/null
+++ b/packages/gcc/gcc-3.4.4/jarfix.patch
@@ -0,0 +1,30 @@
+ libjava/Makefile.am | 2 +-
+ libjava/Makefile.in | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+Index: gcc-3.4.4/libjava/Makefile.am
+===================================================================
+--- gcc-3.4.4.orig/libjava/Makefile.am 2006-12-05 15:37:50.000000000 +0000
++++ gcc-3.4.4/libjava/Makefile.am 2006-12-05 15:38:27.000000000 +0000
+@@ -77,7 +77,7 @@ if NULL_TARGET
+ ZIP = $(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar
+ GCJH = gcjh
+ else
+-ZIP = jar
++ZIP = $(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar
+ GCJH = $(target_alias)-gcjh
+ endif
+ else # CANADIAN
+Index: gcc-3.4.4/libjava/Makefile.in
+===================================================================
+--- gcc-3.4.4.orig/libjava/Makefile.in 2006-12-05 15:39:08.000000000 +0000
++++ gcc-3.4.4/libjava/Makefile.in 2006-12-05 15:39:21.000000000 +0000
+@@ -193,7 +193,7 @@ propdir = $(libdir)
+
+ bin_SCRIPTS = addr2name.awk
+ @CANADIAN_TRUE@@NULL_TARGET_TRUE@ZIP = @CANADIAN_TRUE@@NULL_TARGET_TRUE@$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar
+-@CANADIAN_TRUE@@NULL_TARGET_FALSE@ZIP = @CANADIAN_TRUE@@NULL_TARGET_FALSE@jar
++@CANADIAN_TRUE@@NULL_TARGET_FALSE@ZIP = @CANADIAN_TRUE@@NULL_TARGET_FALSE@$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar
+ @CANADIAN_FALSE@ZIP = @CANADIAN_FALSE@$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar
+ @CANADIAN_TRUE@@NULL_TARGET_TRUE@GCJH = @CANADIAN_TRUE@@NULL_TARGET_TRUE@gcjh
+ @CANADIAN_TRUE@@NULL_TARGET_FALSE@GCJH = @CANADIAN_TRUE@@NULL_TARGET_FALSE@$(target_alias)-gcjh
diff --git a/packages/gcc/gcc-4.0.0.inc b/packages/gcc/gcc-4.0.0.inc
index 7b231771f1..5745ba050d 100644
--- a/packages/gcc/gcc-4.0.0.inc
+++ b/packages/gcc/gcc-4.0.0.inc
@@ -7,3 +7,5 @@ SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
# Language Overrides
FORTRAN = ",f95"
+
+EXTRA_OECONF_BASE = "--disable-libssp"
diff --git a/packages/gcc/gcc-4.0.2.inc b/packages/gcc/gcc-4.0.2.inc
index a0a6a6ae66..e3fafb8a7f 100644
--- a/packages/gcc/gcc-4.0.2.inc
+++ b/packages/gcc/gcc-4.0.2.inc
@@ -25,5 +25,5 @@ SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
# Language Overrides
FORTRAN = ""
-EXTRA_OECONF += "--disable-libssp"
+EXTRA_OECONF_BASE = "--disable-libssp"
diff --git a/packages/gcc/gcc-4.1.0.inc b/packages/gcc/gcc-4.1.0.inc
index 4e6dcfd4e2..e12f93c800 100644
--- a/packages/gcc/gcc-4.1.0.inc
+++ b/packages/gcc/gcc-4.1.0.inc
@@ -11,7 +11,7 @@ SRC_URI = "http://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.0/gcc-4.1.0.tar.bz2 \
SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
-EXTRA_OECONF += "--disable-libssp"
+EXTRA_OECONF_BASE = "--disable-libssp --disable-libmudflap"
# Language Overrides
FORTRAN = ""
diff --git a/packages/gcc/gcc-4.1.1.inc b/packages/gcc/gcc-4.1.1.inc
index a892dc31e3..92ee2d7bb8 100644
--- a/packages/gcc/gcc-4.1.1.inc
+++ b/packages/gcc/gcc-4.1.1.inc
@@ -42,4 +42,4 @@ SRC_URI_append_linux = " file://ppc-gcc-41-20060515.patch;patch=1 \
FORTRAN = ""
JAVA = ""
-EXTRA_OECONF += " --disable-libssp "
+EXTRA_OECONF_BASE = "--disable-libssp --disable-libmudflap"
diff --git a/packages/gcc/gcc-4.1.2.inc b/packages/gcc/gcc-4.1.2.inc
index 6e5671280a..614e2bb421 100644
--- a/packages/gcc/gcc-4.1.2.inc
+++ b/packages/gcc/gcc-4.1.2.inc
@@ -55,4 +55,6 @@ do_compile_prepend_avr32() {
FORTRAN = ""
JAVA = ""
-EXTRA_OECONF += " --disable-libssp "
+EXTRA_OECONF_BASE = "--disable-libssp --disable-libmudflap"
+
+ARM_INSTRUCTION_SET = "arm"
diff --git a/packages/gcc/gcc-4.2.1.inc b/packages/gcc/gcc-4.2.1.inc
index 25b5937141..16e5b8f5bc 100644
--- a/packages/gcc/gcc-4.2.1.inc
+++ b/packages/gcc/gcc-4.2.1.inc
@@ -37,6 +37,7 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
"
SRC_URI_avr32 = " http://ewi546.ewi.utwente.nl/tmp/avr32-gcc-4.2.1-atmel.1.0.3.tar.gz \
+ file://gcc-pr32889.patch;patch=1 \
file://100-uclibc-conf.patch;patch=1 \
file://103-uclibc-conf-noupstream.patch;patch=1 \
file://200-uclibc-locale.patch;patch=1 \
@@ -91,4 +92,6 @@ FORTRAN = ""
FORTRAN_linux-gnueabi = ",fortran"
JAVA = ""
-EXTRA_OECONF += " --disable-libgomp --disable-libssp --disable-bootstrap "
+EXTRA_OECONF_BASE = "--disable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap"
+
+ARM_INSTRUCTION_SET = "arm"
diff --git a/packages/gcc/gcc-4.2.1/gcc-pr32889.patch b/packages/gcc/gcc-4.2.1/gcc-pr32889.patch
new file mode 100644
index 0000000000..3135f23907
--- /dev/null
+++ b/packages/gcc/gcc-4.2.1/gcc-pr32889.patch
@@ -0,0 +1,57 @@
+diff -urNp --exclude '*.swp' --exclude DEV-PHASE gcc-orig/gcc/reload.c gcc/gcc/reload.c
+--- gcc-orig/gcc/reload.c 2008-02-18 09:59:15.000000000 -0800
++++ gcc/gcc/reload.c 2008-02-18 10:05:47.000000000 -0800
+@@ -4574,7 +4574,7 @@ find_reloads_toplev (rtx x, int opnum, e
+ x = mem;
+ i = find_reloads_address (GET_MODE (x), &x, XEXP (x, 0), &XEXP (x, 0),
+ opnum, type, ind_levels, insn);
+- if (x != mem)
++ if (!rtx_equal_p (x, mem))
+ push_reg_equiv_alt_mem (regno, x);
+ if (address_reloaded)
+ *address_reloaded = i;
+@@ -4789,7 +4789,7 @@ find_reloads_address (enum machine_mode
+ find_reloads_address (GET_MODE (tem), &tem, XEXP (tem, 0),
+ &XEXP (tem, 0), opnum,
+ ADDR_TYPE (type), ind_levels, insn);
+- if (tem != orig)
++ if (!rtx_equal_p (tem, orig))
+ push_reg_equiv_alt_mem (regno, tem);
+ }
+ /* We can avoid a reload if the register's equivalent memory
+@@ -5589,7 +5589,7 @@ find_reloads_address_1 (enum machine_mod
+ RELOAD_OTHER,
+ ind_levels, insn);
+
+- if (tem != orig)
++ if (!rtx_equal_p (tem, orig))
+ push_reg_equiv_alt_mem (regno, tem);
+
+ /* Then reload the memory location into a base
+@@ -5656,7 +5656,7 @@ find_reloads_address_1 (enum machine_mod
+ find_reloads_address (GET_MODE (tem), &tem, XEXP (tem, 0),
+ &XEXP (tem, 0), opnum, type,
+ ind_levels, insn);
+- if (tem != orig)
++ if (!rtx_equal_p (tem, orig))
+ push_reg_equiv_alt_mem (regno, tem);
+ /* Put this inside a new increment-expression. */
+ x = gen_rtx_fmt_e (GET_CODE (x), GET_MODE (x), tem);
+@@ -5848,7 +5848,7 @@ find_reloads_address_1 (enum machine_mod
+ find_reloads_address (GET_MODE (x), &x, XEXP (x, 0),
+ &XEXP (x, 0), opnum, ADDR_TYPE (type),
+ ind_levels, insn);
+- if (x != tem)
++ if (!rtx_equal_p (x, tem))
+ push_reg_equiv_alt_mem (regno, x);
+ }
+ }
+@@ -6076,7 +6076,7 @@ find_reloads_subreg_address (rtx x, int
+ XEXP (tem, 0), &XEXP (tem, 0),
+ opnum, type, ind_levels, insn);
+ /* ??? Do we need to handle nonzero offsets somehow? */
+- if (!offset && tem != orig)
++ if (!offset && !rtx_equal_p (tem, orig))
+ push_reg_equiv_alt_mem (regno, tem);
+
+ /* For some processors an address may be valid in the
diff --git a/packages/gcc/gcc-4.2.2.inc b/packages/gcc/gcc-4.2.2.inc
index e2b4c92669..02fe1162bc 100644
--- a/packages/gcc/gcc-4.2.2.inc
+++ b/packages/gcc/gcc-4.2.2.inc
@@ -69,5 +69,6 @@ FORTRAN = ""
FORTRAN_linux-gnueabi = ",fortran"
JAVA = ""
-EXTRA_OECONF += " --disable-libssp --disable-bootstrap "
+EXTRA_OECONF_BASE = "--disable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap"
+ARM_INSTRUCTION_SET = "arm" \ No newline at end of file
diff --git a/packages/gcc/gcc-4.3.0.inc b/packages/gcc/gcc-4.3.0.inc
index 64d52cabbe..1d7184ca7a 100644
--- a/packages/gcc/gcc-4.3.0.inc
+++ b/packages/gcc/gcc-4.3.0.inc
@@ -49,5 +49,5 @@ SRC_URI_append_sh3 = " file://sh3-installfix-fixheaders.patch;patch=1 "
FORTRAN = ""
JAVA = ""
-EXTRA_OECONF += " --disable-libssp --disable-bootstrap "
+EXTRA_OECONF_BASE = " --disable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap"
diff --git a/packages/gcc/gcc-configure-common.inc b/packages/gcc/gcc-configure-common.inc
index 9971c08c20..9085367b05 100644
--- a/packages/gcc/gcc-configure-common.inc
+++ b/packages/gcc/gcc-configure-common.inc
@@ -13,6 +13,9 @@ JAVA_sh3 ?= ""
FORTRAN ?= ",f77"
LANGUAGES ?= "c,c++${FORTRAN}${JAVA}"
+EXTRA_OECONF_BASE ?= ""
+EXTRA_OECONF_PATHS ?= ""
+
EXTRA_OECONF = "${@['--enable-clocale=generic', ''][bb.data.getVar('USE_NLS', d, 1) != 'no']} \
--with-gnu-ld \
--enable-shared \
@@ -25,6 +28,8 @@ EXTRA_OECONF = "${@['--enable-clocale=generic', ''][bb.data.getVar('USE_NLS', d,
--enable-symvers=gnu \
--enable-libstdcxx-pch \
--program-prefix=${TARGET_PREFIX} \
+ ${EXTRA_OECONF_BASE} \
+ ${EXTRA_OECONF_FPU} \
${EXTRA_OECONF_PATHS}"
# Build uclibc compilers without cxa_atexit support
@@ -32,7 +37,7 @@ EXTRA_OECONF_append_linux = " --enable-__cxa_atexit"
EXTRA_OECONF_append_linux-gnueabi = " --enable-__cxa_atexit"
EXTRA_OECONF_append_linux-uclibc = " --disable-__cxa_atexit"
EXTRA_OECONF_append_linux-uclibcgnueabi = " --disable-__cxa_atexit"
-EXTRA_OECONF += "${@get_gcc_fpu_setting(bb, d)}"
+EXTRA_OECONF_FPU = "${@get_gcc_fpu_setting(bb, d)}"
CPPFLAGS = ""
# Used by configure to define additional values for FLAGS_FOR_TARGET -
diff --git a/packages/gcc/gcc-cross-initial_csl-arm-2006q1.bb b/packages/gcc/gcc-cross-initial_csl-arm-2006q1.bb
new file mode 100644
index 0000000000..2a5d4fc0cc
--- /dev/null
+++ b/packages/gcc/gcc-cross-initial_csl-arm-2006q1.bb
@@ -0,0 +1,7 @@
+require gcc-cross_${PV}.bb
+require gcc-cross-initial.inc
+
+S = "${WORKDIR}/gcc-2006q1"
+
+EXTRA_OECONF += "--disable-libmudflap \
+ --disable-libssp"
diff --git a/packages/gcc/gcc-cross-kernel-3.4.4_csl-arm-2005q3.bb b/packages/gcc/gcc-cross-kernel-3.4.4_csl-arm-2005q3.bb
index 46a56fa339..e4068cbeb4 100644
--- a/packages/gcc/gcc-cross-kernel-3.4.4_csl-arm-2005q3.bb
+++ b/packages/gcc/gcc-cross-kernel-3.4.4_csl-arm-2005q3.bb
@@ -1,10 +1,13 @@
# This kernel compiler is required by the Freecom FSG-3 machine
-# Please talk to Rod Whitby before considering removing this file.
+# This kernel compiler is required by the Nokia tablets
+# Please talk to Rod Whitby and Richard Purdie before considering removing this file.
DEFAULT_PREFERENCE = "-1"
-require gcc-cross-kernel.inc
require gcc-cross-initial_csl-arm-2005q3.bb
+require gcc-cross-kernel.inc
+
+PR = "r1"
SRC_URI += "file://gcc-3.4.4-makefile-fix.patch;patch=1"
diff --git a/packages/gcc/gcc-cross_4.1.0.bb b/packages/gcc/gcc-cross_4.1.0.bb
index 576d487b34..82be62a91e 100644
--- a/packages/gcc/gcc-cross_4.1.0.bb
+++ b/packages/gcc/gcc-cross_4.1.0.bb
@@ -5,4 +5,4 @@ require gcc-cross4.inc
require gcc-configure-cross.inc
require gcc-package-cross.inc
-EXTRA_OECONF += "--with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}"
+EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}"
diff --git a/packages/gcc/gcc-cross_4.2.1.bb b/packages/gcc/gcc-cross_4.2.1.bb
index bb3b5ff9b1..8e20d03e68 100644
--- a/packages/gcc/gcc-cross_4.2.1.bb
+++ b/packages/gcc/gcc-cross_4.2.1.bb
@@ -1,4 +1,4 @@
-PR = "r13"
+PR = "r14"
require gcc-${PV}.inc
require gcc-cross4.inc
@@ -6,10 +6,7 @@ require gcc-configure-cross.inc
require gcc-package-cross.inc
SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
-# Do not build libssp libmudflap and libgomp
-# We might need them for some beefy targets
-EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \
- --disable-libgomp --disable-libmudflap \
- --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}"
+
+EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}"
ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${layout_includedir}"
diff --git a/packages/gcc/gcc-cross_4.2.2.bb b/packages/gcc/gcc-cross_4.2.2.bb
index 8a7a21f188..11e04594fc 100644
--- a/packages/gcc/gcc-cross_4.2.2.bb
+++ b/packages/gcc/gcc-cross_4.2.2.bb
@@ -6,10 +6,7 @@ require gcc-configure-cross.inc
require gcc-package-cross.inc
SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
-# Do not build libssp libmudflap and libgomp
-# We might need them for some beefy targets
-EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \
- --disable-libgomp --disable-libmudflap \
- --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}"
+
+EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}"
ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${layout_includedir}"
diff --git a/packages/gcc/gcc-cross_4.3.0.bb b/packages/gcc/gcc-cross_4.3.0.bb
index 0c4c10bd7f..68c4d70551 100644
--- a/packages/gcc/gcc-cross_4.3.0.bb
+++ b/packages/gcc/gcc-cross_4.3.0.bb
@@ -6,10 +6,7 @@ require gcc-configure-cross.inc
require gcc-package-cross.inc
SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
-# Do not build libssp libmudflap and libgomp
-# We might need them for some beefy targets
-EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \
- --disable-libgomp --disable-libmudflap \
- --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}"
+
+EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}"
ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${layout_includedir}"
diff --git a/packages/gcc/gcc-cross_csl-arm-2006q1.bb b/packages/gcc/gcc-cross_csl-arm-2006q1.bb
new file mode 100644
index 0000000000..49ac900184
--- /dev/null
+++ b/packages/gcc/gcc-cross_csl-arm-2006q1.bb
@@ -0,0 +1,6 @@
+PR = "r1"
+
+require gcc-csl-arm-2006q1.inc
+require gcc-cross.inc
+require gcc-configure-cross.inc
+require gcc-package-cross.inc
diff --git a/packages/gcc/gcc-csl-arm-2006q1.inc b/packages/gcc/gcc-csl-arm-2006q1.inc
new file mode 100644
index 0000000000..a208170b47
--- /dev/null
+++ b/packages/gcc/gcc-csl-arm-2006q1.inc
@@ -0,0 +1,19 @@
+require gcc-common.inc
+
+BINV = "4.1.0"
+PV = "4.1.0+csl-arm-2006q1-6"
+
+FILESDIR = "${FILE_DIRNAME}/gcc-csl-arm"
+
+SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm-none-eabi/arm-2006q1-6-arm-none-eabi.src.tar.bz2 \
+ file://gcc-configure-no-fortran.patch;patch=1;pnum=1 \
+ file://gcc-new-makeinfo.patch;patch=1"
+
+S = "${WORKDIR}/gcc-2006q1"
+
+do_unpack2() {
+ cd ${WORKDIR}
+ tar -xvjf ./arm-2006q1-6-arm-none-eabi/gcc-2006q1-6.tar.bz2
+}
+
+addtask unpack2 after do_unpack before do_patch
diff --git a/packages/gcc/gcc-csl-arm/gcc-new-makeinfo.patch b/packages/gcc/gcc-csl-arm/gcc-new-makeinfo.patch
new file mode 100644
index 0000000000..b984605af7
--- /dev/null
+++ b/packages/gcc/gcc-csl-arm/gcc-new-makeinfo.patch
@@ -0,0 +1,35 @@
+---
+ configure | 2 +-
+ configure.in | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- gcc-2006q1.orig/configure
++++ gcc-2006q1/configure
+@@ -3453,11 +3453,11 @@ case " $build_configdirs " in
+ *)
+
+ # For an installed makeinfo, we require it to be from texinfo 4.2 or
+ # higher, else we use the "missing" dummy.
+ if ${MAKEINFO} --version \
+- | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|[5-9])' >/dev/null 2>&1; then
++ | egrep 'texinfo[^0-9]*(4\.([6-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
+ :
+ else
+ MAKEINFO="$MISSING makeinfo"
+ fi
+ ;;
+--- gcc-2006q1.orig/configure.in
++++ gcc-2006q1/configure.in
+@@ -2078,11 +2078,11 @@ case " $build_configdirs " in
+ *)
+ changequote(,)
+ # For an installed makeinfo, we require it to be from texinfo 4.2 or
+ # higher, else we use the "missing" dummy.
+ if ${MAKEINFO} --version \
+- | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|[5-9])' >/dev/null 2>&1; then
++ | egrep 'texinfo[^0-9]*(4\.([6-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
+ :
+ else
+ MAKEINFO="$MISSING makeinfo"
+ fi
+ ;;
diff --git a/packages/gcc/gcc-package-cross.inc b/packages/gcc/gcc-package-cross.inc
index 559b9fe27d..54294f4fa6 100644
--- a/packages/gcc/gcc-package-cross.inc
+++ b/packages/gcc/gcc-package-cross.inc
@@ -2,29 +2,16 @@ INHIBIT_PACKAGE_STRIP ?= ""
OLD_INHIBIT_PACKAGE_STRIP := "${INHIBIT_PACKAGE_STRIP}"
INHIBIT_PACKAGE_STRIP = "1"
-PACKAGES = "libgcc libgcc-dev libstdc++ libg2c libg2c-dev libgfortran libgfortran-dev"
+PACKAGES = "libgcc libstdc++ libg2c libgfortran"
# Called from within gcc-cross, so libdir is set wrong
FILES_libg2c = "${target_libdir}/libg2c.so.*"
-FILES_libg2c-dev = "${target_libdir}/libg2c.so \
- ${target_libdir}/libg2c.a \
- ${target_libdir}/libfrtbegin.a"
FILES_libgfortran = "${target_libdir}/libgfortran.so.*"
-FILES_libgfortran-dev = "${target_libdir}/libgfortran.a \
- ${target_libdir}/libgfortran.so \
- ${target_libdir}/libgfortranbegin.a"
FILES_libgcc = "${target_base_libdir}/libgcc_s.so.1"
-FILES_libgcc-dev = "${target_base_libdir}/libgcc_s.so"
FILES_libstdc++ = "${target_libdir}/libstdc++.so.*"
-FILES_libstdc++-dev = "${target_includedir}/c++/${PV} \
- ${target_libdir}/libstdc++.so \
- ${target_libdir}/libstdc++.la \
- ${target_libdir}/libstdc++.a \
- ${target_libdir}/libsupc++.la \
- ${target_libdir}/libsupc++.a"
do_install () {
oe_runmake 'DESTDIR=${D}' install
diff --git a/packages/gcc/gcc-package-target.inc b/packages/gcc/gcc-package-target.inc
index 0e03f29958..2c19c5ecc7 100644
--- a/packages/gcc/gcc-package-target.inc
+++ b/packages/gcc/gcc-package-target.inc
@@ -1,13 +1,15 @@
PACKAGES = "\
- libgcc ${PN} ${PN}-symlinks \
+ ${PN} ${PN}-symlinks \
g++ g++-symlinks \
cpp cpp-symlinks \
g77 g77-symlinks \
gfortran gfortran-symlinks \
gcov gcov-symlinks \
libmudflap libmudflap-dev \
- libstdc++ libg2c \
- libstdc++-dev libg2c-dev \
+ libgcc-dev \
+ libstdc++-dev \
+ libg2c-dev \
+ libgfortran-dev \
${PN}-doc \
"
@@ -81,6 +83,10 @@ FILES_libstdc++-dev = "\
${libdir}/libsupc++.a \
"
+FILES_libgfortran-dev = "${libdir}/libgfortran.a \
+ ${libdir}/libgfortran.so \
+ ${libdir}/libgfortranbegin.a"
+
FILES_libmudflap = "${libdir}/libmudflap*.so.*"
FILES_libmudflap-dev = "\
${libdir}/libmudflap*.so \
diff --git a/packages/gcc/gcc_4.2.1.bb b/packages/gcc/gcc_4.2.1.bb
index 6da15d22b2..09a7cbbbc0 100644
--- a/packages/gcc/gcc_4.2.1.bb
+++ b/packages/gcc/gcc_4.2.1.bb
@@ -1,4 +1,4 @@
-PR = "r9"
+PR = "r10"
require gcc-${PV}.inc
require gcc-configure-target.inc
diff --git a/packages/gcc/gcc_csl-arm-2006q1.bb b/packages/gcc/gcc_csl-arm-2006q1.bb
new file mode 100644
index 0000000000..832167ca4e
--- /dev/null
+++ b/packages/gcc/gcc_csl-arm-2006q1.bb
@@ -0,0 +1,5 @@
+PR = "r1"
+
+require gcc-${PV}.inc
+require gcc-configure-target.inc
+require gcc-package-target.inc