gcc-cross: Make gcc-cross-initial as the only intermediate gcc stage
Now glibc can be compiled with gcc-cross-initial therefore prepare the stage to drop gcc-cross-intermediate Also drop arm-nolibfloat.patch should not be needed anymore half of changes in this patch are meant for OABI which we dont use anymore (From OE-Core rev: 30617bde61a3b0a0944b49a0c9fb7159dacbb19f) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Khem Raj
Richard Purdie
parent
91746bab6b
commit
b0faebd1f0
|
|
@ -52,7 +52,6 @@ SRC_URI = "git://github.com/mirrors/gcc.git;branch=${BRANCH};protocol=git \
|
|||
file://306-libstdc++-namespace.patch \
|
||||
file://740-sh-pr24836.patch \
|
||||
file://800-arm-bigendian.patch \
|
||||
file://arm-nolibfloat.patch \
|
||||
file://gcc-poison-system-directories.patch \
|
||||
file://gcc-poison-dir-extend.patch \
|
||||
file://gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch \
|
||||
|
|
|
|||
|
|
@ -1,40 +0,0 @@
|
|||
Upstream-Status: Pending
|
||||
|
||||
# Dimitry Andric <dimitry@andric.com>, 2004-05-01
|
||||
#
|
||||
# * Removed the extra -lfloat option from LIBGCC_SPEC, since it isn't needed
|
||||
# anymore. (The required functions are now in libgcc.)
|
||||
#
|
||||
# Fixes errors like
|
||||
# arm-softfloat-linux-gnu/3.4.0/../../../../arm-softfloat-linux-gnu/bin/ld: cannot find -lfloat
|
||||
# collect2: ld returned 1 exit status
|
||||
# make[2]: *** [arm-softfloat-linux-gnu/gcc-3.4.0-glibc-2.3.2/build-glibc/iconvdata/ISO8859-1.so] Error 1
|
||||
# when building glibc-2.3.3 with gcc-3.4.0 for arm-softfloat
|
||||
|
||||
Index: trunk/gcc/config/arm/linux-elf.h
|
||||
===================================================================
|
||||
--- trunk.orig/gcc/config/arm/linux-elf.h 2012-02-22 12:04:30.644385926 -0800
|
||||
+++ trunk/gcc/config/arm/linux-elf.h 2012-02-22 12:04:30.764385931 -0800
|
||||
@@ -57,7 +57,7 @@
|
||||
%{shared:-lc} \
|
||||
%{!shared:%{profile:-lc_p}%{!profile:-lc}}"
|
||||
|
||||
-#define LIBGCC_SPEC "%{mfloat-abi=soft*:-lfloat} -lgcc"
|
||||
+#define LIBGCC_SPEC "-lgcc"
|
||||
|
||||
#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux.so.2"
|
||||
|
||||
Index: trunk/libgcc/config/arm/t-linux
|
||||
===================================================================
|
||||
--- trunk.orig/libgcc/config/arm/t-linux 2012-02-22 12:11:48.372407121 -0800
|
||||
+++ trunk/libgcc/config/arm/t-linux 2012-02-22 12:13:19.868411588 -0800
|
||||
@@ -1,6 +1,8 @@
|
||||
LIB1ASMSRC = arm/lib1funcs.S
|
||||
LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx _clzsi2 _clzdi2 \
|
||||
- _arm_addsubdf3 _arm_addsubsf3
|
||||
+ _negdf2 _addsubdf3 _muldivdf3 _cmpdf2 _unorddf2 _fixdfsi _fixunsdfsi \
|
||||
+ _truncdfsf2 _negsf2 _addsubsf3 _muldivsf3 _cmpsf2 _unordsf2 \
|
||||
+ _fixsfsi _fixunssfsi _floatdidf _floatundidf _floatdisf _floatundisf
|
||||
|
||||
# Just for these, we omit the frame pointer since it makes such a big
|
||||
# difference.
|
||||
|
|
@ -19,12 +19,11 @@ EXTRA_OECONF = "--with-newlib \
|
|||
${OPTSPACE} \
|
||||
--program-prefix=${TARGET_PREFIX} \
|
||||
--with-sysroot=${STAGING_DIR_TARGET} \
|
||||
--with-build-sysroot=${GCCCROSS_BUILDSYSROOT} \
|
||||
--with-build-sysroot=${STAGING_DIR_TARGET} \
|
||||
${EXTRA_OECONF_INITIAL} \
|
||||
${@base_contains('DISTRO_FEATURES', 'ld-is-gold', '--with-ld=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}ld.bfd', '', d)} \
|
||||
${EXTRA_OECONF_FPU}"
|
||||
|
||||
|
||||
GCCCROSS_BUILDSYSROOT = "${B}/tmpsysroot"
|
||||
|
||||
do_configure_prepend () {
|
||||
|
|
@ -39,13 +38,42 @@ do_configure_prepend () {
|
|||
do_compile () {
|
||||
oe_runmake all-gcc all-target-libgcc
|
||||
}
|
||||
# fixed limits.h infact includes the so called real limits.h
|
||||
# which should come from libc but when we build libc-initial
|
||||
# then bunch of configure tests include fixed limits.h which in turn
|
||||
# includes real limits.h but this real limits.h is not staged yet
|
||||
# so we overwirte the generated include-fixed/limits.h for gcc-cross-initial
|
||||
# to get rid references to real limits.h
|
||||
do_install () {
|
||||
oe_runmake 'DESTDIR=${D}' install-gcc install-target-libgcc
|
||||
|
||||
do_install_append () {
|
||||
cp gcc/include-fixed/limits.h ${D}${gcclibdir}/${TARGET_SYS}/${BINV}/include-fixed/limits.h
|
||||
# We don't really need this (here shares/ contains man/, info/, locale/).
|
||||
rm -rf ${D}${datadir}/
|
||||
|
||||
# We use libiberty from binutils
|
||||
find ${D}${exec_prefix}/lib -name libiberty.a | xargs rm -f
|
||||
find ${D}${exec_prefix}/lib -name libiberty.h | xargs rm -f
|
||||
|
||||
# Insert symlinks into libexec so when tools without a prefix are searched for, the correct ones are
|
||||
# found. These need to be relative paths so they work in different locations.
|
||||
dest=${D}${libexecdir}/gcc/${TARGET_SYS}/${BINV}/
|
||||
install -d $dest
|
||||
for t in ar as ld nm objcopy objdump ranlib strip g77 gcc cpp gfortran; do
|
||||
ln -sf ${BINRELPATH}/${TARGET_PREFIX}$t $dest$t
|
||||
done
|
||||
# fixed limits.h infact includes the so called real limits.h
|
||||
# which should come from libc but when we build libc-initial
|
||||
# then bunch of configure tests include fixed limits.h which in turn
|
||||
# includes real limits.h but this real limits.h is not staged yet
|
||||
# so we overwirte the generated include-fixed/limits.h for gcc-cross-initial
|
||||
# to get rid references to real limits.h
|
||||
cp gcc/include-fixed/limits.h ${D}${gcclibdir}/${TARGET_SYS}/${BINV}/include-fixed/limits.h
|
||||
}
|
||||
#
|
||||
# Override the default sysroot staging copy since this won't look like a target system
|
||||
#
|
||||
sysroot_stage_all() {
|
||||
sysroot_stage_dir ${D} ${SYSROOT_DESTDIR}
|
||||
install -d ${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}${target_base_libdir}/
|
||||
install -d ${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}${target_libdir}/
|
||||
mv ${SYSROOT_DESTDIR}${target_base_libdir}/* ${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}${target_base_libdir}/ || true
|
||||
mv ${SYSROOT_DESTDIR}${target_libdir}/* ${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}${target_libdir}/ || true
|
||||
}
|
||||
|
||||
do_populate_sysroot[sstate-inputdirs] = "${SYSROOT_DESTDIR}/${STAGING_DIR_HOST} ${SYSROOT_DESTDIR}/${STAGING_DIR_TARGET}/${target_base_libdir}"
|
||||
do_populate_sysroot[sstate-outputdirs] = "${STAGING_DIR_HOST} ${STAGING_DIR_TCBOOTSTRAP}/${target_base_libdir}"
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue