Makefile.in (RANLIB_FOR_TARGET): Use RANLIB when native.
* Makefile.in (RANLIB_FOR_TARGET): Use RANLIB when native. (RANLIB_TEST_FOR_TARGET): Delete. Don't pass down to sub-makes. Remove calls. * mklibgcc.in: Remove uses of RANLIB_TEST_FOR_TARGET. From-SVN: r61171
This commit is contained in:
Geoffrey Keating
parent
3466b2921e
commit
6dd05d08c4
@ -1,3 +1,10 @@
|
||||
2003-01-10 Geoffrey Keating <geoffk@apple.com>
|
||||
|
||||
* Makefile.in (RANLIB_FOR_TARGET): Use RANLIB when native.
|
||||
(RANLIB_TEST_FOR_TARGET): Delete. Don't pass down to sub-makes.
|
||||
Remove calls.
|
||||
* mklibgcc.in: Remove uses of RANLIB_TEST_FOR_TARGET.
|
||||
|
||||
Fri Jan 10 22:05:35 CET 2003 Jan Hubicka <jh@suse.cz>
|
||||
|
||||
* ifcvt.c (noce_try_addcc): Do not call emit_conditional_add
|
||||
|
||||
@ -227,15 +227,11 @@ RANLIB_FOR_TARGET = ` \
|
||||
echo $(objdir)/../binutils/ranlib ; \
|
||||
else \
|
||||
if [ "$(host_canonical)" = "$(target)" ] ; then \
|
||||
echo ranlib; \
|
||||
echo $(RANLIB); \
|
||||
else \
|
||||
t='$(program_transform_cross_name)'; echo ranlib | sed -e $$t ; \
|
||||
fi; \
|
||||
fi`
|
||||
RANLIB_TEST_FOR_TARGET = \
|
||||
[ -f $(RANLIB_FOR_TARGET) ] \
|
||||
|| ( [ "$(host_canonical)" = "$(target)" ] \
|
||||
&& [ -f /usr/bin/ranlib -o -f /bin/ranlib ] )
|
||||
NM_FOR_TARGET = ` \
|
||||
if [ -f ./nm ] ; then \
|
||||
echo ./nm ; \
|
||||
@ -701,7 +697,6 @@ ORDINARY_FLAGS_TO_PASS = \
|
||||
"MAKEINFOFLAGS=$(MAKEINFOFLAGS)" \
|
||||
"MAKEOVERRIDES=" \
|
||||
"RANLIB_FOR_TARGET=$(RANLIB_FOR_TARGET)" \
|
||||
"RANLIB_TEST_FOR_TARGET=$(RANLIB_TEST_FOR_TARGET)" \
|
||||
"SHELL=$(SHELL)" \
|
||||
"exeext=$(exeext)" \
|
||||
"build_exeext=$(build_exeext)" \
|
||||
@ -1065,7 +1060,6 @@ libgcc.a: $(LIBGCC_DEPS)
|
||||
AR_FLAGS_FOR_TARGET="$(AR_FLAGS_FOR_TARGET)" \
|
||||
CFLAGS="$(CFLAGS) $(WARN_CFLAGS)" \
|
||||
RANLIB_FOR_TARGET="$(RANLIB_FOR_TARGET)" \
|
||||
RANLIB_TEST_FOR_TARGET="$(RANLIB_TEST_FOR_TARGET)" \
|
||||
NM_FOR_TARGET="$(NM_FOR_TARGET)" AWK="$(AWK)" \
|
||||
LIBGCC2_CFLAGS="$(LIBGCC2_CFLAGS)" \
|
||||
INCLUDES="$(INCLUDES)" \
|
||||
@ -1107,7 +1101,6 @@ stmp-multilib: $(LIBGCC_DEPS)
|
||||
AR_FLAGS_FOR_TARGET="$(AR_FLAGS_FOR_TARGET)" \
|
||||
CFLAGS="$(CFLAGS) $(WARN_CFLAGS)" \
|
||||
RANLIB_FOR_TARGET="$(RANLIB_FOR_TARGET)" \
|
||||
RANLIB_TEST_FOR_TARGET="$(RANLIB_TEST_FOR_TARGET)" \
|
||||
NM_FOR_TARGET="$(NM_FOR_TARGET)" AWK="$(AWK)" \
|
||||
LIBGCC2_CFLAGS="$(LIBGCC2_CFLAGS)" \
|
||||
INCLUDES="$(INCLUDES)" \
|
||||
@ -2943,18 +2936,12 @@ install-man: installdirs $(GENERATED_MANPAGES) lang.install-man
|
||||
|
||||
# Install the library.
|
||||
install-libgcc: libgcc.mk libgcc.a installdirs
|
||||
if $(RANLIB_TEST_FOR_TARGET); then \
|
||||
r_f_t=$(RANLIB_FOR_TARGET); \
|
||||
else \
|
||||
r_f_t=: ; \
|
||||
fi; \
|
||||
$(MAKE) GCC_FOR_TARGET="$(GCC_FOR_TARGET)" \
|
||||
BUILD_PREFIX="$(BUILD_PREFIX)" BUILD_PREFIX_1="$(BUILD_PREFIX_1)" \
|
||||
AR_FOR_TARGET="$(AR_FOR_TARGET)" \
|
||||
AR_CREATE_FOR_TARGET="$(AR_CREATE_FOR_TARGET)" \
|
||||
AR_FLAGS_FOR_TARGET="$(AR_FLAGS_FOR_TARGET)" \
|
||||
CFLAGS="$(CFLAGS) $(WARN_CFLAGS)" \
|
||||
RANLIB_TEST_FOR_TARGET="$(RANLIB_TEST_FOR_TARGET)" \
|
||||
NM_FOR_TARGET="$(NM_FOR_TARGET)" AWK="$(AWK)" \
|
||||
LIBGCC2_CFLAGS="$(LIBGCC2_CFLAGS)" \
|
||||
INCLUDES="$(INCLUDES)" \
|
||||
@ -2962,7 +2949,7 @@ install-libgcc: libgcc.mk libgcc.a installdirs
|
||||
LIB1ASMSRC='$(LIB1ASMSRC)' \
|
||||
MAKEOVERRIDES= \
|
||||
INSTALL_DATA="$(INSTALL_DATA)" \
|
||||
RANLIB_FOR_TARGET="$$r_f_t" \
|
||||
RANLIB_FOR_TARGET="$(RANLIB_FOR_TARGET)" \
|
||||
DESTDIR="$(DESTDIR)" \
|
||||
libsubdir="$(libsubdir)" \
|
||||
slibdir="$(slibdir)" \
|
||||
@ -2970,18 +2957,12 @@ install-libgcc: libgcc.mk libgcc.a installdirs
|
||||
|
||||
# Install multiple versions of libgcc.a.
|
||||
install-multilib: stmp-multilib installdirs
|
||||
if $(RANLIB_TEST_FOR_TARGET); then \
|
||||
r_f_t=$(RANLIB_FOR_TARGET); \
|
||||
else \
|
||||
r_f_t=: ; \
|
||||
fi; \
|
||||
$(MAKE) GCC_FOR_TARGET="$(GCC_FOR_TARGET)" \
|
||||
BUILD_PREFIX="$(BUILD_PREFIX)" BUILD_PREFIX_1="$(BUILD_PREFIX_1)" \
|
||||
AR_FOR_TARGET="$(AR_FOR_TARGET)" \
|
||||
AR_CREATE_FOR_TARGET="$(AR_CREATE_FOR_TARGET)" \
|
||||
AR_FLAGS_FOR_TARGET="$(AR_FLAGS_FOR_TARGET)" \
|
||||
CFLAGS="$(CFLAGS) $(WARN_CFLAGS)" \
|
||||
RANLIB_TEST_FOR_TARGET="$(RANLIB_TEST_FOR_TARGET)" \
|
||||
NM_FOR_TARGET="$(NM_FOR_TARGET)" AWK="$(AWK)" \
|
||||
LIBGCC2_CFLAGS="$(LIBGCC2_CFLAGS)" \
|
||||
INCLUDES="$(INCLUDES)" \
|
||||
@ -2989,7 +2970,7 @@ install-multilib: stmp-multilib installdirs
|
||||
LIB1ASMSRC='$(LIB1ASMSRC)' \
|
||||
MAKEOVERRIDES= \
|
||||
INSTALL_DATA="$(INSTALL_DATA)" \
|
||||
RANLIB_FOR_TARGET="$$r_f_t" \
|
||||
RANLIB_FOR_TARGET="$(RANLIB_FOR_TARGET)" \
|
||||
DESTDIR="$(DESTDIR)" \
|
||||
libsubdir="$(libsubdir)" \
|
||||
slibdir="$(slibdir)" \
|
||||
@ -3582,13 +3563,10 @@ stage1-start:
|
||||
-if [ -f collect-ld$(exeext) ] ; then (cd stage1 && $(LN_S) ../collect-ld$(exeext) .) ; else true ; fi
|
||||
-rm -f stage1/libgcc.a stage1/libgcc_eh.a
|
||||
-cp libgcc.a stage1
|
||||
-if $(RANLIB_TEST_FOR_TARGET) ; then \
|
||||
$(RANLIB_FOR_TARGET) stage1/libgcc.a; \
|
||||
else true; fi
|
||||
-$(RANLIB_FOR_TARGET) stage1/libgcc.a
|
||||
-if [ -f libgcc_eh.a ] ; then cp libgcc_eh.a stage1; \
|
||||
if $(RANLIB_TEST_FOR_TARGET) ; then \
|
||||
$(RANLIB_FOR_TARGET) stage1/libgcc_eh.a; \
|
||||
else true; fi; fi
|
||||
fi
|
||||
-for f in .. $(EXTRA_MULTILIB_PARTS); do if [ x$${f} != x.. ]; then \
|
||||
cp stage1/$${f} . ; \
|
||||
else true; \
|
||||
@ -3615,13 +3593,10 @@ stage2-start:
|
||||
-if [ -f collect-ld$(exeext) ] ; then (cd stage2 && $(LN_S) ../collect-ld$(exeext) .) ; else true ; fi
|
||||
-rm -f stage2/libgcc.a stage2/libgcc_eh.a
|
||||
-cp libgcc.a stage2
|
||||
-if $(RANLIB_TEST_FOR_TARGET) ; then \
|
||||
$(RANLIB_FOR_TARGET) stage2/libgcc.a; \
|
||||
else true; fi
|
||||
-$(RANLIB_FOR_TARGET) stage2/libgcc.a
|
||||
-if [ -f libgcc_eh.a ] ; then cp libgcc_eh.a stage2; \
|
||||
if $(RANLIB_TEST_FOR_TARGET) ; then \
|
||||
$(RANLIB_FOR_TARGET) stage2/libgcc_eh.a; \
|
||||
else true; fi; fi
|
||||
fi
|
||||
-for f in .. $(EXTRA_MULTILIB_PARTS); do if [ x$${f} != x.. ]; then \
|
||||
cp stage2/$${f} . ; \
|
||||
else true; \
|
||||
@ -3644,13 +3619,10 @@ stage3-start:
|
||||
-if [ -f collect-ld$(exeext) ] ; then (cd stage3 && $(LN_S) ../collect-ld$(exeext) .) ; else true ; fi
|
||||
-rm -f stage3/libgcc.a stage3/libgcc_eh.a
|
||||
-cp libgcc.a stage3
|
||||
-if $(RANLIB_TEST_FOR_TARGET) ; then \
|
||||
$(RANLIB_FOR_TARGET) stage3/libgcc.a; \
|
||||
else true; fi
|
||||
-$(RANLIB_FOR_TARGET) stage3/libgcc.a
|
||||
-if [ -f libgcc_eh.a ] ; then cp libgcc_eh.a stage3; \
|
||||
if $(RANLIB_TEST_FOR_TARGET) ; then \
|
||||
$(RANLIB_FOR_TARGET) stage3/libgcc_eh.a; \
|
||||
else true; fi; fi
|
||||
fi
|
||||
-for f in .. $(EXTRA_MULTILIB_PARTS); do if [ x$${f} != x.. ]; then \
|
||||
cp stage3/$${f} . ; \
|
||||
else true; \
|
||||
@ -3673,13 +3645,10 @@ stage4-start:
|
||||
-if [ -f collect-ld$(exeext) ] ; then (cd stage4 && $(LN_S) ../collect-ld$(exeext) .) ; else true ; fi
|
||||
-rm -f stage4/libgcc.a stage4/libgcc_eh.a
|
||||
-cp libgcc.a stage4
|
||||
-if $(RANLIB_TEST_FOR_TARGET) ; then \
|
||||
$(RANLIB_FOR_TARGET) stage4/libgcc.a; \
|
||||
else true; fi
|
||||
-$(RANLIB_FOR_TARGET) stage4/libgcc.a
|
||||
-if [ -f libgcc_eh.a ] ; then cp libgcc_eh.a stage4; \
|
||||
if $(RANLIB_TEST_FOR_TARGET) ; then \
|
||||
$(RANLIB_FOR_TARGET) stage4/libgcc_eh.a; \
|
||||
else true; fi; fi
|
||||
fi
|
||||
-for f in .. $(EXTRA_MULTILIB_PARTS); do if [ x$${f} != x.. ]; then \
|
||||
cp stage4/$${f} . ; \
|
||||
else true; \
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
#!/bin/sh
|
||||
# Construct makefile for libgcc.
|
||||
# Copyright (C) 2000, 2002 Free Software Foundation, Inc.
|
||||
# Copyright (C) 2000, 2002, 2003 Free Software Foundation, Inc.
|
||||
#
|
||||
# This file is part of GCC.
|
||||
|
||||
@ -295,9 +295,7 @@ for ml in $MULTILIBS; do
|
||||
echo "${dir}/libgcc.a: $libgcc_a_objs"
|
||||
echo " -rm -rf ${dir}/libgcc.a"
|
||||
echo ' $(AR_CREATE_FOR_TARGET)' ${dir}/libgcc.a $libgcc_a_objs
|
||||
echo ' if $(RANLIB_TEST_FOR_TARGET) ; then' \\
|
||||
echo ' $(RANLIB_FOR_TARGET)' ${dir}/libgcc.a ';' \\
|
||||
echo ' else true; fi;'
|
||||
echo ' $(RANLIB_FOR_TARGET)' ${dir}/libgcc.a
|
||||
|
||||
if [ "$SHLIB_LINK" ]; then
|
||||
|
||||
@ -305,9 +303,7 @@ for ml in $MULTILIBS; do
|
||||
echo "${dir}/libgcc_eh.a: $libgcc_eh_objs"
|
||||
echo " -rm -rf ${dir}/libgcc_eh.a"
|
||||
echo ' $(AR_CREATE_FOR_TARGET)' ${dir}/libgcc_eh.a $libgcc_eh_objs
|
||||
echo ' if $(RANLIB_TEST_FOR_TARGET) ; then' \\
|
||||
echo ' $(RANLIB_FOR_TARGET)' ${dir}/libgcc_eh.a ';' \\
|
||||
echo ' else true; fi;'
|
||||
echo ' $(RANLIB_FOR_TARGET)' ${dir}/libgcc_eh.a
|
||||
|
||||
if [ -z "$SHLIB_MULTILIB" ]; then
|
||||
if [ "$dir" = . ]; then
|
||||
|
||||
Loading…
Reference in New Issue
Block a user