mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-18 04:00:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

configure (gcc_version): When setting, narrow search to lines containing `version_string'.

Browse Source 
* configure (gcc_version): When setting, narrow search to
	lines containing `version_string'.

gcc:
	* version.c: Include gansidecl.h and version.h.

	* version.h: Wrap entire file in macro __GCC_VERSION_H__.

	* configure.in (gcc_version): When setting, narrow search to
	lines containing `version_string'.

	* Makefile.in (mainversion): Likewise.
	(GCC_H): New variable.
	(gcc.h): Delete target.
	(gcc.o, gccspec.o, cppspec.o): Depend on $(GCC_H), not gcc.h.
	(version.o): Depend on version.h.
	(dbxout.o): Don't depend on gcc.h.

gcc/cp:
	* Make-lang.in (g++spec.o): Depend on $(GCC_H), not gcc.h.

gcc/f:
	* Make-lang.in (g77spec.o): Depend on $(GCC_H), not gcc.h.

gcc/java:
	* Make-lang.in (jvspec.o): Depend on $(GCC_H), not gcc.h.

libf2c:
	* configure.in (gcc_version): When setting, narrow search to
	lines containing `version_string'.

From-SVN: r32009
This commit is contained in:
Kaveh R. Ghazi 2000-02-16 16:22:47 +00:00 committed by Kaveh Ghazi
parent 88a56c2eb1
commit 4746ee266f
17 changed files with 279 additions and 247 deletions

5
ChangeLog

@ -1,3 +1,8 @@
2000-02-16 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
* configure (gcc_version): When setting, narrow search to
lines containing `version_string'.
2000-02-15 Denis Chertykov <denisc@overta.ru>
* config.sub: Add support for avr target.

6
configure vendored

@ -86,7 +86,7 @@ subdirs=
target_alias=NOTARGET
target_makefile_frag=
undefs=NOUNDEFS
version="$Revision: 1.23 $"
version="$Revision: 1.24 $"
x11=default
bindir='${exec_prefix}/bin'
sbindir='${exec_prefix}/sbin'
@ -586,12 +586,12 @@ esac
# the gcc version number changes.
if [ "${with_gcc_version_trigger+set}" = set ]; then
gcc_version_trigger="$with_gcc_version_trigger"
gcc_version=`sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/' < ${with_gcc_version_trigger}`
gcc_version=`grep version_string ${with_gcc_version_trigger} | sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/'`
else
# If gcc's sources are available, define the trigger file.
if [ -f ${topsrcdir}/gcc/version.c ] ; then
gcc_version_trigger=${topsrcdir}/gcc/version.c
gcc_version=`sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/' < ${gcc_version_trigger}`
gcc_version=`grep version_string ${gcc_version_trigger} | sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/'`
case "$arguments" in
*--with-gcc-version-trigger=$gcc_version_trigger* )
;;

16
gcc/ChangeLog

@ -1,3 +1,19 @@
2000-02-16 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
* version.c: Include gansidecl.h and version.h.
* version.h: Wrap entire file in macro __GCC_VERSION_H__.
* configure.in (gcc_version): When setting, narrow search to
lines containing `version_string'.
* Makefile.in (mainversion): Likewise.
(GCC_H): New variable.
(gcc.h): Delete target.
(gcc.o, gccspec.o, cppspec.o): Depend on $(GCC_H), not gcc.h.
(version.o): Depend on version.h.
(dbxout.o): Don't depend on gcc.h.
Wed Feb 16 15:04:49 2000 Hans-Peter Nilsson <hp@bitrange.com>
Michael Meissner <meissner@cygnus.com>

15
gcc/Makefile.in

@ -244,7 +244,7 @@ GTHREAD_FLAGS=@gthread_flags@
gcc_version=@gcc_version@
gcc_version_trigger=@gcc_version_trigger@
version=$(gcc_version)
mainversion=`sed -e 's/.*\"\([0-9]*\.[0-9]*\).*/\1/' < $(srcdir)/version.c`
mainversion=`grep version_string $(srcdir)/version.c | sed -e 's/.*\"\([0-9]*\.[0-9]*\).*/\1/'`
# Common prefix for installation directories.
# NOTE: This directory must exist when you start installation.
@ -760,6 +760,7 @@ EXPR_H = expr.h insn-codes.h
REGS_H = regs.h varray.h $(MACHMODE_H)
INTEGRATE_H = integrate.h varray.h
LOOP_H = loop.h varray.h basic-block.h
GCC_H = gcc.h version.h
#
# Language makefile fragments.
@ -1413,8 +1414,6 @@ c-common.o : c-common.c $(CONFIG_H) system.h $(TREE_H) c-tree.h c-lex.h \
# Language-independent files.
gcc.h: version.h
DRIVER_DEFINES = \
-DSTANDARD_STARTFILE_PREFIX=\"$(unlibsubdir)/\" \
-DSTANDARD_EXEC_PREFIX=\"$(libdir)/gcc-lib/\" \
@ -1423,13 +1422,13 @@ DRIVER_DEFINES = \
-DSTANDARD_BINDIR_PREFIX=\"$(bindir)/\" \
-DTOOLDIR_BASE_PREFIX=\"$(unlibsubdir)/../\"
gcc.o: gcc.c $(CONFIG_H) system.h intl.h multilib.h \
Makefile $(lang_specs_files) prefix.h gcc.h
Makefile $(lang_specs_files) prefix.h $(GCC_H)
$(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
$(DRIVER_DEFINES) \
-c `echo $(srcdir)/gcc.c | sed 's,^\./,,'`
gccspec.o: gccspec.c $(CONFIG_H) system.h gcc.h
cppspec.o: cppspec.c $(CONFIG_H) system.h gcc.h
gccspec.o: gccspec.c $(CONFIG_H) system.h $(GCC_H)
cppspec.o: cppspec.c $(CONFIG_H) system.h $(GCC_H)
tree-check.h: s-check ; @true
s-check : gencheck $(srcdir)/move-if-change
@ -1448,7 +1447,7 @@ gencheck.o : gencheck.c gencheck.h tree.def $(CONFIG_H) hconfig.h system.h \
dumpvers: dumpvers.c
version.o: version.c
version.o: version.c version.h
ggc-common.o: ggc-common.c $(CONFIG_H) $(RTL_H) $(TREE_H) \
flags.h ggc.h varray.h hash.h
@ -1531,7 +1530,7 @@ optabs.o : optabs.c $(CONFIG_H) system.h $(RTL_H) $(TREE_H) flags.h \
toplev.h ggc.h real.h
dbxout.o : dbxout.c $(CONFIG_H) system.h $(TREE_H) $(RTL_H) flags.h $(REGS_H) \
insn-config.h reload.h gstab.h xcoffout.h defaults.h output.h dbxout.h \
toplev.h gcc.h
toplev.h
sdbout.o : sdbout.c $(CONFIG_H) system.h $(TREE_H) $(RTL_H) flags.h except.h \
function.h $(EXPR_H) output.h hard-reg-set.h $(REGS_H) defaults.h real.h \
insn-config.h $(srcdir)/../include/obstack.h xcoffout.h c-pragma.h \

449
gcc/configure vendored

File diff suppressed because it is too large Load Diff

2
gcc/configure.in

@ -4026,7 +4026,7 @@ else
gcc_version_trigger=${srcdir}/version.c
fi
changequote(,)dnl
gcc_version=`sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/' < ${gcc_version_trigger}`
gcc_version=`grep version_string ${gcc_version_trigger} | sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/'`
changequote([,])dnl
# Internationalization

4
gcc/cp/ChangeLog

@ -1,3 +1,7 @@
2000-02-16 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
* Make-lang.in (g++spec.o): Depend on $(GCC_H), not gcc.h.
2000-02-15 Jonathan Larmour <jlarmour@redhat.co.uk>
* lang-specs.h: Add new __GNUC_PATCHLEVEL__ define to default spec.

2
gcc/cp/Make-lang.in

@ -75,7 +75,7 @@ C++ c++: cc1plus$(exeext)
# Tell GNU make to ignore these if they exist.
.PHONY: C++ c++
g++spec.o: $(srcdir)/cp/g++spec.c system.h gcc.h
g++spec.o: $(srcdir)/cp/g++spec.c system.h $(GCC_H)
$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) $(srcdir)/cp/g++spec.c
$(INTL_TARGETS): $(srcdir)/cp/parse.c

4
gcc/f/ChangeLog

@ -1,3 +1,7 @@
Wed Feb 16 11:09:38 2000 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
* Make-lang.in (g77spec.o): Depend on $(GCC_H), not gcc.h.
2000-02-15 Jonathan Larmour <jlarmour@redhat.co.uk>
* lang-specs.h: Add new __GNUC_PATCHLEVEL__ define to default spec.

2
gcc/f/Make-lang.in

@ -59,7 +59,7 @@ F77 f77: f771$(exeext)
f77.extraclean f77.maintainer-clean f77.distdir f77.rebuilt \
f77.stage1 f77.stage2 f77.stage3 f77.stage4
g77spec.o: $(srcdir)/f/g77spec.c $(srcdir)/f/version.h system.h gcc.h
g77spec.o: $(srcdir)/f/g77spec.c $(srcdir)/f/version.h system.h $(GCC_H)
case "$(LANGUAGES)" in \
*[fF]77*) touch lang-f77;; \
*) rm -f lang-f77;; \

4
gcc/java/ChangeLog

@ -1,3 +1,7 @@
2000-02-16 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
* Make-lang.in (jvspec.o): Depend on $(GCC_H), not gcc.h.
2000-02-15 Tom Tromey <tromey@cygnus.com>
* gjavah.c (jni_print_char): New function.

2
gcc/java/Make-lang.in

@ -80,7 +80,7 @@ JAVA_SRCS = $(srcdir)/java/parse.y $(srcdir)/java/class.c \
jc1$(exeext): $(P) $(JAVA_SRCS) $(LIBDEPS) stamp-objlist ggc-callbacks.o
cd java; $(MAKE) $(FLAGS_TO_PASS) $(JAVA_FLAGS_TO_PASS) ../jc1$(exeext)
jvspec.o: $(srcdir)/java/jvspec.c system.h gcc.h
jvspec.o: $(srcdir)/java/jvspec.c system.h $(GCC_H)
$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) \
$(INCLUDES) $(srcdir)/java/jvspec.c

3
gcc/version.c

@ -1 +1,4 @@
#include "gansidecl.h"
#include "version.h"
const char *const version_string = "2.96 20000216 (experimental)";

3
gcc/version.h

@ -1 +1,4 @@
#ifndef __GCC_VERSION_H__
#define __GCC_VERSION_H__
extern const char *const version_string;
#endif /* __GCC_VERSION_H__ */

5
libf2c/ChangeLog

@ -1,3 +1,8 @@
Wed Feb 16 11:10:05 2000 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
* configure.in (gcc_version): When setting, narrow search to
lines containing `version_string'.
Tue Nov 16 20:39:42 1999 Geoffrey Keating <geoffk@cygnus.com>
* libU77/u77-test.f (wd): Allow for longer working directory

2
libf2c/configure vendored

@ -1231,7 +1231,7 @@ test -f libU77/makefile && mv libU77/makefile libU77/makefile.ori
# Get the version trigger filename from the toplevel
if [ "${with_gcc_version_trigger+set}" = set ]; then
gcc_version_trigger=$with_gcc_version_trigger
gcc_version=`sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/' < ${gcc_version_trigger}`
gcc_version=`grep version_string ${gcc_version_trigger} | sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/'`
else
gcc_version_trigger=
gcc_version=UNKNOWN

2
libf2c/configure.in

@ -202,7 +202,7 @@ test -f libU77/makefile && mv libU77/makefile libU77/makefile.ori
# Get the version trigger filename from the toplevel
if [[ "${with_gcc_version_trigger+set}" = set ]]; then
gcc_version_trigger=$with_gcc_version_trigger
gcc_version=`sed -e 's/.*\"\([[^ \"]]*\)[[ \"]].*/\1/' < ${gcc_version_trigger}`
gcc_version=`grep version_string ${gcc_version_trigger} | sed -e 's/.*\"\([[^ \"]]*\)[[ \"]].*/\1/'`
else
gcc_version_trigger=
gcc_version=UNKNOWN