From f7a00bdb09cb3716b05e56bcacfaab14f81102be Mon Sep 17 00:00:00 2001 From: hjl Date: Fri, 17 Aug 2007 13:08:36 +0000 Subject: [PATCH] 2007-08-17 H.J. Lu * Makefile.in (version.o): Depend on $(REVISION) only if REVISION_s is defined. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@127583 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 19 ++++++++++++------- gcc/Makefile.in | 4 ++++ 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index e077c2e..659a586 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2007-08-17 H.J. Lu + + * Makefile.in (version.o): Depend on $(REVISION) only if + REVISION_s is defined. + 2007-08-17 Sa Liu Ulrich Weigand @@ -7,12 +12,12 @@ 2007-08-17 Chen Liqin - * config/score/score.md : Update pattern tablejump. - * config/score/score.c : Update score_initialize_trampoline - function. - * config/score/score.h (TRAMPOLINE_TEMPLATE): Added macro. - (TRAMPOLINE_INSNS, TRAMPOLINE_SIZE) Update macro. - * doc/contrib.texi: Add my entry. + * config/score/score.md : Update pattern tablejump. + * config/score/score.c : Update score_initialize_trampoline + function. + * config/score/score.h (TRAMPOLINE_TEMPLATE): Added macro. + (TRAMPOLINE_INSNS, TRAMPOLINE_SIZE) Update macro. + * doc/contrib.texi: Add my entry. 2007-08-16 H.J. Lu @@ -1350,7 +1355,7 @@ * config/mips/mips.md: Update after above changes. 2007-08-08 Vladimir Yanovsky - Revital Eres + Revital Eres * ddg.c (print_ddg): Add dump information. * modulo-sched.c (print_node_sched_params): Add parameter and diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 18cc5c8..190ff69 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -1899,7 +1899,11 @@ gcc-options.o: options.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) opts.h intl dumpvers: dumpvers.c +ifdef REVISION_s version.o: version.c version.h $(REVISION) $(DATESTAMP) $(BASEVER) $(DEVPHASE) +else +version.o: version.c version.h $(DATESTAMP) $(BASEVER) $(DEVPHASE) +endif $(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) \ -DBASEVER=$(BASEVER_s) -DDATESTAMP=$(DATESTAMP_s) \ -DREVISION=$(REVISION_s) \ -- 2.7.4