* config/t-darwin (build/slashify1): Harden against rebuilds.

	* config/slashify.c: Nix parms to quite the build.

cp:
	(build/slashify): Harden against rebuilds.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@170107 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c301cdf..df33d96 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-13  Mike Stump  <mikestump@comcast.net>
+
+       * config/t-darwin (build/slashify1): Harden against rebuilds.
+       * config/slashify.c: Nix parms to quite the build.
+

 2011-02-13  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * configure: Regenerate.
 2011-02-13  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * configure: Regenerate.

diff --git a/gcc/config/slashify.c b/gcc/config/slashify.c
index 2db796b..555bf88 100644 (file)
--- a/gcc/config/slashify.c
+++ b/gcc/config/slashify.c
@@ -25,9 +25,9 @@ along with GCC; see the file COPYING3.  If not see
 
 #include <stdio.h>
 
 
 #include <stdio.h>
 

-extern int main (int, char **);
+extern int main (void);

 
 

-int main (int argc, char **argv) {
+int main (void) {

   int c,c1;
   int saw_start = 0;
   while ((c=getchar ()) != EOF) {
   int c,c1;
   int saw_start = 0;
   while ((c=getchar ()) != EOF) {

diff --git a/gcc/config/t-darwin b/gcc/config/t-darwin
index 202823b..1caee4b 100644 (file)
--- a/gcc/config/t-darwin
+++ b/gcc/config/t-darwin
@@ -17,18 +17,18 @@
 # along with GCC; see the file COPYING3.  If not see
 # <http://www.gnu.org/licenses/>.
 
 # along with GCC; see the file COPYING3.  If not see
 # <http://www.gnu.org/licenses/>.
 

-build/slashify:: $(srcdir)/config/slashify.c
-       $(COMPILER_FOR_BUILD) $(srcdir)/config/slashify.c -o $@
+build/slashify1: $(srcdir)/config/slashify.c
+       $(COMPILER_FOR_BUILD) $(BUILD_COMPILERFLAGS) $(BUILD_CPPFLAGS) $(srcdir)/config/slashify.c -o $@

 
 $(srcdir)/config/darwin.h: config/darwin.h.rebuild
 
 
 $(srcdir)/config/darwin.h: config/darwin.h.rebuild
 

-config/darwin.h.rebuild: build/slashify
+config/darwin.h.rebuild: build/slashify1

        @if [ ! -e $(srcdir)/config/darwin.h                                    \
              -o $(srcdir)/config/darwin.h -nt config/darwin.h ]; then          \
                { test -d config || mkdir config; } &&                          \
                cp -p $(srcdir)/config/darwin-sections.def                      \
                      config/darwin-sections.def &&                             \
        @if [ ! -e $(srcdir)/config/darwin.h                                    \
              -o $(srcdir)/config/darwin.h -nt config/darwin.h ]; then          \
                { test -d config || mkdir config; } &&                          \
                cp -p $(srcdir)/config/darwin-sections.def                      \
                      config/darwin-sections.def &&                             \

-               build/slashify < $(srcdir)/config/darwin.h  >config/darwin.h;   \
+               build/slashify1 < $(srcdir)/config/darwin.h  >config/darwin.h;  \

        fi
 
 darwin.o: $(srcdir)/config/darwin.c $(CONFIG_H) $(SYSTEM_H) coretypes.h     \
        fi
 
 darwin.o: $(srcdir)/config/darwin.c $(CONFIG_H) $(SYSTEM_H) coretypes.h     \

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 74f460e..9ed9a6f 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -3,6 +3,8 @@
        * parser.c (cp_parser_primary_expression): Add arguments to all the plugins.
        * lex.c: Plugify.
        * Make-lang.in (objcp/plugin/lex.h): Likewise.
        * parser.c (cp_parser_primary_expression): Add arguments to all the plugins.
        * lex.c: Plugify.
        * Make-lang.in (objcp/plugin/lex.h): Likewise.

+       (build/slashify): Harden against rebuilds.
+

        * Make-lang.in (cp/parser.o): Move c-family/c-objc.h dependancy
        down.
 
        * Make-lang.in (cp/parser.o): Move c-family/c-objc.h dependancy
        down.
 

diff --git a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in
index 993c510..831c36a 100644 (file)
--- a/gcc/cp/Make-lang.in
+++ b/gcc/cp/Make-lang.in
@@ -333,15 +333,17 @@ cp/parser.o: $(objdir)/objcp/plugin/parser.h $(srcdir)/objcp/plugin/parser.c \
 
 cp/lex.o: $(objdir)/objcp/plugin/lex.h c-family/c-objc.h
 
 
 cp/lex.o: $(objdir)/objcp/plugin/lex.h c-family/c-objc.h
 

-build/slashify:: $(srcdir)/config/slashify.c
-       $(COMPILER_FOR_BUILD) $(srcdir)/config/slashify.c -o $@
+# Would like to get rid of the #, but we always rebuild the checksum
+# if we do
+build/slashify: # $(srcdir)/config/slashify.c
+       $(COMPILER_FOR_BUILD) $(BUILD_COMPILERFLAGS) $(BUILD_CPPFLAGS) $(srcdir)/config/slashify.c -o $@

 
 

-$(objdir)/objcp/plugin/parser.h: $(srcdir)/objcp/plugin/parser.h | build/slashify
+$(objdir)/objcp/plugin/parser.h: $(srcdir)/objcp/plugin/parser.h build/slashify

        test -d objcp || mkdir objcp
        test -d objcp/plugin || mkdir objcp/plugin
        build/slashify < $< > $@
 
        test -d objcp || mkdir objcp
        test -d objcp/plugin || mkdir objcp/plugin
        build/slashify < $< > $@
 

-$(objdir)/objcp/plugin/lex.h: $(srcdir)/objcp/plugin/lex.h | build/slashify
+$(objdir)/objcp/plugin/lex.h: $(srcdir)/objcp/plugin/lex.h build/slashify

        test -d objcp || mkdir objcp
        test -d objcp/plugin || mkdir objcp/plugin
        build/slashify < $< > $@
        test -d objcp || mkdir objcp
        test -d objcp/plugin || mkdir objcp/plugin
        build/slashify < $< > $@