X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Fmklibgcc.in;h=72c6c2269865d46154a2b8e4ced20469824813bf;hb=3da6dfd92b854203218cd1e8f7cc78bd4f4650ba;hp=70fc55aa53c2611481e53b63bc945e051b3bb1ae;hpb=df4b504cae7856b864a073ab9e6e61cf2ad23a97;p=pf3gnuchains%2Fgcc-fork.git diff --git a/gcc/mklibgcc.in b/gcc/mklibgcc.in index 70fc55aa53c..72c6c226986 100644 --- a/gcc/mklibgcc.in +++ b/gcc/mklibgcc.in @@ -1,26 +1,27 @@ #!/bin/sh # Construct makefile for libgcc. -# Copyright (C) 2000 Free Software Foundation, Inc. +# Copyright (C) 2000, 2002, 2003 Free Software Foundation, Inc. # -# This file is part of GNU CC. +# This file is part of GCC. # Arguments, taken from the environment, since there are a lot # of them, and positional args becomes quite ugly. # # objext -# OLDCC -# LIBGCC1 -# LIB1FUNCS # LIB1ASMFUNCS -# LIB1FUNCS_EXTRA -# LIB2FUNCS +# LIB2FUNCS_ST +# LIBGCOV # LIB2ADD +# LIB2ADD_ST # LIB2ADDEH # LIB2ADDEHDEP # FPBIT # FPBIT_FUNCS +# LIB2_DIVMOD_FUNCS # DPBIT # DPBIT_FUNCS +# TPBIT +# TPBIT_FUNCS # LIBGCC # MULTILIBS # EXTRA_MULTILIB_PARTS @@ -28,9 +29,11 @@ # SHLIB_LINK # SHLIB_MULTILIB # SHLIB_MKMAP +# SHLIB_MKMAP_OPTS # SHLIB_MAPFILES # SHLIB_NM_FLAGS # SHLIB_INSTALL +# MULTILIB_OSDIRNAMES # Make needs VPATH to be literal. echo 'srcdir = @srcdir@' @@ -40,22 +43,15 @@ echo echo 'force:' echo -# Detect gcc as OLDCC. This indicates a target for which LIB1FUNCS -# is not needed. This is not quite the same as libgcc1.null, even -# on a target not using libgcc1-asm.a. - -if [ "@build_canonical@" = "@target@" ]; then - tmp="tmp-$$.c" - cat > $tmp < /dev/null 2>&1; then - LIB1FUNCS="" - fi - rm -f $tmp -fi +# Library members defined in libgcc2.c. +lib2funcs='_muldi3 _negdi2 _lshrdi3 _ashldi3 _ashrdi3 + _cmpdi2 _ucmpdi2 _floatdidf _floatdisf _fixunsdfsi _fixunssfsi + _fixunsdfdi _fixdfdi _fixunssfdi _fixsfdi _fixxfdi _fixunsxfdi + _floatdixf _fixunsxfsi _fixtfdi _fixunstfdi _floatditf _clear_cache + _trampoline __main _absvsi2 _absvdi2 _addvsi3 _addvdi3 + _subvsi3 _subvdi3 _mulvsi3 _mulvdi3 _negvsi2 _negvdi2 _ctors + _ffssi2 _ffsdi2 _clz _clzsi2 _clzdi2 _ctzsi2 _ctzdi2 _popcount_tab + _popcountsi2 _popcountdi2 _paritysi2 _paritydi2' # Disable SHLIB_LINK if shared libgcc not enabled. if [ "@enable_shared@" = "no" ]; then @@ -65,24 +61,23 @@ fi # Build lines. gcc_compile='$(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) $(INCLUDES)' -oldcc_compile='$(OLDCC) -DIN_LIBGCC1 $(CCLIBFLAGS) $(INCLUDES)' make_compile='$(MAKE) GCC_FOR_TARGET="$(GCC_FOR_TARGET)" \ AR_FOR_TARGET="$(AR_FOR_TARGET)" \ AR_CREATE_FOR_TARGET="$(AR_CREATE_FOR_TARGET)" \ AR_EXTRACT_FOR_TARGET="$(AR_EXTRACT_FOR_TARGET)" \ AR_FLAGS_FOR_TARGET="$(AR_FLAGS_FOR_TARGET)" \ CC="$(CC)" CFLAGS="$(CFLAGS)" \ - HOST_PREFIX="$(HOST_PREFIX)" \ - HOST_PREFIX_1="$(HOST_PREFIX_1)" \ + BUILD_PREFIX="$(BUILD_PREFIX)" \ + BUILD_PREFIX_1="$(BUILD_PREFIX_1)" \ LANGUAGES="$(LANGUAGES)"' -# Dependancies for libgcc1.c -libgcc1_c_dep='stmp-dirs $(srcdir)/libgcc1.c $(CONFIG_H)' +# Dependencies for libgcc2.c +libgcc2_c_dep='stmp-dirs $(srcdir)/libgcc2.c $(CONFIG_H) coretypes.h $(TM_H) $(MACHMODE_H) longlong.h gbl-ctors.h config.status stmp-int-hdrs tsystem.h'" $LIB2ADDEHDEP" -# Dependancies for libgcc2.c -libgcc2_c_dep='stmp-dirs $(srcdir)/libgcc2.c $(CONFIG_H) $(MACHMODE_H) longlong.h gbl-ctors.h config.status stmp-int-hdrs tsystem.h'" $LIB2ADDEHDEP" +# Dependencies for libgcov.c +libgcov_c_dep='stmp-dirs $(srcdir)/libgcov.c $(CONFIG_H) coretypes.h $(TM_H) $(MACHMODE_H) longlong.h gbl-ctors.h config.status stmp-int-hdrs tsystem.h $(srcdir)/gcov-io.h $(srcdir)/gcov-io.c gcov-iov.h' -# Dependancies for fp-bit.c +# Dependencies for fp-bit.c fpbit_c_dep='stmp-dirs config.status tsystem.h' # @@ -91,84 +86,50 @@ fpbit_c_dep='stmp-dirs config.status tsystem.h' libgcc1_objs="" -case X"$LIBGCC1" in - Xlibgcc1.null | X) - ;; - - Xlibgcc1.cross) - echo "You must find a way to make libgcc1 components yourself" 1>&2 - ;; - - Xlibgcc1-asm.a) - for name in $LIB1ASMFUNCS; do - for ml in $MULTILIBS; do - dir=`echo ${ml} | sed -e 's/;.*$//' -e 's/=/$(EQ)/g'` - flags=`echo ${ml} | sed -e 's/^[^;]*;//' -e 's/@/ -/g'`; - out="libgcc/${dir}/${name}${objext}" +for name in $LIB1ASMFUNCS; do + for ml in $MULTILIBS; do + dir=`echo ${ml} | sed -e 's/;.*$//' -e 's/=/$(EQ)/g'` + flags=`echo ${ml} | sed -e 's/^[^;]*;//' -e 's/@/ -/g'`; + out="libgcc/${dir}/${name}${objext}" - echo ${out}: stmp-dirs '$(srcdir)/config/$(LIB1ASMSRC)' - echo " $gcc_compile" $flags -DL$name -xassembler-with-cpp \ + echo ${out}: stmp-dirs '$(srcdir)/config/$(LIB1ASMSRC)' + echo " $gcc_compile" $flags -DL$name -xassembler-with-cpp \ -c '$(srcdir)/config/$(LIB1ASMSRC)' -o $out - # Remove any objects from LIB2FUNCS that are defined as optimized - # assembly code in LIB1ASMFUNCS. - LIB2FUNCS=`echo $LIB2FUNCS | sed -e 's/^'$name' //' \ - -e 's/ '$name' / /' \ - -e 's/ '$name'$//'` - done - libgcc1_objs="$libgcc1_objs ${name}${objext}" - done - ;; - - Xlibgcc1.a) - for name in $LIB1FUNCS; do - out="libgcc/${name}${objext}" - - echo $out: $libgcc1_c_dep - if [ -z "@NO_MINUS_C_MINUS_O@" ]; then - echo " $oldcc_compile" -DL$name $flags -c '$(srcdir)/libgcc1.c' -o $out - else - echo " $oldcc_compile" -DL$name $flags -c '$(srcdir)/libgcc1.c' - echo " mv libgcc1${objext} $out" - fi - - libgcc1_objs="$libgcc1_objs ${name}${objext}" - done - - for file in $LIB1FUNCS_EXTRA; do - name=`echo $file | sed -e 's/[.][cS]$//' -e 's/[.]asm$//'` - out="libgcc/${name}${objext}" - - echo $out: $file - if [ ${name}.asm = $file ]; then - echo " cp $file ${name}.s" - file=${name}.s - fi - - if [ -z "@NO_MINUS_C_MINUS_O@" ]; then - echo " $oldcc_compile" -c $file -o $out - else - echo " $oldcc_compile" -c $file - tmp=`echo $file | sed -e 's/[.][cs]$/'${objext}/ -e 's,.*/,,'` - echo " mv $tmp $out" - fi - - libgcc1_objs="$libgcc1_objs ${name}${objext}" - done - ;; - *) - echo "I'm confused about libgcc1." 1>&2 - exit 1 - ;; -esac + # Remove any objects from lib2funcs and LIB2_DIVMOD_FUNCS that are + # defined as optimized assembly code in LIB1ASMFUNCS. + lib2funcs=`echo $lib2funcs | sed -e 's/^'$name' //' \ + -e 's/ '$name' / /' \ + -e 's/ '$name'$//'` + LIB2_DIVMOD_FUNCS=`echo $LIB2_DIVMOD_FUNCS | sed -e 's/^'$name' //' \ + -e 's/ '$name' / /' \ + -e 's/ '$name'$//'` + done + libgcc1_objs="$libgcc1_objs ${name}${objext}" +done # # Build libgcc2 components. # libgcc2_objs="" +libgcc2_st_objs="" +libgcc2_eh_objs="" + +for name in $lib2funcs; do + for ml in $MULTILIBS; do + dir=`echo ${ml} | sed -e 's/;.*$//' -e 's/=/$(EQ)/g'` + flags=`echo ${ml} | sed -e 's/^[^;]*;//' -e 's/@/ -/g'`; + out="libgcc/${dir}/${name}${objext}" -for name in $LIB2FUNCS; do + echo $out: $libgcc2_c_dep + echo " $gcc_compile" '$(MAYBE_USE_COLLECT2)' $flags -DL$name \ + -c '$(srcdir)/libgcc2.c' -o $out + done + libgcc2_objs="$libgcc2_objs ${name}${objext}" +done + +for name in $LIB2FUNCS_ST; do for ml in $MULTILIBS; do dir=`echo ${ml} | sed -e 's/;.*$//' -e 's/=/$(EQ)/g'` flags=`echo ${ml} | sed -e 's/^[^;]*;//' -e 's/@/ -/g'`; @@ -178,6 +139,19 @@ for name in $LIB2FUNCS; do echo " $gcc_compile" '$(MAYBE_USE_COLLECT2)' $flags -DL$name \ -c '$(srcdir)/libgcc2.c' -o $out done + libgcc2_st_objs="$libgcc2_st_objs ${name}${objext}" +done + +for name in $LIB2_DIVMOD_FUNCS; do + for ml in $MULTILIBS; do + dir=`echo ${ml} | sed -e 's/;.*$//' -e 's/=/$(EQ)/g'` + flags=`echo ${ml} | sed -e 's/^[^;]*;//' -e 's/@/ -/g'`; + out="libgcc/${dir}/${name}${objext}" + + echo $out: $libgcc2_c_dep + echo " $gcc_compile" '$(MAYBE_USE_COLLECT2)' $flags -DL$name \ + -c '$(srcdir)/libgcc2.c' -fexceptions -fnon-call-exceptions -o $out + done libgcc2_objs="$libgcc2_objs ${name}${objext}" done @@ -211,6 +185,21 @@ if [ "$DPBIT" ]; then done fi +if [ "$TPBIT" ]; then + for name in $TPBIT_FUNCS; do + for ml in $MULTILIBS; do + dir=`echo ${ml} | sed -e 's/;.*$//' -e 's/=/$(EQ)/g'` + flags=`echo ${ml} | sed -e 's/^[^;]*;//' -e 's/@/ -/g'`; + out="libgcc/${dir}/${name}${objext}" + + echo $out: $TPBIT $fpbit_c_dep + echo " $gcc_compile" -DFINE_GRAINED_LIBRARIES $flags -DL$name \ + -c $TPBIT -o $out + done + libgcc2_objs="$libgcc2_objs ${name}${objext}" + done +fi + for file in $LIB2ADD; do name=`echo $file | sed -e 's/[.][cSo]$//' -e 's/[.]asm$//' -e 's/[.]txt$//'` oname=`echo $name | sed -e 's,.*/,,'` @@ -244,34 +233,98 @@ for file in $LIB2ADDEH; do echo $out: stmp-dirs $file echo " $gcc_compile" $flags -fexceptions -c $file -o $out done - libgcc2_objs="$libgcc2_objs ${oname}${objext}" + if [ "$SHLIB_LINK" ]; then + libgcc2_eh_objs="$libgcc2_eh_objs ${oname}${objext}" + else + libgcc2_objs="$libgcc2_objs ${oname}${objext}" + fi +done + +for file in $LIB2ADD_ST; do + name=`echo $file | sed -e 's/[.][cSo]$//' -e 's/[.]asm$//' -e 's/[.]txt$//'` + oname=`echo $name | sed -e 's,.*/,,'` + + for ml in $MULTILIBS; do + dir=`echo ${ml} | sed -e 's/;.*$//' -e 's/=/$(EQ)/g'` + flags=`echo ${ml} | sed -e 's/^[^;]*;//' -e 's/@/ -/g'`; + out="libgcc/${dir}/${oname}${objext}" + if [ ${name}.asm = ${file} ]; then + flags="$flags -xassembler-with-cpp" + fi + + echo $out: stmp-dirs $file + echo " $gcc_compile" $flags -c $file -o $out + done + libgcc2_st_objs="$libgcc2_st_objs ${oname}${objext}" +done + +# +# build libgcov components +# + +libgcov_objs="" + +for name in $LIBGCOV; do + for ml in $MULTILIBS; do + dir=`echo ${ml} | sed -e 's/;.*$//' -e 's/=/$(EQ)/g'` + flags=`echo ${ml} | sed -e 's/^[^;]*;//' -e 's/@/ -/g'`; + out="libgcc/${dir}/${name}${objext}" + + echo $out: $libgcov_c_dep + echo " $gcc_compile" '$(MAYBE_USE_COLLECT2)' $flags -DL$name \ + -c '$(srcdir)/libgcov.c' -o $out + done + libgcov_objs="$libgcov_objs ${name}${objext}" done # SHLIB_MKMAP +# SHLIB_MKMAP_OPTS # SHLIB_MAPFILES for ml in $MULTILIBS; do dir=`echo ${ml} | sed -e 's/;.*$//' -e 's/=/$(EQ)/g'` flags=`echo ${ml} | sed -e 's/^[^;]*;//' -e 's/@/ -/g'`; libgcc_objs="" + libgcc_eh_objs="" for o in $libgcc1_objs; do - if [ "$LIBGCC1" = libgcc1-asm.a ]; then - libgcc_objs="$libgcc_objs libgcc/${dir}/$o" - else - libgcc_objs="$libgcc_objs libgcc/$o" - fi + libgcc_objs="$libgcc_objs libgcc/${dir}/$o" done for o in $libgcc2_objs; do libgcc_objs="$libgcc_objs libgcc/${dir}/$o" done - shlib_deps="$libgcc_objs" + for o in $libgcc2_eh_objs; do + libgcc_eh_objs="$libgcc_eh_objs libgcc/${dir}/$o" + done + libgcc_sh_objs="$libgcc_objs $libgcc_eh_objs" + shlib_deps="$libgcc_sh_objs" - if [ "$SHLIB_LINK" -a "$SHLIB_MKMAP" -a -z "$mapfile" ]; then - mapfile="libgcc.map" - echo "" - echo "${mapfile}: $SHLIB_MKMAP $SHLIB_MAPFILES $libgcc_objs" - echo ' { $(NM_FOR_TARGET)'" $SHLIB_NM_FLAGS $libgcc_objs; echo %%; cat $SHLIB_MAPFILES; } | "'$(AWK)'" -f $SHLIB_MKMAP > "'tmp-$@' - echo ' mv tmp-$@ $@' + libgcc_st_objs="" + for o in $libgcc2_st_objs; do + libgcc_st_objs="$libgcc_st_objs libgcc/${dir}/$o" + done + + libgcov_a_objs="" + for o in $libgcov_objs; do + libgcov_a_objs="$libgcov_a_objs libgcc/${dir}/$o" + done + + if [ "$SHLIB_LINK" -a "$SHLIB_MKMAP" ]; then + mapfile="libgcc/${dir}/libgcc.map" + tmpmapfile="libgcc/${dir}/tmp-libgcc.map" + # This uses a here document instead of echos because some shells + # will convert the \1 in the second sed command to a control-A. + # The behavior of here documents is more predictable. + cat < ${tmpmapfile} + mv '$tmpmapfile' \$@ +EOF fi shlib_deps="$shlib_deps $mapfile" @@ -281,29 +334,90 @@ for ml in $MULTILIBS; do shlib_deps="$shlib_deps $dir/$f" done + libgcc_a_objs="$libgcc_objs $libgcc_st_objs" + + if [ "@libgcc_visibility@" = yes -a "$SHLIB_LINK" ]; then + libgcc_a_objs= + echo "" + echo "libgcc/${dir}/stacknote.s: stmp-dirs" + echo ' @( echo | $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) '${flags}' -S -o - -xc - | grep .note.GNU-stack || : ) > $@.tmp' + echo ' @mv -f $@.tmp $@' + echo "" + for o in $libgcc_objs $libgcc_st_objs; do + # .oS objects will have all non-local symbol definitions .hidden + oS=`echo ${o} | sed s~${objext}'$~.oS~g'` + echo "${oS}: stmp-dirs libgcc/${dir}/stacknote.s ${o}" + # non-GNU nm emits three fields even for undefined and typeless symbols, + # so explicitly omit them + echo ' ( $(NM_FOR_TARGET) '${SHLIB_NM_FLAGS} ${o}' | $(AWK) '\''NF == 3 && $$2 !~ /^[UN]$$/ { print "\t.hidden", $$3 }'\''; cat libgcc/${dir}/stacknote.s ) | $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) '${flags}' -r -nostdinc -nostdlib -o $@ '${o}' -xassembler -' + libgcc_a_objs="${libgcc_a_objs} ${oS}" + done + fi + + # Each of these .a files depends on stmp-dirs. It would seem that + # this dependency is redundant, since each of the object files + # itself depends on stmp-dirs. However, it is possible that there + # are in fact no object files. In that case, the stmp-dirs + # dependency is required; the directory containing the archive must + # exist before the archive itself can be created. echo "" - echo "${dir}/libgcc.a: $libgcc_objs" + echo "${dir}/libgcc.a: stmp-dirs $libgcc_a_objs" echo " -rm -rf ${dir}/libgcc.a" - echo ' $(AR_CREATE_FOR_TARGET)' ${dir}/libgcc.a $libgcc_objs - echo ' if $(RANLIB_TEST_FOR_TARGET) ; then' \\ - echo ' $(RANLIB_FOR_TARGET)' ${dir}/libgcc.a ';' \\ - echo ' else true; fi;' + echo ' $(AR_CREATE_FOR_TARGET)' ${dir}/libgcc.a $libgcc_a_objs + echo ' $(RANLIB_FOR_TARGET)' ${dir}/libgcc.a + + echo "" + echo "${dir}/libgcov.a: stmp-dirs $libgcov_a_objs" + echo " -rm -rf ${dir}/libgcov.a" + echo ' $(AR_CREATE_FOR_TARGET)' ${dir}/libgcov.a $libgcov_a_objs + echo ' $(RANLIB_FOR_TARGET)' ${dir}/libgcov.a if [ "$SHLIB_LINK" ]; then + + echo "" + echo "${dir}/libgcc_eh.a: stmp-dirs $libgcc_eh_objs" + echo " -rm -rf ${dir}/libgcc_eh.a" + echo ' $(AR_CREATE_FOR_TARGET)' ${dir}/libgcc_eh.a $libgcc_eh_objs + echo ' $(RANLIB_FOR_TARGET)' ${dir}/libgcc_eh.a + if [ -z "$SHLIB_MULTILIB" ]; then - if [ "$dir" = "." ]; then - shlib_base_name="libgcc_s"; + if [ "$dir" = . ]; then + shlib_base_name=libgcc_s else shlib_base_name=libgcc_s_`echo $dir | sed s,/,_,g` fi + shlib_so_name="$shlib_base_name" + shlib_dir= + shlib_slibdir_qual= + if [ -n "$MULTILIB_OSDIRNAMES" ]; then + if [ "$dir" != . ]; then + gcc_multilib_dir=`./xgcc -B./ $flags --print-multi-directory` + os_multilib_dir=`./xgcc -B./ $flags --print-multi-os-directory` + shlib_dir="$dir"/ + gcc_multilib_sup=`echo $gcc_multilib_dir | sed 's~^[^/]*/~~'` + os_multilib_base=`echo $os_multilib_dir | sed -n "s~/${gcc_multilib_sup}\$~~p"` + if [ -z "$os_multilib_base" ]; then + shlib_so_name=libgcc_s + if [ "$os_multilib_dir" != "." ]; then + shlib_slibdir_qual="/$os_multilib_dir" + fi + else + shlib_so_name=libgcc_s_`echo $gcc_multilib_sup | sed s,/,_,g` + shlib_slibdir_qual="/$os_multilib_base" + fi + fi + fi echo "" echo "${dir}/${shlib_base_name}${SHLIB_EXT}: $shlib_deps" echo " $SHLIB_LINK" \ | sed -e "s%@multilib_flags@%$flags%g" \ -e "s%@multilib_dir@%$dir%g" \ - -e "s%@shlib_objs@%$libgcc_objs%g" \ + -e "s%@shlib_objs@%$libgcc_sh_objs%g" \ -e "s%@shlib_base_name@%$shlib_base_name%g" \ - -e "s%@shlib_map_file@%$mapfile%g" + -e "s%@shlib_map_file@%$mapfile%g" \ + -e "s%@shlib_so_name@%$shlib_so_name%g" \ + -e "s%@shlib_dir@%$shlib_dir%g" \ + -e "s%@shlib_slibdir_qual@%%g" elif [ "$SHLIB_MULTILIB" = "$dir" ]; then shlib_base_name="libgcc_s"; echo "" @@ -311,9 +425,12 @@ for ml in $MULTILIBS; do echo " $SHLIB_LINK" \ | sed -e "s%@multilib_flags@%$flags%g" \ -e "s%@multilib_dir@%$dir%g" \ - -e "s%@shlib_objs@%$libgcc_objs%g" \ + -e "s%@shlib_objs@%$libgcc_sh_objs%g" \ -e "s%@shlib_base_name@%$shlib_base_name%g" \ - -e "s%@shlib_map_file@%$mapfile%g" + -e "s%@shlib_map_file@%$mapfile%g" \ + -e "s%@shlib_so_name@%$shlib_base_name%g" \ + -e "s%@shlib_dir@%%g" \ + -e "s%@shlib_slibdir_qual@%%g" fi fi done @@ -322,16 +439,18 @@ dirs=libgcc for ml in $MULTILIBS; do dir=`echo ${ml} | sed -e 's/;.*$//' -e 's/=/$(EQ)/g'` if [ $dir != . ]; then - dirs="$dirs libgcc/${dir}" + dirs="$dirs ${dir} libgcc/${dir}" fi done echo '' echo 'libgcc-stage-start:' echo ' for dir in '"${dirs}"'; do \' -echo ' if [ -d $(stage)/$$dir ]; then true; else mkdir $(stage)/$$dir; fi; \' +echo ' if [ -d $(stage)/$$dir ]; then true; else '$mkinstalldirs' $(stage)/$$dir; fi; \' echo ' done' echo ' -for dir in '"${dirs}"'; do \' echo ' mv $$dir/*'"${objext}"' $(stage)/$$dir; \' +echo ' test ! -f $$dir/stacknote.s || mv $$dir/stacknote.s $(stage)/$$dir; \' +echo ' test ! -f $$dir/libgcc.a || mv $$dir/lib* $(stage)/$$dir; \' echo ' done' echo "" @@ -343,8 +462,9 @@ for ml in $MULTILIBS; do if [ $dir != . ]; then dirs="$dirs ${dir} libgcc/${dir}" fi - all="$all ${dir}/libgcc.a" + all="$all ${dir}/libgcc.a ${dir}/libgcov.a" if [ "$SHLIB_LINK" ]; then + all="$all ${dir}/libgcc_eh.a" if [ -z "$SHLIB_MULTILIB" ]; then if [ "$dir" = "." ]; then suff=""; @@ -360,7 +480,7 @@ done echo 'stmp-dirs: force' echo ' for d in '"$dirs"'; do \' -echo ' if [ -d $$d ]; then true; else mkdir $$d; fi \' +echo ' if [ -d $$d ]; then true; else '$mkinstalldirs' $$d; fi; \' echo ' done' echo ' if [ -f stmp-dirs ]; then true; else touch stmp-dirs; fi' @@ -394,28 +514,61 @@ echo "" echo "install: $all" for ml in $MULTILIBS; do dir=`echo ${ml} | sed -e 's/;.*$//' -e 's/=/$(EQ)/g'` + flags=`echo ${ml} | sed -e 's/^[^;]*;//' -e 's/@/ -/g'`; if [ $dir != . ]; then - ldir='$(libsubdir)'/$dir - echo " if [ -d $ldir ]; then true; else mkdir $ldir; chmod a+rx $ldir; fi;" + ldir='$(DESTDIR)$(libsubdir)'/$dir + echo " if [ -d $ldir ]; then true; else $mkinstalldirs $ldir; chmod a+rx $ldir; fi;" else - ldir='$(libsubdir)' + ldir='$(DESTDIR)$(libsubdir)' fi echo ' $(INSTALL_DATA)' ${dir}/libgcc.a ${ldir}/ echo ' $(RANLIB_FOR_TARGET)' ${ldir}/libgcc.a + echo ' $(INSTALL_DATA)' ${dir}/libgcov.a ${ldir}/ + echo ' $(RANLIB_FOR_TARGET)' ${ldir}/libgcov.a if [ "$SHLIB_LINK" ]; then + echo ' $(INSTALL_DATA)' ${dir}/libgcc_eh.a ${ldir}/ + echo ' $(RANLIB_FOR_TARGET)' ${ldir}/libgcc_eh.a + if [ -z "$SHLIB_MULTILIB" ]; then - if [ "$dir" = "." ]; then - shlib_base_name="libgcc_s"; + if [ "$dir" = . ]; then + shlib_base_name=libgcc_s else shlib_base_name=libgcc_s_`echo $dir | sed s,/,_,g` fi + shlib_so_name="$shlib_base_name" + shlib_dir= + shlib_slibdir_qual= + if [ -n "$MULTILIB_OSDIRNAMES" ]; then + gcc_multilib_dir=`./xgcc -B./ $flags --print-multi-directory` + os_multilib_dir=`./xgcc -B./ $flags --print-multi-os-directory` + if [ "$dir" != . ]; then + shlib_dir="$dir"/ + fi + gcc_multilib_sup=`echo $gcc_multilib_dir | sed 's~^[^/]*/~~'` + os_multilib_base=`echo $os_multilib_dir | sed -n "s~/${gcc_multilib_sup}\$~~p"` + if [ -z "$os_multilib_base" ]; then + shlib_so_name=libgcc_s + if [ "$os_multilib_dir" != "." ]; then + shlib_slibdir_qual="/$os_multilib_dir" + fi + else + shlib_so_name=libgcc_s_`echo $gcc_multilib_sup | sed s,/,_,g` + shlib_slibdir_qual="/$os_multilib_base" + fi + fi echo " $SHLIB_INSTALL" \ - | sed -e "s%@shlib_base_name@%$shlib_base_name%g" + | sed -e "s%@shlib_base_name@%$shlib_base_name%g" \ + -e "s%@shlib_so_name@%$shlib_so_name%g" \ + -e "s%@shlib_dir@%$shlib_dir%g" \ + -e "s%@shlib_slibdir_qual@%$shlib_slibdir_qual%g" elif [ "$SHLIB_MULTILIB" = "$dir" ]; then shlib_base_name="libgcc_s"; echo " $SHLIB_INSTALL" \ - | sed -e "s%@shlib_base_name@%$shlib_base_name%g" + | sed -e "s%@shlib_base_name@%$shlib_base_name%g" \ + -e "s%@shlib_so_name@%$shlib_base_name%g" \ + -e "s%@shlib_dir@%%g" \ + -e "s%@shlib_slibdir_qual@%%g" fi fi done @@ -424,10 +577,10 @@ for f in $EXTRA_MULTILIB_PARTS; do dir=`echo ${ml} | sed -e 's/;.*$//' -e 's/=/$(EQ)/g'` if [ $dir != . ]; then out=${dir}/$f - ldir='$(libsubdir)'/$dir + ldir='$(DESTDIR)$(libsubdir)'/$dir else out=$f - ldir='$(libsubdir)' + ldir='$(DESTDIR)$(libsubdir)' fi echo ' $(INSTALL_DATA)' $out $ldir/ done