From 96f342c1daf9bb2502e35da04722c1a30fe3bd73 Mon Sep 17 00:00:00 2001 From: Eric Christopher Date: Thu, 20 Jul 2006 07:35:32 +0000 Subject: [PATCH] t-slibgcc-darwin (stmp-lipo): Remove. 2006-07-19 Eric Christopher * config/t-slibgcc-darwin (stmp-lipo): Remove. Rewrite dependencies for libgcc_s.1.dylib. From-SVN: r115608 --- gcc/ChangeLog | 13 +++++++++---- gcc/config/t-slibgcc-darwin | 14 +++++++------- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 438a6ae1569..bb5eae6b281 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2006-07-19 Eric Christopher + + * config/t-slibgcc-darwin (stmp-lipo): Remove. + Rewrite dependencies for libgcc_s.1.dylib. + 2006-07-19 Jakub Jelinek * except.c (duplicate_eh_regions_1): Clear next_peer. @@ -39,7 +44,7 @@ Whether a constructor node is a valid static constant initializer if all its elements are. (initializer_constant_valid_p) : Use it. - * output.h: Declare it. + * output.h: Declare it. * expr.c (categorize_ctor_elements_1): Return whether the constructor is a valid constant initializer instead of computing the number of non-constant elements. Use constructor_static_from_elts_p for this @@ -49,7 +54,7 @@ helper. Former head comment from this helper moved here, adjusted to account for the interface changes. (mostly_zeros_p): Adjust call to categorize_ctor_elements. - (all_zeros_p): Likewise. + (all_zeros_p): Likewise. * gimplify.c (gimplify_init_constructor): Decide whether we can make static versions of the constructor from the categorize_ctor_elements return value instead of the formerly computed number of non-constant @@ -186,7 +191,7 @@ 2006-07-14 Carlos O'Donell * dbxout.c (dbxout_begin_prologue): Emit LFBB label at function start. - (dbxout_function_end): Use local label LFBB. Remove hook + (dbxout_function_end): Use local label LFBB. Remove hook DBX_OUTPUT_NFUN. (dbxout_source_line): Use local label LFBB. (dbxout_block): Likewise. @@ -212,7 +217,7 @@ * config/sh/sh.c (sh_reorg): Ignore deleted insns whilst walking the LOG_LINKS chain. - + 2006-07-12 Geoffrey Keating * doc/invoke.texi (C++ Dialect Options): Explain difference diff --git a/gcc/config/t-slibgcc-darwin b/gcc/config/t-slibgcc-darwin index cfde5986580..d9381e646f1 100644 --- a/gcc/config/t-slibgcc-darwin +++ b/gcc/config/t-slibgcc-darwin @@ -43,7 +43,7 @@ ASM_HIDDEN_OP = .private_extern # The actual use of the libraries is controlled by REAL_LIBGCC_SPEC. # # This assumes each multilib corresponds to a different architecture. -libgcc_s.%.dylib : $(SHLIB_VERPFX).%.ver libgcc.a +libgcc_s.%.dylib : $(SHLIB_VERPFX).%.ver stmp-multilib # When building multilibbed target libraries, all the required # libraries are expected to exist in the multilib directory. MLIBS=`$(GCC_FOR_TARGET) --print-multi-lib \ @@ -62,7 +62,8 @@ libgcc_s.%.dylib : $(SHLIB_VERPFX).%.ver libgcc.a $(LIPO_FOR_TARGET) -output $@ -create $(@)_T* rm $(@)_T* -stmp-lipo: libgcc.a libgcc_s.10.4.dylib libgcc_s.10.5.dylib +libgcc_s.$(SHLIB_SOVERSION)$(SHLIB_EXT): stmp-multilib libgcc_s.10.4.dylib \ + libgcc_s.10.5.dylib # When building multilibbed target libraries, all the required # libraries are expected to exist in the multilib directory. MLIBS=`$(GCC_FOR_TARGET) --print-multi-lib \ @@ -74,16 +75,15 @@ stmp-lipo: libgcc.a libgcc_s.10.4.dylib libgcc_s.10.5.dylib $(LIPO_FOR_TARGET) -output libgcc_s.$(SHLIB_SOVERSION)$(SHLIB_EXT) \ -create libgcc_s.$(SHLIB_SOVERSION)$(SHLIB_EXT)_T* rm libgcc_s.$(SHLIB_SOVERSION)$(SHLIB_EXT)_T* - $(STAMP) stmp-lipo # From the point-of-view of the Makefiles, libgcc is built by the 'strip' # and 'lipo' commands above. -LIBGCC=stmp-lipo +LIBGCC=libgcc_s.$(SHLIB_SOVERSION)$(SHLIB_EXT) libgcc_s.10.4.dylib \ + libgcc_s.10.5.dylib stmp-multilib INSTALL_FILES=libgcc_s.10.4.dylib libgcc_s.10.5.dylib libgcc_s.1.dylib -install-darwin-libgcc-stubs : $(INSTALL_FILES) installdirs install-multilib \ - stmp-lipo +install-darwin-libgcc-stubs : $(INSTALL_FILES) installdirs for d in $(INSTALL_FILES) ; do \ $(INSTALL_DATA) $$d $(DESTDIR)$(slibdir)/$$d || exit 1 ; \ done @@ -93,4 +93,4 @@ install-darwin-libgcc-stubs : $(INSTALL_FILES) installdirs install-multilib \ $(LN_S) libgcc_s.1.dylib \ $(DESTDIR)$(slibdir)/libgcc_s_ppc64.1.dylib -INSTALL_LIBGCC += install-darwin-libgcc-stubs +INSTALL_LIBGCC = install-darwin-libgcc-stubs install-multilib -- 2.30.2