gkeating 03/01/10 18:42:56
Modified: live/gcc3/gcc Makefile.in ggc-page.c mklibgcc.in toplev.c
varasm.c
live/gcc3/gcc/config/i386 x-darwin
live/gcc3/gcc/config/rs6000 x-darwin
live/gcc3/gcc/objc Make-lang.in
Log:
Merge these from FSF:
2003-01-10 Geoffrey Keating <[EMAIL PROTECTED]>
* Makefile.in (parsedir): New variable.
(docobjdir): New variable.
(c-parse.o, c-parse.c, c-parse.y, gengtype-lex.o, gengtype-yacc.o,
gengtype-lex.c, gengtype-yacc.c): Use parsedir.
(info, cpp.info, gcc.info, gccint.info, gccinstall.info,
cppinternals.info, generated-manpages, gcov.1, cpp.1, gcc.1, gfdl.7,
gpl.7, fsf-funding.7, maintainer-clean, install-info, install-man):
Use docobjdir.
* objc/Make-lang.in (objc/objc-parse.c, objc/objc-parse.y,
objc.maintainer-clean): Use parsedir.
* varasm.c (struct constant_descriptor_rtx): Remove unused
`label' field.
* toplev.c (documented_lang_options): Document -Winvalid-pch.
* ggc-page.c (ggc_collect): Avoid overflow computing
min_expand.
* 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.
Revision Changes Path
1.135 +104 -127 src/live/gcc3/gcc/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /cvs/Darwin/src/live/gcc3/gcc/Makefile.in,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- Makefile.in 2002/12/18 00:31:49 1.134
+++ Makefile.in 2003/01/11 02:42:52 1.135
@@ -33,12 +33,19 @@
# Directory where sources are, from where we are.
srcdir = @srcdir@
VPATH = @srcdir@
-# APPLE LOCAL: parsedir
-parsedir = @srcdir@
# Pointer to the GCC Project website
website=http://gcc.gnu.org
+# These directories contain files that are provided as part of a FSF tarball,
+# but not provided in CVS. Some GCC integrators like to use the CVS sources
+# but keep them read-only during a build, and so change these variables
+# from these defaults.
+# BEGIN APPLE LOCAL parsedir
+parsedir = .
+docobjdir = .
+# END APPLE LOCAL parsedir
+
# Variables that exist for you to override.
# See below for how to change them for certain systems.
@@ -230,15 +237,11 @@
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 ; \
@@ -739,7 +742,6 @@
"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)" \
@@ -1119,7 +1121,6 @@
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)" \
@@ -1143,7 +1144,6 @@
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)" \
@@ -1186,7 +1186,6 @@
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)" \
@@ -1253,7 +1252,6 @@
c-errors.o: c-errors.c $(CONFIG_H) $(SYSTEM_H) $(TREE_H) $(C_TREE_H) flags.h \
diagnostic.h $(TM_P_H)
-# APPLE LOCAL parsedir
c-parse.o : $(parsedir)/c-parse.c $(CONFIG_H) $(TREE_H) $(GGC_H) intl.h \
$(C_TREE_H) input.h flags.h $(SYSTEM_H) toplev.h output.h $(CPPLIB_H) \
varray.h gt-c-parse.h
@@ -2276,19 +2274,19 @@
$(HOST_CC) -c $(HOST_CFLAGS) $(HOST_CPPFLAGS) $(INCLUDES) \
$(srcdir)/gengtype.c $(OUTPUT_OPTION)
-gengtype-lex.o : $(srcdir)/gengtype-lex.c gengtype.h $(srcdir)/gengtype-yacc.c \
+gengtype-lex.o : $(parsedir)/gengtype-lex.c gengtype.h $(parsedir)/gengtype-yacc.c \
$(HCONFIG_H) $(SYSTEM_H)
$(HOST_CC) -c $(HOST_CFLAGS) $(HOST_CPPFLAGS) $(INCLUDES) \
- $(srcdir)/gengtype-lex.c $(OUTPUT_OPTION)
+ $(parsedir)/gengtype-lex.c $(OUTPUT_OPTION)
-gengtype-yacc.o : $(srcdir)/gengtype-yacc.c gengtype.h $(HCONFIG_H) $(SYSTEM_H)
+gengtype-yacc.o : $(parsedir)/gengtype-yacc.c gengtype.h $(HCONFIG_H) $(SYSTEM_H)
$(HOST_CC) -c $(HOST_CFLAGS) $(HOST_CPPFLAGS) $(INCLUDES) \
- $(srcdir)/gengtype-yacc.c $(OUTPUT_OPTION)
+ $(parsedir)/gengtype-yacc.c $(OUTPUT_OPTION)
# The sed command works around a bug in flex-2.5.4.
-$(srcdir)/gengtype-lex.c : $(srcdir)/gengtype-lex.l
- cd $(srcdir) && \
- $(FLEX) $(FLEXFLAGS) -t -o$@ gengtype-lex.l | \
+$(parsedir)/gengtype-lex.c : $(srcdir)/gengtype-lex.l
+ cd $(parsedir) && \
+ $(FLEX) $(FLEXFLAGS) -t -o$@ $(srcdir)/gengtype-lex.l | \
sed 's/^\(char msg\[\];\)/yyconst \1/' > g-$$$$ ; \
if test $$? -eq 0 ; then \
mv -f g-$$$$ gengtype-lex.c ; \
@@ -2297,9 +2295,9 @@
false ; \
fi
-$(srcdir)/gengtype-yacc.c: $(srcdir)/gengtype-yacc.y
- (cd $(srcdir) && \
- $(BISON) $(BISONFLAGS) -d -o gengtype-yacc.c gengtype-yacc.y || \
+$(parsedir)/gengtype-yacc.c: $(srcdir)/gengtype-yacc.y
+ (cd $(parsedir) && \
+ $(BISON) $(BISONFLAGS) -d -o gengtype-yacc.c $(srcdir)/gengtype-yacc.y || \
( rm -f $@ && false ) )
genconditions$(build_exeext) : genconditions.o $(HOST_EARLY_SUPPORT) \
@@ -2362,7 +2360,6 @@
$(top_builddir)/intl/libintl.a: intl.all
-# APPLE LOCAL: parsedir
$(INTL_TARGETS): $(CONFIG_H) $(parsedir)/c-parse.c
intl.all intl.install intl.uninstall \
@@ -2679,7 +2676,7 @@
docdir = $(srcdir)/doc
doc: $(BUILD_INFO) $(GENERATED_MANPAGES) gccbug
-info: $(docdir)/cpp.info $(docdir)/gcc.info $(docdir)/gccint.info
$(docdir)/gccinstall.info lang.info $(docdir)/cppinternals.info
+info: $(docobjdir)/cpp.info $(docobjdir)/gcc.info $(docobjdir)/gccint.info
$(docobjdir)/gccinstall.info lang.info $(docobjdir)/cppinternals.info
TEXI_CPP_FILES = $(docdir)/cpp.texi $(docdir)/include/fdl.texi \
$(docdir)/cppenv.texi $(docdir)/cppopts.texi
@@ -2712,23 +2709,27 @@
$(docdir)/include/fdl.texi
TEXI_CPPINT_FILES = $(docdir)/cppinternals.texi
-
-$(docdir)/cpp.info: $(TEXI_CPP_FILES)
- cd $(srcdir) && $(MAKEINFO) $(MAKEINFOFLAGS) -I doc -I doc/include -o
doc/cpp.info doc/cpp.texi
-
-$(docdir)/gcc.info: $(TEXI_GCC_FILES)
- cd $(srcdir) && $(MAKEINFO) $(MAKEINFOFLAGS) -I doc -I doc/include -o
doc/gcc.info doc/gcc.texi
-
-$(docdir)/gccint.info: $(TEXI_GCCINT_FILES)
- cd $(srcdir) && $(MAKEINFO) $(MAKEINFOFLAGS) -I doc -I doc/include -o
doc/gccint.info doc/gccint.texi
-$(docdir)/gccinstall.info: $(TEXI_GCCINSTALL_FILES)
- cd $(srcdir) && $(MAKEINFO) $(MAKEINFOFLAGS) -I doc -I doc/include -o
doc/gccinstall.info doc/install.texi
+$(docobjdir)/cpp.info: $(TEXI_CPP_FILES)
+ $(MAKEINFO) $(MAKEINFOFLAGS) -I $(docdir) -I $(docdir)/include \
+ -o $@ $(docdir)/cpp.texi
+
+$(docobjdir)/gcc.info: $(TEXI_GCC_FILES)
+ $(MAKEINFO) $(MAKEINFOFLAGS) -I $(docdir) -I $(docdir)/include \
+ -o $@ $(docdir)/gcc.texi
+
+$(docobjdir)/gccint.info: $(TEXI_GCCINT_FILES)
+ $(MAKEINFO) $(MAKEINFOFLAGS) -I $(docdir) -I $(docdir)/include \
+ -o $@ $(docdir)/gccint.texi
+
+$(docobjdir)/gccinstall.info: $(TEXI_GCCINSTALL_FILES)
+ $(MAKEINFO) $(MAKEINFOFLAGS) -I $(docdir) -I $(docdir)/include \
+ -o $@ $(docdir)/install.texi
+
+$(docobjdir)/cppinternals.info: $(TEXI_CPPINT_FILES)
+ $(MAKEINFO) $(MAKEINFOFLAGS) -I $(docdir) -I $(docdir)/include \
+ -o $@ $(docdir)/cppinternals.texi
-$(docdir)/cppinternals.info: $(TEXI_CPPINT_FILES)
- cd $(srcdir) && $(MAKEINFO) $(MAKEINFOFLAGS) -I doc -I doc/include -o
doc/cppinternals.info \
- doc/cppinternals.texi
-
dvi: gcc.dvi gccint.dvi gccinstall.dvi cpp.dvi lang.dvi cppinternals.dvi
# This works with GNU Make's default rule.
@@ -2748,59 +2749,59 @@
cppinternals.dvi: $(TEXI_CPPINT_FILES)
$(TEXI2DVI) -I $(docdir) -I $(docdir)/include $(docdir)/cppinternals.texi
-generated-manpages: $(docdir)/gcov.1 $(docdir)/cpp.1 $(docdir)/gcc.1 \
- $(docdir)/gfdl.7 $(docdir)/gpl.7 $(docdir)/fsf-funding.7 \
+generated-manpages: $(docobjdir)/gcov.1 $(docobjdir)/cpp.1 $(docobjdir)/gcc.1 \
+ $(docobjdir)/gfdl.7 $(docobjdir)/gpl.7 $(docobjdir)/fsf-funding.7 \
lang.generated-manpages
-$(docdir)/gcov.1: $(docdir)/gcov.texi
- $(STAMP) $(docdir)/gcov.1
- -$(TEXI2POD) $(docdir)/gcov.texi > gcov.pod
- -($(POD2MAN) --section=1 gcov.pod > $(docdir)/gcov.1.T$$$$ && \
- mv -f $(docdir)/gcov.1.T$$$$ $(docdir)/gcov.1) || \
- (rm -f $(docdir)/gcov.1.T$$$$ && exit 1)
+$(docobjdir)/gcov.1: $(docobjdir)/gcov.texi
+ $(STAMP) $(docobjdir)/gcov.1
+ -$(TEXI2POD) $(docobjdir)/gcov.texi > gcov.pod
+ -($(POD2MAN) --section=1 gcov.pod > $(docobjdir)/gcov.1.T$$$$ && \
+ mv -f $(docobjdir)/gcov.1.T$$$$ $(docobjdir)/gcov.1) || \
+ (rm -f $(docobjdir)/gcov.1.T$$$$ && exit 1)
-rm -f gcov.pod
-$(docdir)/cpp.1: $(docdir)/cpp.texi $(docdir)/cppenv.texi \
- $(docdir)/cppopts.texi
- $(STAMP) $(docdir)/cpp.1
- -$(TEXI2POD) $(docdir)/cpp.texi > cpp.pod
- -($(POD2MAN) --section=1 cpp.pod > $(docdir)/cpp.1.T$$$$ && \
- mv -f $(docdir)/cpp.1.T$$$$ $(docdir)/cpp.1) || \
- (rm -f $(docdir)/cpp.1.T$$$$ && exit 1)
+$(docobjdir)/cpp.1: $(docobjdir)/cpp.texi $(docobjdir)/cppenv.texi \
+ $(docobjdir)/cppopts.texi
+ $(STAMP) $(docobjdir)/cpp.1
+ -$(TEXI2POD) $(docobjdir)/cpp.texi > cpp.pod
+ -($(POD2MAN) --section=1 cpp.pod > $(docobjdir)/cpp.1.T$$$$ && \
+ mv -f $(docobjdir)/cpp.1.T$$$$ $(docobjdir)/cpp.1) || \
+ (rm -f $(docobjdir)/cpp.1.T$$$$ && exit 1)
-rm -f cpp.pod
-$(docdir)/gcc.1: $(docdir)/invoke.texi $(docdir)/cppenv.texi \
- $(docdir)/cppopts.texi
- $(STAMP) $(docdir)/gcc.1
- -$(TEXI2POD) $(docdir)/invoke.texi > gcc.pod
- -($(POD2MAN) --section=1 gcc.pod > $(docdir)/gcc.1.T$$$$ && \
- mv -f $(docdir)/gcc.1.T$$$$ $(docdir)/gcc.1) || \
- (rm -f $(docdir)/gcc.1.T$$$$ && exit 1)
+$(docobjdir)/gcc.1: $(docobjdir)/invoke.texi $(docobjdir)/cppenv.texi \
+ $(docobjdir)/cppopts.texi
+ $(STAMP) $(docobjdir)/gcc.1
+ -$(TEXI2POD) $(docobjdir)/invoke.texi > gcc.pod
+ -($(POD2MAN) --section=1 gcc.pod > $(docobjdir)/gcc.1.T$$$$ && \
+ mv -f $(docobjdir)/gcc.1.T$$$$ $(docobjdir)/gcc.1) || \
+ (rm -f $(docobjdir)/gcc.1.T$$$$ && exit 1)
-rm -f gcc.pod
-$(docdir)/gfdl.7: $(docdir)/include/fdl.texi
- $(STAMP) $(docdir)/gfdl.7
- -$(TEXI2POD) $(docdir)/include/fdl.texi > gfdl.pod
- -($(POD2MAN) --section=7 gfdl.pod > $(docdir)/gfdl.7.T$$$$ && \
- mv -f $(docdir)/gfdl.7.T$$$$ $(docdir)/gfdl.7) || \
- (rm -f $(docdir)/gfdl.7.T$$$$ && exit 1)
+$(docobjdir)/gfdl.7: $(docobjdir)/include/fdl.texi
+ $(STAMP) $(docobjdir)/gfdl.7
+ -$(TEXI2POD) $(docobjdir)/include/fdl.texi > gfdl.pod
+ -($(POD2MAN) --section=7 gfdl.pod > $(docobjdir)/gfdl.7.T$$$$ && \
+ mv -f $(docobjdir)/gfdl.7.T$$$$ $(docobjdir)/gfdl.7) || \
+ (rm -f $(docobjdir)/gfdl.7.T$$$$ && exit 1)
-rm -f gfdl.pod
-$(docdir)/gpl.7: $(docdir)/include/gpl.texi
- $(STAMP) $(docdir)/gpl.7
- -$(TEXI2POD) $(docdir)/include/gpl.texi > gpl.pod
- -($(POD2MAN) --section=7 gpl.pod > $(docdir)/gpl.7.T$$$$ && \
- mv -f $(docdir)/gpl.7.T$$$$ $(docdir)/gpl.7) || \
- (rm -f $(docdir)/gpl.7.T$$$$ && exit 1)
+$(docobjdir)/gpl.7: $(docobjdir)/include/gpl.texi
+ $(STAMP) $(docobjdir)/gpl.7
+ -$(TEXI2POD) $(docobjdir)/include/gpl.texi > gpl.pod
+ -($(POD2MAN) --section=7 gpl.pod > $(docobjdir)/gpl.7.T$$$$ && \
+ mv -f $(docobjdir)/gpl.7.T$$$$ $(docobjdir)/gpl.7) || \
+ (rm -f $(docobjdir)/gpl.7.T$$$$ && exit 1)
-rm -f gpl.pod
-$(docdir)/fsf-funding.7: $(docdir)/include/funding.texi
- $(STAMP) $(docdir)/fsf-funding.7
- -$(TEXI2POD) $(docdir)/include/funding.texi > fsf-funding.pod
+$(docobjdir)/fsf-funding.7: $(docobjdir)/include/funding.texi
+ $(STAMP) $(docobjdir)/fsf-funding.7
+ -$(TEXI2POD) $(docobjdir)/include/funding.texi > fsf-funding.pod
-($(POD2MAN) --section=7 fsf-funding.pod \
- > $(docdir)/fsf-funding.7.T$$$$ && \
- mv -f $(docdir)/fsf-funding.7.T$$$$ $(docdir)/fsf-funding.7) || \
- (rm -f $(docdir)/fsf-funding.7.T$$$$ && exit 1)
+ > $(docobjdir)/fsf-funding.7.T$$$$ && \
+ mv -f $(docobjdir)/fsf-funding.7.T$$$$ $(docobjdir)/fsf-funding.7) || \
+ (rm -f $(docobjdir)/fsf-funding.7.T$$$$ && exit 1)
-rm -f fsf-funding.pod
#
@@ -2941,10 +2942,10 @@
-rm -f c-parse.y c-parse.c c-parse.output TAGS
-rm -f cpp.??s cpp.*aux
-rm -f gcc.??s gcc.*aux
- -rm -f $(docdir)/cpp.info* $(docdir)/gcc.info* $(docdir)/gccint.info*
- -rm -f $(docdir)/cppinternals.info*
- -rm -f $(docdir)/gcov.1 $(docdir)/cpp.1 $(docdir)/gcc.1
- -rm -f $(docdir)/fsf-funding.7 $(docdir)/gfdl.7 $(docdir)/gpl.7
+ -rm -f $(docobjdir)/cpp.info* $(docobjdir)/gcc.info* $(docobjdir)/gccint.info*
+ -rm -f $(docobjdir)/cppinternals.info*
+ -rm -f $(docobjdir)/gcov.1 $(docobjdir)/cpp.1 $(docobjdir)/gcc.1
+ -rm -f $(docobjdir)/fsf-funding.7 $(docobjdir)/gfdl.7 $(docobjdir)/gpl.7
#
# Entry points `install' and `uninstall'.
# Also use `install-collect2' to install collect2 when the config files don't.
@@ -3081,9 +3082,9 @@
install-info: doc installdirs lang.install-info
-rm -f $(infodir)/cpp.info* $(infodir)/gcc.info*
-rm -f $(infodir)/cppinternals.info* $(infodir)/gccint.info*
- if [ -f $(docdir)/gcc.info ]; then \
- for f in $(docdir)/cpp.info* $(docdir)/gcc.info* \
- $(docdir)/cppinternals.info* $(docdir)/gccint.info*; do \
+ if [ -f $(docobjdir)/gcc.info ]; then \
+ for f in $(docobjdir)/cpp.info* $(docobjdir)/gcc.info* \
+ $(docobjdir)/cppinternals.info* $(docobjdir)/gccint.info*; do \
realfile=`echo $$f | sed -e 's|.*/\([^/]*\)$$|\1|'`; \
$(INSTALL_DATA) $$f $(infodir)/$$realfile; \
done; \
@@ -3104,43 +3105,37 @@
install-man: installdirs $(GENERATED_MANPAGES) lang.install-man
-if [ -f gcc-cross$(exeext) ] ; then \
rm -f $(man1dir)/$(GCC_CROSS_NAME)$(man1ext); \
- $(INSTALL_DATA) $(docdir)/gcc.1 $(man1dir)/$(GCC_CROSS_NAME)$(man1ext); \
+ $(INSTALL_DATA) $(docobjdir)/gcc.1 $(man1dir)/$(GCC_CROSS_NAME)$(man1ext); \
chmod a-x $(man1dir)/$(GCC_CROSS_NAME)$(man1ext); \
else \
rm -f $(man1dir)/$(GCC_INSTALL_NAME)$(man1ext); \
- $(INSTALL_DATA) $(docdir)/gcc.1 $(man1dir)/$(GCC_INSTALL_NAME)$(man1ext); \
+ $(INSTALL_DATA) $(docobjdir)/gcc.1 $(man1dir)/$(GCC_INSTALL_NAME)$(man1ext);
\
chmod a-x $(man1dir)/$(GCC_INSTALL_NAME)$(man1ext); \
fi
-rm -f $(man1dir)/cpp$(man1ext)
- -$(INSTALL_DATA) $(docdir)/cpp.1 $(man1dir)/cpp$(man1ext)
+ -$(INSTALL_DATA) $(docobjdir)/cpp.1 $(man1dir)/cpp$(man1ext)
-chmod a-x $(man1dir)/cpp$(man1ext)
-rm -f $(man1dir)/gcov$(man1ext)
- -$(INSTALL_DATA) $(docdir)/gcov.1 $(man1dir)/gcov$(man1ext)
+ -$(INSTALL_DATA) $(docobjdir)/gcov.1 $(man1dir)/gcov$(man1ext)
-chmod a-x $(man1dir)/gcov$(man1ext)
-rm -f $(man7dir)/fsf-funding$(man7ext)
- -$(INSTALL_DATA) $(docdir)/fsf-funding.7 $(man7dir)/fsf-funding$(man7ext)
+ -$(INSTALL_DATA) $(docobjdir)/fsf-funding.7 $(man7dir)/fsf-funding$(man7ext)
-chmod a-x $(man7dir)/fsf-funding$(man7ext)
-rm -f $(man7dir)/gfdl$(man7ext)
- -$(INSTALL_DATA) $(docdir)/gfdl.7 $(man7dir)/gfdl$(man7ext)
+ -$(INSTALL_DATA) $(docobjdir)/gfdl.7 $(man7dir)/gfdl$(man7ext)
-chmod a-x $(man7dir)/gfdl$(man7ext)
-rm -f $(man7dir)/gpl$(man7ext)
- -$(INSTALL_DATA) $(docdir)/gpl.7 $(man7dir)/gpl$(man7ext)
+ -$(INSTALL_DATA) $(docobjdir)/gpl.7 $(man7dir)/gpl$(man7ext)
-chmod a-x $(man7dir)/gpl$(man7ext)
# 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)" \
@@ -3148,25 +3143,19 @@
LIB1ASMSRC='$(LIB1ASMSRC)' \
MAKEOVERRIDES= \
INSTALL_DATA="$(INSTALL_DATA)" \
- RANLIB_FOR_TARGET="$$r_f_t" \
+ RANLIB_FOR_TARGET="$(RANLIB_FOR_TARGET)" \
libsubdir="$(libsubdir)" \
slibdir="$(slibdir)" \
-f libgcc.mk install
# 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)" \
@@ -3174,7 +3163,7 @@
LIB1ASMSRC='$(LIB1ASMSRC)' \
MAKEOVERRIDES= \
INSTALL_DATA="$(INSTALL_DATA)" \
- RANLIB_FOR_TARGET="$$r_f_t" \
+ RANLIB_FOR_TARGET="$(RANLIB_FOR_TARGET)" \
libsubdir="$(libsubdir)" \
slibdir="$(slibdir)" \
-f libgcc.mk install
@@ -3775,13 +3764,10 @@
-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; \
@@ -3804,13 +3790,10 @@
-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; \
@@ -3833,13 +3816,10 @@
-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; \
@@ -3862,13 +3842,10 @@
-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.38 +2 -2 src/live/gcc3/gcc/ggc-page.c
Index: ggc-page.c
===================================================================
RCS file: /cvs/Darwin/src/live/gcc3/gcc/ggc-page.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- ggc-page.c 2003/01/08 20:10:51 1.37
+++ ggc-page.c 2003/01/11 02:42:52 1.38
@@ -1603,10 +1603,10 @@
/* Avoid frequent unnecessary work by skipping collection if the
total allocations haven't expanded much since the last
collection. */
- size_t allocated_last_gc =
+ float allocated_last_gc =
MAX (G.allocated_last_gc, (size_t)PARAM_VALUE (GGC_MIN_HEAPSIZE) * 1024);
- size_t min_expand = allocated_last_gc * PARAM_VALUE (GGC_MIN_EXPAND) / 100;
+ float min_expand = allocated_last_gc * PARAM_VALUE (GGC_MIN_EXPAND) / 100;
/* APPLE LOCAL begin pfe */
#ifdef DISABLE_PFE_GC
1.19 +3 -7 src/live/gcc3/gcc/mklibgcc.in
Index: mklibgcc.in
===================================================================
RCS file: /cvs/Darwin/src/live/gcc3/gcc/mklibgcc.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- mklibgcc.in 2002/10/24 23:43:03 1.18
+++ mklibgcc.in 2003/01/11 02:42:53 1.19
@@ -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.
@@ -413,9 +413,7 @@
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
@@ -423,9 +421,7 @@
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
1.168 +3 -1 src/live/gcc3/gcc/toplev.c
Index: toplev.c
===================================================================
RCS file: /cvs/Darwin/src/live/gcc3/gcc/toplev.c,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- toplev.c 2002/12/18 00:31:56 1.167
+++ toplev.c 2003/01/11 02:42:53 1.168
@@ -1,6 +1,6 @@
/* Top level of GNU C compiler
Copyright (C) 1987, 1988, 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
- 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+ 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
This file is part of GCC.
@@ -1438,6 +1438,8 @@
{ "-Wimport",
N_("Warn about the use of the #import directive") },
{ "-Wno-import", "" },
+ { "-Winvalid-pch",
+ N_("Warn about PCH files that are found but not used") },
{ "-Wlong-long","" },
{ "-Wno-long-long",
N_("Do not warn about using 'long long' when -pedantic") },
1.84 +1 -4 src/live/gcc3/gcc/varasm.c
Index: varasm.c
===================================================================
RCS file: /cvs/Darwin/src/live/gcc3/gcc/varasm.c,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- varasm.c 2002/12/18 00:31:57 1.83
+++ varasm.c 2003/01/11 02:42:53 1.84
@@ -1,6 +1,6 @@
/* Output variables, constants and external declarations, for GNU compiler.
Copyright (C) 1987, 1988, 1989, 1992, 1993, 1994, 1995, 1996, 1997,
- 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+ 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
This file is part of GCC.
@@ -2985,9 +2985,6 @@
{
/* More constant_descriptors with the same hash code. */
struct constant_descriptor_rtx *next;
-
- /* The label of the constant. */
- const char *label;
/* A MEM for the constant. */
rtx rtl;
1.5 +1 -0 src/live/gcc3/gcc/config/i386/x-darwin
Index: x-darwin
===================================================================
RCS file: /cvs/Darwin/src/live/gcc3/gcc/config/i386/x-darwin,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- x-darwin 2002/09/02 03:49:59 1.4
+++ x-darwin 2003/01/11 02:42:55 1.5
@@ -8,4 +8,5 @@
# APPLE LOCAL begin parsedir
# Do not modify $(srcdir).
parsedir = .
+docobjdir = .
# APPLE LOCAL end parsedir
1.8 +1 -0 src/live/gcc3/gcc/config/rs6000/x-darwin
Index: x-darwin
===================================================================
RCS file: /cvs/Darwin/src/live/gcc3/gcc/config/rs6000/x-darwin,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- x-darwin 2002/08/03 05:28:31 1.7
+++ x-darwin 2003/01/11 02:42:55 1.8
@@ -8,4 +8,5 @@
# APPLE LOCAL begin parsedir
# Do not modify $(srcdir).
parsedir = .
+docobjdir = .
# APPLE LOCAL end parsedir
1.37 +0 -5 src/live/gcc3/gcc/objc/Make-lang.in
Index: Make-lang.in
===================================================================
RCS file: /cvs/Darwin/src/live/gcc3/gcc/objc/Make-lang.in,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- Make-lang.in 2002/09/26 21:14:08 1.36
+++ Make-lang.in 2003/01/11 02:42:55 1.37
@@ -84,7 +84,6 @@
$(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) -I$(srcdir)/objc \
-c $(srcdir)/objc/objc-lang.c $(OUTPUT_OPTION)
-# APPLE LOCAL parsedir
# APPLE LOCAL separate outputdir
objc/objc-parse.o : $(parsedir)/objc/objc-parse.c \
$(CONFIG_H) $(TREE_H) $(C_COMMON_H) $(srcdir)/toplev.h $(srcdir)/ggc.h \
@@ -94,10 +93,8 @@
$(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) -I$(srcdir)/objc \
-c $(parsedir)/objc/objc-parse.c $(OUTPUT_OPTION)
-# APPLE LOCAL parsedir
po-generated: $(parsedir)/objc/objc-parse.c
-# APPLE LOCAL parsedir
$(parsedir)/objc/objc-parse.c : $(parsedir)/objc/objc-parse.y
cd $(parsedir)/objc; \
if $(BISON) $(BISONFLAGS) -o op$$$$.c objc-parse.y ; then \
@@ -108,7 +105,6 @@
false ; \
fi
-# APPLE LOCAL parsedir
$(parsedir)/objc/objc-parse.y: c-parse.in
echo '/*WARNING: This file is automatically generated!*/' >tmp-objc-prs.y
sed -e "/^ifc$$/,/^end ifc$$/d" \
@@ -201,7 +197,6 @@
-rm -f objc/config.status objc/config.cache
-rm -f objc-parse.output
objc.extraclean:
-# APPLE LOCAL: parsedir
objc.maintainer-clean:
-rm -f $(parsedir)/objc/objc-parse.y
-rm -f $(parsedir)/objc/objc-parse.c $(parsedir)/objc/objc-parse.output
