diff options
Diffstat (limited to 'packages/gcc')
-rw-r--r-- | packages/gcc/gcc-4.1.1/fix-ICE-in-arm_unwind_emit_set.diff | 18 | ||||
-rw-r--r-- | packages/gcc/gcc-package.inc | 2 | ||||
-rw-r--r-- | packages/gcc/gcc3-build-cross.inc | 3 | ||||
-rw-r--r-- | packages/gcc/gcc_3.3.3.bb | 3 | ||||
-rw-r--r-- | packages/gcc/gcc_3.3.4.bb | 3 | ||||
-rw-r--r-- | packages/gcc/gcc_4.1.1.bb | 6 |
6 files changed, 24 insertions, 11 deletions
diff --git a/packages/gcc/gcc-4.1.1/fix-ICE-in-arm_unwind_emit_set.diff b/packages/gcc/gcc-4.1.1/fix-ICE-in-arm_unwind_emit_set.diff new file mode 100644 index 0000000000..568e15abff --- /dev/null +++ b/packages/gcc/gcc-4.1.1/fix-ICE-in-arm_unwind_emit_set.diff @@ -0,0 +1,18 @@ +--- trunk/gcc/config/arm/arm.c 2006/09/19 13:18:27 117055 ++++ trunk/gcc/config/arm/arm.c 2006/09/19 13:19:24 117056 +@@ -15415,6 +15415,15 @@ + /* Move from sp to reg. */ + asm_fprintf (asm_out_file, "\t.movsp %r\n", REGNO (e0)); + } ++ else if (GET_CODE (e1) == PLUS ++ && GET_CODE (XEXP (e1, 0)) == REG ++ && REGNO (XEXP (e1, 0)) == SP_REGNUM ++ && GET_CODE (XEXP (e1, 1)) == CONST_INT) ++ { ++ /* Set reg to offset from sp. */ ++ asm_fprintf (asm_out_file, "\t.movsp %r, #%d\n", ++ REGNO (e0), (int)INTVAL(XEXP (e1, 1))); ++ } + else + abort (); + break; diff --git a/packages/gcc/gcc-package.inc b/packages/gcc/gcc-package.inc index 425e906a57..3ed8599e2d 100644 --- a/packages/gcc/gcc-package.inc +++ b/packages/gcc/gcc-package.inc @@ -35,7 +35,6 @@ FILES_cpp-symlinks = "${bindir}/cpp" FILES_gcov = "${bindir}/${TARGET_PREFIX}gcov" FILES_gcov-symlinks = "${bindir}/gcov" -PACKAGE_ARCH_libg2c-dev = "${TARGET_ARCH}" # Called from within gcc-cross, so libdir is set wrong FILES_libg2c-dev = "${libdir}/libg2c.so \ ${libdir}/libg2c.a \ @@ -46,7 +45,6 @@ FILES_g++ = "${bindir}/${TARGET_PREFIX}g++ \ FILES_g++-symlinks = "${bindir}/c++ \ ${bindir}/g++" -PACKAGE_ARCH_libstdc++-dev = "${TARGET_ARCH}" FILES_libstdc++-dev = "${includedir}/c++/${BINV} \ ${libdir}/libstdc++.so \ ${libdir}/libstdc++.la \ diff --git a/packages/gcc/gcc3-build-cross.inc b/packages/gcc/gcc3-build-cross.inc index e8a23e0d40..62a7bf3b23 100644 --- a/packages/gcc/gcc3-build-cross.inc +++ b/packages/gcc/gcc3-build-cross.inc @@ -1,7 +1,8 @@ USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibc", "no", "", d )}' EXTRA_OECONF_PATHS = "--with-local-prefix=${CROSS_DIR}/${TARGET_SYS} \ - --with-gxx-include-dir=${CROSS_DIR}/${TARGET_SYS}/include/c++" + --with-gxx-include-dir=${CROSS_DIR}/${TARGET_SYS}/include/c++ \ + --disable-multilib" do_configure_prepend () { rm -f ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/libgcc_eh.a diff --git a/packages/gcc/gcc_3.3.3.bb b/packages/gcc/gcc_3.3.3.bb index 0c237a9166..07387cb1bc 100644 --- a/packages/gcc/gcc_3.3.3.bb +++ b/packages/gcc/gcc_3.3.3.bb @@ -37,11 +37,8 @@ FILES_${PN}-c++ = "${bindir}/${TARGET_PREFIX}g++ \ FILES_${PN}-c++-symlinks = "${bindir}/c++ \ ${bindir}/g++" -PACKAGE_ARCH_libgcc = "${TARGET_ARCH}" FILES_libgcc = "/lib/libgcc_s.so.*" -PACKAGE_ARCH_libstdc++ = "${TARGET_ARCH}" -PACKAGE_ARCH_libstdc++-dev = "${TARGET_ARCH}" # Called from within gcc-cross, so libdir is set wrong #FILES_libstdc++ = "${libdir}/libstdc++.so.*" FILES_libstdc++ = "${libdir}/libstdc++.so.*" diff --git a/packages/gcc/gcc_3.3.4.bb b/packages/gcc/gcc_3.3.4.bb index bb52fa6a1f..f11fc36646 100644 --- a/packages/gcc/gcc_3.3.4.bb +++ b/packages/gcc/gcc_3.3.4.bb @@ -37,11 +37,8 @@ FILES_${PN}-c++ = "${bindir}/${TARGET_PREFIX}g++ \ FILES_${PN}-c++-symlinks = "${bindir}/c++ \ ${bindir}/g++" -PACKAGE_ARCH_libgcc = "${TARGET_ARCH}" FILES_libgcc = "/lib/libgcc_s.so.*" -PACKAGE_ARCH_libstdc++ = "${TARGET_ARCH}" -PACKAGE_ARCH_libstdc++-dev = "${TARGET_ARCH}" # Called from within gcc-cross, so libdir is set wrong #FILES_libstdc++ = "${libdir}/libstdc++.so.*" FILES_libstdc++ = "${libdir}/libstdc++.so.*" diff --git a/packages/gcc/gcc_4.1.1.bb b/packages/gcc/gcc_4.1.1.bb index 9c0bd7baac..81b81eebcd 100644 --- a/packages/gcc/gcc_4.1.1.bb +++ b/packages/gcc/gcc_4.1.1.bb @@ -1,4 +1,4 @@ -PR = "r7" +PR = "r8" DESCRIPTION = "The GNU cc and gcc C compilers." HOMEPAGE = "http://www.gnu.org/software/gcc/" SECTION = "devel" @@ -29,7 +29,8 @@ SRC_URI = "http://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.1/gcc-4.1.1.tar.bz2 \ file://cse.patch;patch=1 \ file://zecke-xgcc-cpp.patch;patch=1 \ file://unbreak-armv4t.patch;patch=1 \ - " + file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \ + " SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " @@ -41,6 +42,7 @@ HAS_G2C = "no" #Set the java bits JAVA_arm = "" +JAVA = "" LANGUAGES = "c,c++${FORTRAN}${JAVA}" require gcc3-build.inc |