Makefile.in (GCC_OBJS): Replace options.o with gcc-options.o.

gcc/

2006-05-16  H.J. Lu  <hongjiu.lu@intel.com>

	* Makefile.in (GCC_OBJS): Replace options.o with gcc-options.o.
	(gcc-options.o): New rule.

	* optc-gen.awk: Protect variables for gcc-options.o with
	#ifdef GCC_DRIVER/#endif.

gcc/java/

2006-05-16  H.J. Lu  <hongjiu.lu@intel.com>

	* lang.opt (femit-class-file): Remove VarExists.

From-SVN: r113841

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f72e1eef0a1cb377b6184510861bdfb7ae030105..cc8816cb2af892b0a4adb4914c73471aafe621bd 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2006-05-16  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * Makefile.in (GCC_OBJS): Replace options.o with gcc-options.o.
+       (gcc-options.o): New rule.
+
+       * optc-gen.awk: Protect variables for gcc-options.o with
+       #ifdef GCC_DRIVER/#endif.
+
 2006-05-16  Daniel Berlin <dberlin@dberlin.org>
        
        Fix PR tree-optimization/27373

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 7b08929227cd6d937f56bd957ffd0d8c308a3f88..5e9497b1ebeddb95b18cfba12421fd8974eb4f06 100644 (file)
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -948,7 +948,7 @@ C_TARGET_OBJS=@c_target_objs@
 CXX_TARGET_OBJS=@cxx_target_objs@
 
 # Object files for gcc driver.
-GCC_OBJS = gcc.o opts-common.o options.o
+GCC_OBJS = gcc.o opts-common.o gcc-options.o
 
 # Language-specific object files for C and Objective C.
 C_AND_OBJC_OBJS = attribs.o c-errors.o c-lex.o c-pragma.o c-decl.o c-typeck.o \
@@ -1754,6 +1754,9 @@ s-options-h: optionlist $(srcdir)/opt-functions.awk $(srcdir)/opth-gen.awk
 
 options.o: options.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) opts.h intl.h
 
+gcc-options.o: options.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) opts.h intl.h
+       $(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(OUTPUT_OPTION) -DGCC_DRIVER options.c
+
 dumpvers: dumpvers.c
 
 version.o: version.c version.h $(DATESTAMP) $(BASEVER) $(DEVPHASE)

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 46777907a6994957632d75b795c08704e5b59c56..fc6b8067e288cda2086a828af6891390945df28a 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,7 @@
+2006-05-16  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * lang.opt (femit-class-file): Remove VarExists.
+
 2006-05-16  Tom Tromey  <tromey@redhat.com>
 
        * verify-impl.c (verify_instructions_0) <op_return>: Special case

diff --git a/gcc/java/lang.opt b/gcc/java/lang.opt
index 80b920260f67c46b1e98b2a0bfaa25324f514ff3..d93f054c9dbdd8f3e61754f15c66ceb48dfcf243 100644 (file)
--- a/gcc/java/lang.opt
+++ b/gcc/java/lang.opt
@@ -119,7 +119,7 @@ fcompile-resource=
 Java Joined RejectNegative
 
 femit-class-file
-Java Var(flag_emit_class_files) VarExists
+Java Var(flag_emit_class_files)
 Output a class file
 
 femit-class-files

diff --git a/gcc/optc-gen.awk b/gcc/optc-gen.awk
index da199171d27bbbaed64bf9d61d52b1712f71aeab..aa6bb11a10c51266fe272de1b988db9e1046ca80 100644 (file)
--- a/gcc/optc-gen.awk
+++ b/gcc/optc-gen.awk
@@ -62,7 +62,9 @@ for (i = 1; i <= n_headers; i++)
 print "#include " quote "opts.h" quote
 print "#include " quote "intl.h" quote
 print ""
+print "#ifdef GCC_DRIVER"
 print "int target_flags;"
+print "#endif /* GCC_DRIVER */"
 print ""
 
 for (i = 0; i < n_opts; i++) {
@@ -75,6 +77,7 @@ for (i = 0; i < n_opts; i++) {
                if (name in var_seen)
                        continue;
                init = ""
+               gcc_driver = 1
        }
        else {
                init = opt_args("Init", flags[i])
@@ -82,11 +85,16 @@ for (i = 0; i < n_opts; i++) {
                        init = " = " init;
                else if (name in var_seen)
                        continue;
+               gcc_driver = 0
        }
 
+       if (gcc_driver == 1)
+               print "#ifdef GCC_DRIVER"
        print "/* Set by -" opts[i] "."
        print "   " help[i] "  */"
        print var_type(flags[i]) name init ";"
+       if (gcc_driver == 1)
+               print "#endif /* GCC_DRIVER */"
        print ""
 
        var_seen[name] = 1;