Makefile.in (xcpp, cppspec.o): New targets.
* Makefile.in (xcpp, cppspec.o): New targets.
(CPP_INSTALL_NAME): New macro.
(install-cpp): Install xcpp. Use CPP_INSTALL_NAME.
(all.build, start.encap): Build xcpp.
* cppspec.c: New file, implements argument filtering for a
user-visible C preprocessor.
* cpp.sh: Removed.
From-SVN: r26007
This commit is contained in:
Zack Weinberg
Jeff Law
parent
11a86c5688
commit
922cf99e6d
@ -1,3 +1,14 @@
|
||||
1999-03-26 Zack Weinberg <zack@rabi.columbia.edu>
|
||||
|
||||
* Makefile.in (xcpp, cppspec.o): New targets.
|
||||
(CPP_INSTALL_NAME): New macro.
|
||||
(install-cpp): Install xcpp. Use CPP_INSTALL_NAME.
|
||||
(all.build, start.encap): Build xcpp.
|
||||
|
||||
* cppspec.c: New file, implements argument filtering for a
|
||||
user-visible C preprocessor.
|
||||
* cpp.sh: Removed.
|
||||
|
||||
Fri Mar 26 20:41:46 1999 Jim Wilson <wilson@cygnus.com>
|
||||
|
||||
* Makefile.in (stmp-fixinc): Use tooldir instead of gcc_tooldir.
|
||||
|
||||
@ -473,6 +473,7 @@ HOST_DOPRINT=$(DOPRINT)
|
||||
|
||||
# Actual name to use when installing a native compiler.
|
||||
GCC_INSTALL_NAME = `t='$(program_transform_name)'; echo gcc | sed -e $$t`
|
||||
CPP_INSTALL_NAME = `t='$(program_transform_name)'; echo cpp | sed -e $$t`
|
||||
PROTOIZE_INSTALL_NAME = `t='$(program_transform_name)'; echo protoize | sed -e $$t`
|
||||
UNPROTOIZE_INSTALL_NAME = `t='$(program_transform_name)'; echo unprotoize | sed -e $$t`
|
||||
GCOV_INSTALL_NAME = `t='$(program_transform_name)'; echo gcov | sed -e $$t`
|
||||
@ -700,7 +701,7 @@ STAGESTUFF = *$(objext) insn-flags.h insn-config.h insn-codes.h \
|
||||
genconfig$(build_exeext) genpeep$(build_exeext) genattrtab$(build_exeext) \
|
||||
genattr$(build_exeext) genopinit$(build_exeext) gengenrtl$(build_exeext) \
|
||||
gencheck$(build_exeext) \
|
||||
xgcc$(exeext) cc1$(exeext) cpp$(exeext) $(EXTRA_PASSES) \
|
||||
xgcc$(exeext) xcpp$(exeext) cc1$(exeext) cpp$(exeext) $(EXTRA_PASSES) \
|
||||
$(EXTRA_PARTS) $(EXTRA_PROGRAMS) gcc-cross$(exeext) \
|
||||
$(CCCP)$(exeext) cc1obj$(exeext) enquire$(exeext) \
|
||||
protoize$(exeext) unprotoize$(exeext) \
|
||||
@ -836,9 +837,10 @@ all.internal: start.encap rest.encap doc
|
||||
all.cross: native gcc-cross specs stmp-headers $(STMP_FIXPROTO) $(LIBGCC) \
|
||||
$(LIBGCC1_TEST) $(EXTRA_PARTS) lang.all.cross doc
|
||||
# This is what to compile if making gcc with a cross-compiler.
|
||||
all.build: native xgcc$(exeext) $(EXTRA_PARTS) lang.all.build
|
||||
all.build: native xgcc$(exeext) xcpp$(exeext) $(EXTRA_PARTS) lang.all.build
|
||||
# This is what must be made before installing GCC and converting libraries.
|
||||
start.encap: native xgcc$(exeext) specs $(LIBGCC1) xlimits.h lang.start.encap
|
||||
start.encap: native xgcc$(exeext) xcpp$(exeext) specs $(LIBGCC1) \
|
||||
xlimits.h lang.start.encap
|
||||
# These can't be made until after GCC can run.
|
||||
rest.encap: stmp-headers $(STMP_FIXPROTO) $(LIBGCC) $(EXTRA_PARTS) lang.rest.encap
|
||||
# This is what is made with the host's compiler
|
||||
@ -883,6 +885,16 @@ xgcc$(exeext): gcc.o gccspec.o version.o intl.o prefix.o \
|
||||
$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ gcc.o gccspec.o intl.o \
|
||||
prefix.o version.o $(EXTRA_GCC_OBJS) $(LIBS)
|
||||
|
||||
# We call this executable `xcpp' rather than `cpp'
|
||||
# since the real preprocessor is named `cpp'. It too is renamed
|
||||
# when it is installed.
|
||||
# The only difference from xgcc is that it's linked with cppspec.o
|
||||
# instead of gccspec.o.
|
||||
xcpp$(exeext): gcc.o cppspec.o version.o intl.o prefix.o \
|
||||
version.o $(LIBDEPS) $(EXTRA_GCC_OBJS)
|
||||
$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ gcc.o cppspec.o intl.o \
|
||||
prefix.o version.o $(EXTRA_GCC_OBJS) $(LIBS)
|
||||
|
||||
# Dump a specs file to make -B./ read these specs over installed ones.
|
||||
specs: xgcc$(exeext)
|
||||
$(GCC_FOR_TARGET) -dumpspecs > tmp-specs
|
||||
@ -1398,6 +1410,7 @@ gcc.o: gcc.c $(CONFIG_H) system.h intl.h multilib.h \
|
||||
-c `echo $(srcdir)/gcc.c | sed 's,^\./,,'`
|
||||
|
||||
gccspec.o: gccspec.c $(CONFIG_H) system.h
|
||||
cppspec.o: cppspec.c $(CONFIG_H) system.h
|
||||
|
||||
tree-check.h: s-check ; @true
|
||||
s-check : gencheck $(srcdir)/move-if-change
|
||||
@ -2416,12 +2429,12 @@ install-build: force
|
||||
install-cross-rest: install-float-h-cross
|
||||
|
||||
# Handle cpp installation.
|
||||
install-cpp: cpp.sh
|
||||
-rm -f $(bindir)/cpp
|
||||
$(INSTALL_PROGRAM) -m 755 cpp.sh $(bindir)/cpp
|
||||
install-cpp: xcpp$(exeext)
|
||||
-rm -f $(bindir)/$(CPP_INSTALL_NAME)$(exeext)
|
||||
$(INSTALL_PROGRAM) -m 755 xcpp$(exeext) $(bindir)/$(CPP_INSTALL_NAME)$(exeext)
|
||||
if [ x$(cpp_install_dir) != x ]; then \
|
||||
rm -f $(prefix)/$(cpp_install_dir)/cpp; \
|
||||
$(INSTALL_PROGRAM) -m 755 cpp.sh $(prefix)/$(cpp_install_dir)/cpp; \
|
||||
rm -f $(prefix)/$(cpp_install_dir)/$(CPP_INSTALL_NAME)$(exeext); \
|
||||
$(INSTALL_PROGRAM) -m 755 xcpp$(exeext) $(prefix)/$(cpp_install_dir)/$(CPP_INSTALL_NAME)$(exeext); \
|
||||
else true; fi
|
||||
|
||||
uninstall-cpp:
|
||||
|
||||
@ -1,2 +0,0 @@
|
||||
#! /bin/sh
|
||||
exec `gcc -print-prog-name=cpp` ${1+"$@"}
|
||||
225
gcc/cppspec.c
Normal file
225
gcc/cppspec.c
Normal file
@ -0,0 +1,225 @@
|
||||
/* Specific flags and argument handling of the C preprocessor.
|
||||
Copyright (C) 1999 Free Software Foundation, Inc.
|
||||
|
||||
This file is part of GNU CC.
|
||||
|
||||
GNU CC is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2, or (at your option)
|
||||
any later version.
|
||||
|
||||
GNU CC is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with GNU CC; see the file COPYING. If not, write to
|
||||
the Free Software Foundation, 59 Temple Place - Suite 330,
|
||||
Boston, MA 02111-1307, USA. */
|
||||
|
||||
#include "config.h"
|
||||
#include "system.h"
|
||||
|
||||
/* The `cpp' executable installed in $(bindir) and $(cpp_install_dir)
|
||||
is a customized version of the gcc driver. It forces -E; -S and -c
|
||||
are errors. It defaults to -x c for files with unrecognized
|
||||
extensions, unless -x options appear in argv, in which case we
|
||||
assume the user knows what they're doing. If no explicit input is
|
||||
mentioned, it will read stdin. */
|
||||
|
||||
/* Snarfed from gcc.c: */
|
||||
|
||||
/* This defines which switch letters take arguments. */
|
||||
|
||||
#define DEFAULT_SWITCH_TAKES_ARG(CHAR) \
|
||||
((CHAR) == 'D' || (CHAR) == 'U' || (CHAR) == 'o' \
|
||||
|| (CHAR) == 'e' || (CHAR) == 'T' || (CHAR) == 'u' \
|
||||
|| (CHAR) == 'I' || (CHAR) == 'm' || (CHAR) == 'x' \
|
||||
|| (CHAR) == 'L' || (CHAR) == 'A' || (CHAR) == 'V' \
|
||||
|| (CHAR) == 'B' || (CHAR) == 'b')
|
||||
|
||||
#ifndef SWITCH_TAKES_ARG
|
||||
#define SWITCH_TAKES_ARG(CHAR) DEFAULT_SWITCH_TAKES_ARG(CHAR)
|
||||
#endif
|
||||
|
||||
/* This defines which multi-letter switches take arguments. */
|
||||
|
||||
#define DEFAULT_WORD_SWITCH_TAKES_ARG(STR) \
|
||||
(!strcmp (STR, "Tdata") || !strcmp (STR, "Ttext") \
|
||||
|| !strcmp (STR, "Tbss") || !strcmp (STR, "include") \
|
||||
|| !strcmp (STR, "imacros") || !strcmp (STR, "aux-info") \
|
||||
|| !strcmp (STR, "idirafter") || !strcmp (STR, "iprefix") \
|
||||
|| !strcmp (STR, "iwithprefix") || !strcmp (STR, "iwithprefixbefore") \
|
||||
|| !strcmp (STR, "isystem") || !strcmp (STR, "specs"))
|
||||
|
||||
#ifndef WORD_SWITCH_TAKES_ARG
|
||||
#define WORD_SWITCH_TAKES_ARG(STR) DEFAULT_WORD_SWITCH_TAKES_ARG (STR)
|
||||
#endif
|
||||
|
||||
/* Suffixes for known sorts of input files. We let gcc.c worry about
|
||||
which are appropriate preprocessor input. */
|
||||
static const char *const known_suffixes[] =
|
||||
{
|
||||
".c", ".C", ".s", ".S", ".m",
|
||||
".cc", ".cxx", ".cpp", ".cp", ".c++",
|
||||
".i", ".ii", ".mi", ".o", ".a",
|
||||
NULL
|
||||
};
|
||||
|
||||
/* Filter argc and argv before processing by the gcc driver proper. */
|
||||
void
|
||||
lang_specific_driver (errfn, in_argc, in_argv, in_added_libraries)
|
||||
void (*errfn) PVPROTO((const char *, ...));
|
||||
int *in_argc;
|
||||
char ***in_argv;
|
||||
int *in_added_libraries ATTRIBUTE_UNUSED;
|
||||
{
|
||||
int argc = *in_argc;
|
||||
char **argv = *in_argv;
|
||||
|
||||
/* Do we need to read stdin? */
|
||||
int read_stdin;
|
||||
|
||||
/* Do we need to insert -E? */
|
||||
int need_E;
|
||||
|
||||
/* Do we need to fixup files with unrecognized suffixes? */
|
||||
int need_fixups;
|
||||
|
||||
/* Table of input files with unrecognized suffixes. */
|
||||
char *urs_tab;
|
||||
int urs_count;
|
||||
int urs_block;
|
||||
|
||||
int i, j, quote;
|
||||
char **new_argv;
|
||||
int new_argc;
|
||||
|
||||
/* First pass. If we see an -S or -c, barf. If we see an input file,
|
||||
turn off read_stdin, and if it has an unrecognizable suffix, mark
|
||||
it for fixup. */
|
||||
urs_tab = xmalloc (argc);
|
||||
memset (urs_tab, 0, argc);
|
||||
urs_count = 0;
|
||||
urs_block = 0;
|
||||
quote = 0;
|
||||
read_stdin = 1;
|
||||
need_E = 1;
|
||||
need_fixups = 1;
|
||||
for (i = 1; i < argc; i++)
|
||||
{
|
||||
if (quote == 1)
|
||||
{
|
||||
quote = 0;
|
||||
continue;
|
||||
}
|
||||
|
||||
if (argv[i][0] == '-')
|
||||
{
|
||||
if (argv[i][1] == '\0')
|
||||
read_stdin = 0;
|
||||
else if (argv[i][2] == '\0')
|
||||
{
|
||||
if (argv[i][1] == 'E')
|
||||
need_E = 0;
|
||||
else if (argv[i][1] == 'S' || argv[i][1] == 'c')
|
||||
{
|
||||
(*errfn) ("`%s' is not a legal option to the preprocessor",
|
||||
argv[i]);
|
||||
goto done;
|
||||
}
|
||||
else if (argv[i][1] == 'x')
|
||||
{
|
||||
need_fixups = 0;
|
||||
quote = 1;
|
||||
}
|
||||
else if (SWITCH_TAKES_ARG (argv[i][1]))
|
||||
quote = 1;
|
||||
}
|
||||
else if (argv[i][1] == 'x')
|
||||
need_fixups = 0;
|
||||
else if (WORD_SWITCH_TAKES_ARG (&argv[i][1]))
|
||||
quote = 1;
|
||||
}
|
||||
else /* not an option */
|
||||
{
|
||||
int l = strlen (argv[i]);
|
||||
int known = 0;
|
||||
const char **suff;
|
||||
|
||||
read_stdin = 0;
|
||||
for (suff = known_suffixes; *suff; suff++)
|
||||
if (!strcmp (*suff, &argv[i][l - strlen(*suff)]))
|
||||
{
|
||||
known = 1;
|
||||
break;
|
||||
}
|
||||
|
||||
if (known)
|
||||
{
|
||||
if (urs_block)
|
||||
{
|
||||
urs_block = 0;
|
||||
urs_tab[i] = 2;
|
||||
urs_count++;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (!urs_block)
|
||||
{
|
||||
urs_block = 1;
|
||||
urs_tab[i] = 1;
|
||||
urs_count++;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* If we were given an -E option and an input file, and no input
|
||||
files have unrecognized suffixes, we can bail early. */
|
||||
if (!need_E && !read_stdin && (!need_fixups || urs_count == 0))
|
||||
goto done;
|
||||
|
||||
new_argc = argc + need_E + read_stdin + (need_fixups ? urs_count : 0);
|
||||
new_argv = xmalloc (new_argc * sizeof(char *));
|
||||
|
||||
new_argv[0] = argv[0];
|
||||
if (need_E)
|
||||
{
|
||||
new_argv[1] = "-E";
|
||||
j = 2;
|
||||
}
|
||||
else
|
||||
j = 1;
|
||||
|
||||
if (need_fixups)
|
||||
for (i = 1; i < argc; i++, j++)
|
||||
{
|
||||
if (urs_tab[i])
|
||||
new_argv[j++] = (urs_tab[i] == 1) ? "-xc" : "-xnone";
|
||||
|
||||
new_argv[j] = argv[i];
|
||||
}
|
||||
else
|
||||
memcpy (&new_argv[j], &argv[1], (argc - 1)*sizeof (char *));
|
||||
|
||||
if (read_stdin)
|
||||
new_argv[j] = "-";
|
||||
|
||||
*in_argc = new_argc;
|
||||
*in_argv = new_argv;
|
||||
|
||||
done:
|
||||
free (urs_tab);
|
||||
}
|
||||
|
||||
/* Called before linking. Returns 0 on success and -1 on failure. */
|
||||
int lang_specific_pre_link ()
|
||||
{
|
||||
return 0; /* Not used for cpp. */
|
||||
}
|
||||
|
||||
/* Number of extra output files that lang_specific_pre_link may generate. */
|
||||
int lang_specific_extra_outfiles = 0; /* Not used for cpp. */
|
||||
Loading…
Reference in New Issue
Block a user