out="libgcc/${dir}/${name}${objext}"
echo $out: $libgcc2_c_dep
- echo " $gcc_compile" '$(MAYBE_USE_COLLECT2)' $flags -DL$name \
+ echo " $gcc_compile" $flags -DL$name \
-c '$(srcdir)/libgcc2.c' -o $out
done
libgcc2_objs="$libgcc2_objs ${name}${objext}"
out="libgcc/${dir}/${name}${objext}"
echo $out: $libgcc2_c_dep
- echo " $gcc_compile" '$(MAYBE_USE_COLLECT2)' $flags -DL$name \
+ echo " $gcc_compile" $flags -DL$name \
-c '$(srcdir)/libgcc2.c' -o $out
done
libgcc2_st_objs="$libgcc2_st_objs ${name}${objext}"
out="libgcc/${dir}/${name}${objext}"
echo $out: $libgcc2_c_dep
- echo " $gcc_compile" '$(MAYBE_USE_COLLECT2)' $flags -DL$name \
+ echo " $gcc_compile" $flags -DL$name \
-c '$(srcdir)/libgcc2.c' -fexceptions -fnon-call-exceptions -o $out
done
libgcc2_objs="$libgcc2_objs ${name}${objext}"
out="libgcc/${dir}/${name}${objext}"
echo $out: $libgcov_c_dep
- echo " $gcc_compile" '$(MAYBE_USE_COLLECT2)' $flags -DL$name \
+ echo " $gcc_compile" $flags -DL$name \
-c '$(srcdir)/libgcov.c' -o $out
done
libgcov_objs="$libgcov_objs ${name}${objext}"
# .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}"
- echo ' ( $(NM_FOR_TARGET) '${SHLIB_NM_FLAGS} ${o}' | $(AWK) '\''NF == 3 { print "\t.hidden", $$3 }'\''; cat libgcc/${dir}/stacknote.s ) | $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) '${flags}' -r -nostdinc -nostdlib -o $@ '${o}' -xassembler -'
+ # 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
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_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
-e "s%@shlib_base_name@%$shlib_base_name%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_dir@%$shlib_dir%g" \
+ -e "s%@shlib_slibdir_qual@%%g"
elif [ "$SHLIB_MULTILIB" = "$dir" ]; then
shlib_base_name="libgcc_s";
echo ""
-e "s%@shlib_base_name@%$shlib_base_name%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_dir@%%g" \
+ -e "s%@shlib_slibdir_qual@%%g"
fi
fi
done