summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-devtools/gcc/gcc-4.7.inc1
-rw-r--r--meta/recipes-devtools/gcc/gcc-4.7/arm-nolibfloat.patch40
-rw-r--r--meta/recipes-devtools/gcc/gcc-cross-initial.inc50
3 files changed, 39 insertions, 52 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-4.7.inc b/meta/recipes-devtools/gcc/gcc-4.7.inc
index 4ad4819e88..3f133853e8 100644
--- a/meta/recipes-devtools/gcc/gcc-4.7.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.7.inc
@@ -52,7 +52,6 @@ SRC_URI = "git://github.com/mirrors/gcc.git;branch=${BRANCH};protocol=git \
52 file://306-libstdc++-namespace.patch \ 52 file://306-libstdc++-namespace.patch \
53 file://740-sh-pr24836.patch \ 53 file://740-sh-pr24836.patch \
54 file://800-arm-bigendian.patch \ 54 file://800-arm-bigendian.patch \
55 file://arm-nolibfloat.patch \
56 file://gcc-poison-system-directories.patch \ 55 file://gcc-poison-system-directories.patch \
57 file://gcc-poison-dir-extend.patch \ 56 file://gcc-poison-dir-extend.patch \
58 file://gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch \ 57 file://gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch \
diff --git a/meta/recipes-devtools/gcc/gcc-4.7/arm-nolibfloat.patch b/meta/recipes-devtools/gcc/gcc-4.7/arm-nolibfloat.patch
deleted file mode 100644
index 901f014ed7..0000000000
--- a/meta/recipes-devtools/gcc/gcc-4.7/arm-nolibfloat.patch
+++ /dev/null
@@ -1,40 +0,0 @@
1Upstream-Status: Pending
2
3# Dimitry Andric <dimitry@andric.com>, 2004-05-01
4#
5# * Removed the extra -lfloat option from LIBGCC_SPEC, since it isn't needed
6# anymore. (The required functions are now in libgcc.)
7#
8# Fixes errors like
9# arm-softfloat-linux-gnu/3.4.0/../../../../arm-softfloat-linux-gnu/bin/ld: cannot find -lfloat
10# collect2: ld returned 1 exit status
11# make[2]: *** [arm-softfloat-linux-gnu/gcc-3.4.0-glibc-2.3.2/build-glibc/iconvdata/ISO8859-1.so] Error 1
12# when building glibc-2.3.3 with gcc-3.4.0 for arm-softfloat
13
14Index: trunk/gcc/config/arm/linux-elf.h
15===================================================================
16--- trunk.orig/gcc/config/arm/linux-elf.h 2012-02-22 12:04:30.644385926 -0800
17+++ trunk/gcc/config/arm/linux-elf.h 2012-02-22 12:04:30.764385931 -0800
18@@ -57,7 +57,7 @@
19 %{shared:-lc} \
20 %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
21
22-#define LIBGCC_SPEC "%{mfloat-abi=soft*:-lfloat} -lgcc"
23+#define LIBGCC_SPEC "-lgcc"
24
25 #define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux.so.2"
26
27Index: trunk/libgcc/config/arm/t-linux
28===================================================================
29--- trunk.orig/libgcc/config/arm/t-linux 2012-02-22 12:11:48.372407121 -0800
30+++ trunk/libgcc/config/arm/t-linux 2012-02-22 12:13:19.868411588 -0800
31@@ -1,6 +1,8 @@
32 LIB1ASMSRC = arm/lib1funcs.S
33 LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx _clzsi2 _clzdi2 \
34- _arm_addsubdf3 _arm_addsubsf3
35+ _negdf2 _addsubdf3 _muldivdf3 _cmpdf2 _unorddf2 _fixdfsi _fixunsdfsi \
36+ _truncdfsf2 _negsf2 _addsubsf3 _muldivsf3 _cmpsf2 _unordsf2 \
37+ _fixsfsi _fixunssfsi _floatdidf _floatundidf _floatdisf _floatundisf
38
39 # Just for these, we omit the frame pointer since it makes such a big
40 # difference.
diff --git a/meta/recipes-devtools/gcc/gcc-cross-initial.inc b/meta/recipes-devtools/gcc/gcc-cross-initial.inc
index 543a94a768..be47f85ef8 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-initial.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross-initial.inc
@@ -19,12 +19,11 @@ EXTRA_OECONF = "--with-newlib \
19 ${OPTSPACE} \ 19 ${OPTSPACE} \
20 --program-prefix=${TARGET_PREFIX} \ 20 --program-prefix=${TARGET_PREFIX} \
21 --with-sysroot=${STAGING_DIR_TARGET} \ 21 --with-sysroot=${STAGING_DIR_TARGET} \
22 --with-build-sysroot=${GCCCROSS_BUILDSYSROOT} \ 22 --with-build-sysroot=${STAGING_DIR_TARGET} \
23 ${EXTRA_OECONF_INITIAL} \ 23 ${EXTRA_OECONF_INITIAL} \
24 ${@base_contains('DISTRO_FEATURES', 'ld-is-gold', '--with-ld=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}ld.bfd', '', d)} \ 24 ${@base_contains('DISTRO_FEATURES', 'ld-is-gold', '--with-ld=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}ld.bfd', '', d)} \
25 ${EXTRA_OECONF_FPU}" 25 ${EXTRA_OECONF_FPU}"
26 26
27
28GCCCROSS_BUILDSYSROOT = "${B}/tmpsysroot" 27GCCCROSS_BUILDSYSROOT = "${B}/tmpsysroot"
29 28
30do_configure_prepend () { 29do_configure_prepend () {
@@ -39,13 +38,42 @@ do_configure_prepend () {
39do_compile () { 38do_compile () {
40 oe_runmake all-gcc all-target-libgcc 39 oe_runmake all-gcc all-target-libgcc
41} 40}
42# fixed limits.h infact includes the so called real limits.h 41do_install () {
43# which should come from libc but when we build libc-initial 42 oe_runmake 'DESTDIR=${D}' install-gcc install-target-libgcc
44# then bunch of configure tests include fixed limits.h which in turn 43
45# includes real limits.h but this real limits.h is not staged yet 44 # We don't really need this (here shares/ contains man/, info/, locale/).
46# so we overwirte the generated include-fixed/limits.h for gcc-cross-initial 45 rm -rf ${D}${datadir}/
47# to get rid references to real limits.h 46
48 47 # We use libiberty from binutils
49do_install_append () { 48 find ${D}${exec_prefix}/lib -name libiberty.a | xargs rm -f
50 cp gcc/include-fixed/limits.h ${D}${gcclibdir}/${TARGET_SYS}/${BINV}/include-fixed/limits.h 49 find ${D}${exec_prefix}/lib -name libiberty.h | xargs rm -f
50
51 # Insert symlinks into libexec so when tools without a prefix are searched for, the correct ones are
52 # found. These need to be relative paths so they work in different locations.
53 dest=${D}${libexecdir}/gcc/${TARGET_SYS}/${BINV}/
54 install -d $dest
55 for t in ar as ld nm objcopy objdump ranlib strip g77 gcc cpp gfortran; do
56 ln -sf ${BINRELPATH}/${TARGET_PREFIX}$t $dest$t
57 done
58 # fixed limits.h infact includes the so called real limits.h
59 # which should come from libc but when we build libc-initial
60 # then bunch of configure tests include fixed limits.h which in turn
61 # includes real limits.h but this real limits.h is not staged yet
62 # so we overwirte the generated include-fixed/limits.h for gcc-cross-initial
63 # to get rid references to real limits.h
64 cp gcc/include-fixed/limits.h ${D}${gcclibdir}/${TARGET_SYS}/${BINV}/include-fixed/limits.h
65}
66#
67# Override the default sysroot staging copy since this won't look like a target system
68#
69sysroot_stage_all() {
70 sysroot_stage_dir ${D} ${SYSROOT_DESTDIR}
71 install -d ${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}${target_base_libdir}/
72 install -d ${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}${target_libdir}/
73 mv ${SYSROOT_DESTDIR}${target_base_libdir}/* ${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}${target_base_libdir}/ || true
74 mv ${SYSROOT_DESTDIR}${target_libdir}/* ${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}${target_libdir}/ || true
51} 75}
76
77do_populate_sysroot[sstate-inputdirs] = "${SYSROOT_DESTDIR}/${STAGING_DIR_HOST} ${SYSROOT_DESTDIR}/${STAGING_DIR_TARGET}/${target_base_libdir}"
78do_populate_sysroot[sstate-outputdirs] = "${STAGING_DIR_HOST} ${STAGING_DIR_TCBOOTSTRAP}/${target_base_libdir}"
79