OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

mklibgcc.in: Evaluate shlib_slibdir_qual during link step too.

Browse Source 
2003-11-21  Andreas Tobler  <a.tobler@schweiz.ch>

	* mklibgcc.in: Evaluate shlib_slibdir_qual during link
	step too.
	* config/t-slibgcc-darwin: Adjust install path.
	* config/rs6000/t-darwin: Revert multilib matches since
	it is not used on darwin.

From-SVN: r73790
This commit is contained in:
Andreas Tobler 2003-11-21 05:53:12 +01:00 committed by Andreas Tobler
parent c132886e7c
commit 0eadf440e4
4 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gcc/ChangeLog
View File

@ -1,3 +1,11 @@
2003-11-21 Andreas Tobler <a.tobler@schweiz.ch>
* mklibgcc.in: Evaluate shlib_slibdir_qual during link
step too.
* config/t-slibgcc-darwin: Adjust install path.
* config/rs6000/t-darwin: Revert multilib matches since
it is not used on darwin.
2003-11-20 Richard Henderson <rth@redhat.com>
* ssa.c, ssa-dce.c, ssa-ccp.c: Remove files.

3
gcc/config/rs6000/t-darwin
View File

@ -1,4 +1,3 @@
# Library code must include trampoline support.
LIB2FUNCS_EXTRA = $(srcdir)/config/rs6000/darwin-tramp.asm
# Multilib options
MULTILIB_MATCHES = ${MULTILIB_MATCHES_FLOAT}

2
gcc/config/t-slibgcc-darwin
View File

@ -11,7 +11,7 @@ SHLIB_OBJS = @shlib_objs@
SHLIB_SLIBDIR_QUAL = @shlib_slibdir_qual@
SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -dynamiclib -nodefaultlibs \
-Wl,-install_name,$(SHLIB_SONAME) \
-Wl,-install_name,$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SONAME) \
-Wl,-flat_namespace -o $(SHLIB_NAME) \
$(SHLIB_VERSTRING) \
@multilib_flags@ $(SHLIB_OBJS) -lc && \

11
gcc/mklibgcc.in
View File

@ -388,6 +388,7 @@ EOF
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`
@ -397,8 +398,12 @@ EOF
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
@ -411,7 +416,8 @@ EOF
-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 ""
@ -423,7 +429,8 @@ EOF
-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