OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Makefile.in (LIBCPP_OBJS): Take out version.o.

Browse Source 
* Makefile.in (LIBCPP_OBJS): Take out version.o.
	* cpphash.h (cpp_reader): Take out print_version member.
	* cppinit.c: (cpp_handle_option): Don't do anything with
	-version.  Just set help_only for --version, --target-help.
	Just set verbose option for -v.
	(cpp_post_options): Don't print a version string.

From-SVN: r54390
This commit is contained in:
Zack Weinberg 2002-06-09 00:26:31 +00:00
parent c16e5a3596
commit 5a9ee62387
4 changed files with 22 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gcc/ChangeLog
View File

@ -1,3 +1,12 @@
2002-06-08 Zack Weinberg <zack@codesourcery.com>
* Makefile.in (LIBCPP_OBJS): Take out version.o.
* cpphash.h (cpp_reader): Take out print_version member.
* cppinit.c: (cpp_handle_option): Don't do anything with
-version. Just set help_only for --version, --target-help.
Just set verbose option for -v.
(cpp_post_options): Don't print a version string.
2002-06-08 Marek Michalkiewicz <marekm@amelek.gda.pl>
* config/avr/avr.c (TARGET_SECTION_TYPE_FLAGS): New.
@ -40,6 +49,7 @@
(SUBTARGET_EXTRA_SPECS): Add netbsd_link_spec and netbsd_entry_point.
2002-06-08 Marc Espie <espie@openbsd.org>
* lists.c (free_list): Fix typo in comment.
2002-06-08 Andreas Jaeger <aj@suse.de>

2
gcc/Makefile.in
View File

@ -2072,7 +2072,7 @@ PREPROCESSOR_DEFINES = \
LIBCPP_OBJS = cpplib.o cpplex.o cppmacro.o cppexp.o cppfiles.o cpptrad.o \
cpphash.o cpperror.o cppinit.o cppdefault.o cppmain.o \
hashtable.o line-map.o mkdeps.o prefix.o version.o mbchar.o
hashtable.o line-map.o mkdeps.o prefix.o mbchar.o
LIBCPP_DEPS = $(CPPLIB_H) cpphash.h line-map.h hashtable.h intl.h \
$(OBSTACK_H) $(SYSTEM_H)

4
gcc/cpphash.h
View File

@ -386,10 +386,6 @@ struct cpp_reader
preprocessor. */
struct spec_nodes spec_nodes;
/* Whether to print our version number. Done this way so
we don't get it twice for -v -version. */
unsigned char print_version;
/* Whether cpplib owns the hashtable. */
unsigned char our_hashtable;

27
gcc/cppinit.c
View File

@ -1211,7 +1211,6 @@ new_pending_directive (pend, text, handler)
DEF_OPT("traditional-cpp", 0, OPT_traditional_cpp) \
DEF_OPT("trigraphs", 0, OPT_trigraphs) \
DEF_OPT("v", 0, OPT_v) \
DEF_OPT("version", 0, OPT_version) \
DEF_OPT("w", 0, OPT_w)
#define DEF_OPT(text, msg, code) code,
@ -1389,26 +1388,15 @@ cpp_handle_option (pfile, argc, argv)
case OPT_h:
case OPT__help:
print_help ();
CPP_OPTION (pfile, help_only) = 1;
break;
/* fall through */
case OPT_target__help:
/* Print if any target specific options. cpplib has none, but
make sure help_only gets set. */
CPP_OPTION (pfile, help_only) = 1;
break;
/* --version inhibits compilation, -version doesn't. -v means
verbose and -version. Historical reasons, don't ask. */
case OPT__version:
/* Nothing to do for these cases, but we need to be sure
help_only is set. */
CPP_OPTION (pfile, help_only) = 1;
pfile->print_version = 1;
break;
case OPT_v:
CPP_OPTION (pfile, verbose) = 1;
pfile->print_version = 1;
break;
case OPT_version:
pfile->print_version = 1;
break;
case OPT_C:
@ -1771,15 +1759,6 @@ void
cpp_post_options (pfile)
cpp_reader *pfile;
{
if (pfile->print_version)
{
fprintf (stderr, _("GNU CPP version %s (cpplib)"), version_string);
#ifdef TARGET_VERSION
TARGET_VERSION;
#endif
fputc ('\n', stderr);
}
/* Canonicalize in_fname and out_fname. We guarantee they are not
NULL, and that the empty string represents stdin / stdout. */
if (CPP_OPTION (pfile, in_fname) == NULL