diff options
| author | Geoffrey Keating <geoffk@geoffk.org> | 2005-09-29 01:00:26 +0000 |
|---|---|---|
| committer | Geoffrey Keating <geoffk@geoffk.org> | 2005-09-29 01:00:26 +0000 |
| commit | 36141d5e966c6b9cc09619ac200bde7c9ef9a149 (patch) | |
| tree | e91be943842c8dc1f62870517bc178bfdd9ba53e /Makefile.tpl | |
| parent | 4488929e474f231dfcf2b0438273c3b0d417515a (diff) | |
| download | binutils-redhat-36141d5e966c6b9cc09619ac200bde7c9ef9a149.tar.gz | |
Index: ChangeLog
2005-09-28 Geoffrey Keating <geoffk@apple.com>
* Makefile.tpl (BASE_TARGET_EXPORTS): Add LIPO, STRIP.
(LIPO_FOR_TARGET): New.
(CONFIGURED_LIPO_FOR_TARGET): New.
(USUAL_LIPO_FOR_TARGET): New.
(STRIP_FOR_TARGET): New.
(CONFIGURED_STRIP_FOR_TARGET): New.
(USUAL_STRIP_FOR_TARGET): New.
* Makefile.def (flags_to_pass): Add LIPO_FOR_TARGET and
STRIP_FOR_TARGET.
* configure.in: Set LIPO_FOR_TARGET, STRIP_FOR_TARGET,
CONFIGURED_LIPO_FOR_TARGET, CONFIGURED_STRIP_FOR_TARGET.
* Makefile.in: Regenerate.
* configure.in: Regenerate.
Index: gcc/ChangeLog
2005-09-28 Geoffrey Keating <geoffk@apple.com>
* Makefile.in: Export LIPO_FOR_TARGET, STRIP_FOR_TARGET.
(stage1-start): Delete old libgcc and libunwind before moving
anything into the stage directory.
(stage2-start): Likewise.
(stage3-start): Likewise.
(stage4-start): Likewise.
(stageprofile-start): Likewise.
(stagefeedback-start): Likewise.
* config.gcc (*-*-darwin*): Automatically use CPU-specific darwin.h
header in tm_file and CPU-specific t-darwin in tmake_file.
(i[34567]86-*-darwin*): Don't change tm_file.
(powerpc-*-darwin*): Don't change tm_file or tmake_file.
* config/darwin.h (REAL_LIBGCC_SPEC): Rewrite to use proper libgcc
shared library stub for target OS version.
* config/t-slibgcc-darwin (SHLIB_SOLINK): Delete.
(SHLIB_LINK): Don't make SHLIB_SOLINK.
(SHLIB_INSTALL): Don't install SHLIB_SOLINK.
(libgcc_s.%.dylib): New.
(LIBGCC): Define.
(install-darwin-libgcc-stubs): New.
(INSTALL_LIBGCC): New append.
* config/i386/darwin-libgcc.10.4.ver: New.
* config/i386/darwin-libgcc.10.5.ver: New.
* config/i386/t-darwin: New.
* config/rs6000/darwin-libgcc.10.4.ver: New.
* config/rs6000/darwin-libgcc.10.5.ver: New.
* config/rs6000/darwin.h (REAL_LIBGCC_SPEC): Delete.
* config/rs6000/t-darwin (SHLIB_VERPFX): Define.
Diffstat (limited to 'Makefile.tpl')
| -rw-r--r-- | Makefile.tpl | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/Makefile.tpl b/Makefile.tpl index f8a120c96c..2413c0fa30 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -195,8 +195,10 @@ BASE_TARGET_EXPORTS = \ DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \ LD="$(LD_FOR_TARGET)"; export LD; \ LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \ + LIPO="$(LIPO_FOR_TARGET)"; export LIPO; \ NM="$(NM_FOR_TARGET)"; export NM; \ RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \ + STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \ WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \ $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); @@ -481,6 +483,19 @@ USUAL_LD_FOR_TARGET = ` \ LDFLAGS_FOR_TARGET = +LIPO_FOR_TARGET=@LIPO_FOR_TARGET@ +CONFIGURED_LIPO_FOR_TARGET=@CONFIGURED_LIPO_FOR_TARGET@ +USUAL_LIPO_FOR_TARGET = ` \ + if [ '$(host)' = '$(target)' ] ; then \ + if [ x'$(LIPO)' != x ]; then \ + echo $(LIPO); \ + else \ + echo lipo; \ + fi; \ + else \ + echo $(CONFIGURED_LIPO_FOR_TARGET) ; \ + fi` + NM_FOR_TARGET=@NM_FOR_TARGET@ CONFIGURED_NM_FOR_TARGET=@CONFIGURED_NM_FOR_TARGET@ USUAL_NM_FOR_TARGET = ` \ @@ -513,6 +528,23 @@ USUAL_RANLIB_FOR_TARGET = ` \ fi; \ fi` +STRIP_FOR_TARGET=@STRIP_FOR_TARGET@ +CONFIGURED_STRIP_FOR_TARGET=@CONFIGURED_STRIP_FOR_TARGET@ +USUAL_STRIP_FOR_TARGET = ` \ + if [ -f $$r/$(HOST_SUBDIR)/binutils/strip ] ; then \ + echo $$r/$(HOST_SUBDIR)/binutils/strip ; \ + else \ + if [ '$(host)' = '$(target)' ] ; then \ + if [ x'$(STRIP)' != x ]; then \ + echo $(STRIP); \ + else \ + echo strip; \ + fi; \ + else \ + echo $(CONFIGURED_STRIP_FOR_TARGET) ; \ + fi; \ + fi` + WINDRES_FOR_TARGET=@WINDRES_FOR_TARGET@ CONFIGURED_WINDRES_FOR_TARGET=@CONFIGURED_WINDRES_FOR_TARGET@ USUAL_WINDRES_FOR_TARGET = ` \ |