source: scripts/scripts/cross-scripts/cross-gcc-final.sh @ ad31873f

clfs-1.2clfs-2.1clfs-3.0.0-systemdclfs-3.0.0-sysvinitsystemdsysvinit
Last change on this file since ad31873f was ad31873f, checked in by Jim Gifford <clfs@…>, 18 years ago

r2539@server (orig r1260): ryan | 2006-03-10 06:07:41 -0800

r1336@rei: lfs | 2006-03-11 01:06:05 +1100
Add GCC PR20425 fixes to 4.1.0 release.
This fixes a multitude of sins, most noticably with libtool on multilib systems.
Iterative path searches the gcc driver performs should now search multilib directories first.


Submitted By: Ryan Oliver <ryan at pha dot com dot au>
Date: 2006-03-10
Initial Package Version: 4.1.0
Origin: GCC SVN Revision 108635 (diffed against 4.1.0 release)
Upstream Status: In GCC trunk
Description: Fix for PR20425


From http://gcc.gnu.org/ml/gcc-patches/2005-12/msg00818.html
---------------------------------8<------------------------------------
This gives the gcc driver a new path iteration function, for_each_path,
and uses it everywhere, making path iteration a little more consistent.
for_each_path uses the same path ordering as the existing find_file
function. I've also tweaked some of the existing find_a_file calls for
consistency, and uncovered and fixed some other bugs..


Functional changes are:


o %D library paths are printed in the same order as gcc uses elsewhere

when searching library directories, ie. all multilib paths are first.
http://gcc.gnu.org/ml/gcc-patches/2005-03/msg02044.html effectively
reverted by the rewrite because I believe the same speedup is gained
by searching the right dirs first.


o gcc -print-search-dirs prints library multilib paths followed by

non-multilib paths where before we just printed non-multilib paths.


o LIBRARY_PATH_ENV similarly includes multilib directories.


o All searches of startfile_prefixes now look in multilib dirs first

followed by non-multilib dirs. This changes the dirs we search for
spec files, and %include and %include_noerr in specs. Previously
we only searched the non-multilib dirs for specs files. I think this
change is worthwhile just for consistency, and the extension is
reasonable. For instance, it would allow different spec files to be
used for gcc -m64 vs. gcc -m32. However, if others think this wrong,
I won't argue. Consistency isn't everything.


o Some attempt made to prevent searching of duplicate paths. The old

find_file would search some paths twice (when multilib_dir was NULL
but multilib_os_dir non-NULL). We still search twice in some cases,
eg. /usr/lib/../lib and /usr/lib are considered different paths.


o find_a_file with last param (do_multi) true now searches both

multilib and non-multilib paths. Before, do_multi (well, the old
param name was multilib) meant just search multilib paths. This
isn't a user-visible change as the only place where find_a_file was
invoked with the last param true was from find_file, where we
immediately followed with a non-multilib find_a_file.


o Memory leaks fixed in is_directory.


o LIBRARY_PATH_ENV and COMPILER_PATH now only have existing

directories, making LIBRARY_PATH_ENV closer to %D paths. The
following lines (which I remove) in is_directory meant that
is_directory didn't do much for LIBRARY_PATH_ENV, except on
SMALL_ARG_MAX machines.


4278 ian #ifndef SMALL_ARG_MAX
4278 ian if (! linker)
4278 ian return 1;
4278 ian #endif


I'll also remove mention of SMALL_ARG_MAX in config and doc files
when I commit this change as this is the only place it is used.


o gcc -Bnon-dir-prefix- now works properly. The previously mentioned

is_directory peculiarity affected the following code.


43664 nickc /* Catch the case where the user has forgotten to append a
46063 jsm28 directory separator to the path. Note, they may be using
43664 nickc -B to add an executable name prefix, eg "i386-elf-", in
43664 nickc order to distinguish between multiple installations of
43664 nickc GCC in the same directory. Hence we must check to see
43664 nickc if appending a directory separator actually makes a
43664 nickc valid directory name. */
43664 nickc if (! IS_DIR_SEPARATOR (value [len - 1])
43664 nickc && is_directory (value, "", 0))
43664 nickc {
43767 ghazi char *tmp = xmalloc (len + 2);
43767 ghazi strcpy (tmp, value);
43767 ghazi tmp[len] = DIR_SEPARATOR;
43767 ghazi tmp[++ len] = 0;
43767 ghazi value = tmp;
43664 nickc }


Bootstrapped and regression tested powerpc64-linux and powerpc-linux on
a previous iteration of this patch missing is_directory fixes.
Currently running tests on this patch.



  • Property mode set to 100755
File size: 5.3 KB
Line 
1#!/bin/bash
2
3# cross-lfs cross-gcc final build
4# -------------------------------
5# $LastChangedBy$
6# $LastChangedDate$
7# $LastChangedRevision$
8# $HeadURL$
9#
10### GCC ( shared ) ###
11
12cd ${SRC}
13
14LOG="gcc-cross-final.log"
15
16# we cannot assume what the default env for the the host system is,
17# so we just set libdirname to "lib"
18libdirname="lib"
19
20#set_libdirname
21#setup_multiarch
22#
23#if [ ! "${libdirname}" = "lib" ]; then
24#   extra_conf="--libdir=${HST_TOOLS}/${libdirname}"
25#fi
26
27if [ "Y" = "${MULTIARCH}" ]; then
28   vendor_os=`echo ${TARGET} | sed 's@\([^-]*\)-\(.*\)@\2@'`
29   case ${TGT_ARCH} in
30      x86_64 )
31      ;;
32      sparc* )
33         TARGET=sparc64-${vendor_os}
34      ;;
35      powerpc* | ppc* )
36         TARGET=powerpc64-${vendor_os}
37      ;;
38      s390* )
39         TARGET=s390x-${vendor_os}
40      ;;
41      mips*el* )
42         TARGET=mips64el-${vendor_os}
43      ;;
44      * )
45         # TODO: add some error messages etc
46         barf
47      ;;
48   esac
49
50else
51   # If we are not multi-arch, disable multilib
52   extra_conf="${extra_conf} --enable-multilib=no"
53
54   # HACK: this sets abi to n32 with mips... this should be handled
55   # by the multiarch funcs somehow... and set according to DEFAULTENV
56   case ${TGT_ARCH} in
57      mips* )
58         extra_conf="${extra_conf} --with-abi=${DEFAULTENV}"
59      ;;
60   esac
61fi
62
63# if target is same as build host, adjust host slightly to
64# trick configure so we do not produce native tools
65if [ "${TARGET}" = "${BUILD}" ]; then
66   althost=`echo ${BUILD} | sed 's@\([_a-zA-Z0-9]*\)\(-[_a-zA-Z0-9]*\)\(.*\)@\1\2x\3@'`
67   extra_conf="--host=${althost} ${extra_conf}"
68fi
69
70# if target has no floating point unit, use soft float
71if [ "${WITHOUT_FPU}" = "Y" ]; then
72   extra_conf="${extra_conf} --with-float=soft"
73fi
74
75unpack_tarball gcc-${GCC_VER}
76
77#3.0 20030427
78# Cannot trust ${GCC_VER} to supply us with the correct
79# gcc version (especially if cvs).
80# Grab it straight from version.c
81cd ${SRC}/${PKGDIR}
82target_gcc_ver=`grep version_string gcc/version.c | \
83                sed 's@.* = \(\|"\)\([0-9.]*\).*@\2@g'`
84# As of gcc4, the above doesn't cut it... check gcc/BASE-VER
85if [ -z "${target_gcc_ver}" -a -f gcc/BASE-VER ]; then
86   target_gcc_ver=`cat gcc/BASE-VER`
87fi
88
89# Apply linkonce patch for gcc (should be fixed come gcc 3.4.4)
90cd ${SRC}/${PKGDIR}
91case ${target_gcc_ver} in
92   3.4.3 )
93      apply_patch gcc-3.4.3-linkonce-1
94      apply_patch gcc-3.4.0-arm-bigendian
95      apply_patch gcc-3.4.0-arm-nolibfloat
96      apply_patch gcc-3.4.0-arm-lib1asm
97      apply_patch gcc-3.4.3-clean_exec_and_lib_search_paths_when_cross-1
98   ;;
99   4.0.0 )
100      apply_patch gcc-4.0.0-fix_tree_optimisation_PR21173
101      apply_patch gcc-4.0.0-reload_check_uninitialized_pseudos_PR20973
102      apply_patch gcc-4.0.0-clean_exec_and_lib_search_paths_when_cross-1
103   ;;
104   4.1.0 )
105      apply_patch gcc-4.0.0-clean_exec_and_lib_search_paths_when_cross-1
106      apply_patch gcc-4.1.0-fix_PR20425
107   ;;
108   4.0.* | 4.1.* )
109      apply_patch gcc-4.0.0-clean_exec_and_lib_search_paths_when_cross-1
110   ;;
111esac
112
113# if we are using gcc-3.4x, set libexecdir to */${libdirname}
114case ${target_gcc_ver} in
115   3.4* | 4.* )
116      extra_conf="${extra_conf} --libexecdir=${HST_TOOLS}/${libdirname}"
117   ;;
118esac
119
120if [ "${USE_SYSROOT}" = "Y" ]; then
121   extra_conf="${extra_conf} --with-sysroot=${LFS}"
122else
123   # LFS style build
124   #----------------
125
126   # source functions for required gcc modifications
127   . ${SCRIPTS}/funcs/cross_gcc-funcs.sh
128
129   # Alter the generated specs file to
130   #  o set dynamic linker to be under ${TGT_TOOLS}/lib{,32,64}
131   #  o set startfile_prefix_spec so we search for startfiles
132   #    under ${TGT_TOOLS}/lib/lib{,32,64}
133   gcc_specs_mod
134
135   # Set cpp's default include search path, and the header search path
136   # used by fixincludes to be ${TGT_TOOLS}/include
137   cpp_set_cross_system_header_dir
138
139   # fix configure so that shared libgcc gets built against the correct
140   # startfiles if the user sets ${TGT_TOOLS} = ${HOST_TOOLS}/${TARGET}
141   configure_fix_flags_for_target
142fi
143
144test -d ${SRC}/gcc-${GCC_VER}-cross-final &&
145   rm -rf ${SRC}/gcc-${GCC_VER}-cross-final
146
147mkdir -p ${SRC}/gcc-${GCC_VER}-cross-final &&
148cd ${SRC}/gcc-${GCC_VER}-cross-final &&
149
150# NOTE:
151# Some errors occur on solaris where bash syntax is used with a
152# standard /bin/sh ( ie: expecting $(command) to be evaluated )
153# To avoid this issue we override make's default shell with
154# /bin/bash
155# This is done via passing CONFIG_SHELL=/bin/bash to
156# configure, which uses this when it specifies SHELL in
157# the Makefiles.
158
159max_log_init Gcc ${GCC_VER} cross-pt2 ${CONFLOGS} ${LOG}
160#CONFIG_SHELL=/bin/bash \
161CFLAGS="-O2 ${HOST_CFLAGS} -pipe" \
162../${PKGDIR}/configure --prefix=${HST_TOOLS} \
163   --target=${TARGET} ${extra_conf} --with-local-prefix=${TGT_TOOLS} \
164   --enable-languages=c,c++ --enable-__cxa_atexit \
165   --enable-c99 --enable-long-long --enable-threads=posix \
166   --disable-nls --enable-shared \
167   >> ${LOGFILE} 2>&1 &&
168echo " o Configure OK" || barf
169#   --enable-languages=c,c++,f77,objc,ada,java,pascal,treelang --enable-__cxa_atexit \
170
171min_log_init ${BUILDLOGS} &&
172#make ${PMFLAGS} BOOT_CFLAGS="-O2 ${HOST_CFLAGS} -pipe" \
173#   STAGE1_CFLAGS="-O2 ${HOST_CFLAGS} -pipe" all \
174make ${PMFLAGS} \
175   CFLAGS_FOR_TARGET="-O2 -pipe ${TGT_CFLAGS}" \
176   CXXFLAGS_FOR_TARGET="-O2 -pipe ${TGT_CFLAGS}" \
177   >> ${LOGFILE} 2>&1 &&
178echo " o Build OK" || barf
179
180min_log_init ${INSTLOGS} &&
181make install \
182   >> ${LOGFILE} 2>&1 &&
183echo " o Install OK" || barf
184
Note: See TracBrowser for help on using the repository browser.