2013-09-06 Richard Biener <rguenther@suse.de>

	* lto-streamer.h (lto_global_var_decls): Remove.
	* Makefile.in (OBJS): Remove lto-symtab.o.
	(lto-symtab.o): Remove.
	(GTFILES): Remove lto-symtab.c
	* lto-symtab.c: Move to lto/

	lto/
	* lto-symtab.c: Move from gcc/
	* lto.h: Include vec.h.
	(lto_global_var_decls): Declare.
	* lto.c (lto_global_var_decls): Move definition here.
	* Make-lang.in (LTO_OBJS): Add lto-symtab.o.
	(lto-symtab.o): Add.
	* config-lang.in (gtfiles): Add lto.h.


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

9 files changed, 30 insertions, 11 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 252b2611a4e..185c8655b94 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2013-09-06  Richard Biener  <rguenther@suse.de>
+
+	* lto-streamer.h (lto_global_var_decls): Remove.
+	* Makefile.in (OBJS): Remove lto-symtab.o.
+	(lto-symtab.o): Remove.
+	(GTFILES): Remove lto-symtab.c
+	* lto-symtab.c: Move to lto/
+
 2013-09-06  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>
 
 	* config/s390/s390.md (UNSPEC_FPINT_FLOOR, UNSPEC_FPINT_BTRUNC)
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 87a09ba4d00..4fdf5cbbda0 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -1320,7 +1320,6 @@ OBJS = \
 	lto-streamer-out.o \
 	lto-section-in.o \
 	lto-section-out.o \
-	lto-symtab.o \
 	lto-opts.o \
 	lto-compress.o \
 	mcf.o \
@@ -2220,9 +2219,6 @@ lto-section-out.o : lto-section-out.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
    $(CGRAPH_H) $(FUNCTION_H) $(GGC_H) $(EXCEPT_H) pointer-set.h \
    $(BITMAP_H) langhooks.h $(LTO_STREAMER_H) lto-compress.h \
    $(DATA_STREAMER_H)
-lto-symtab.o: lto-symtab.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
-   $(TREE_H) $(GIMPLE_H) $(GGC_H) $(HASHTAB_H) \
-   $(LTO_STREAMER_H) $(LINKER_PLUGIN_API_H)
 lto-opts.o: lto-opts.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TREE_H) \
    $(HASHTAB_H) $(GGC_H) $(BITMAP_H) $(FLAGS_H) $(OPTS_H) $(OPTIONS_H) \
    $(COMMON_TARGET_H) $(DIAGNOSTIC_H) $(LTO_STREAMER_H)
@@ -3839,7 +3835,6 @@ GTFILES = $(CPP_ID_DATA_H) $(srcdir)/input.h $(srcdir)/coretypes.h \
   $(srcdir)/cgraphclones.c \
   $(srcdir)/tree-ssa-propagate.c \
   $(srcdir)/tree-phinodes.c \
-  $(srcdir)/lto-symtab.c \
   $(srcdir)/tree-ssa-alias.h \
   $(srcdir)/ipa-prop.h \
   $(srcdir)/trans-mem.c \
diff --git a/gcc/lto-streamer.h b/gcc/lto-streamer.h
index 4a2ea0b2993..13a9593a866 100644
--- a/gcc/lto-streamer.h
+++ b/gcc/lto-streamer.h
@@ -903,7 +903,6 @@ lto_symtab_encoder_t compute_ltrans_boundary (lto_symtab_encoder_t encoder);
 extern void lto_symtab_merge_decls (void);
 extern void lto_symtab_merge_symbols (void);
 extern tree lto_symtab_prevailing_decl (tree decl);
-extern GTY(()) vec<tree, va_gc> *lto_global_var_decls;
 
 
 /* In lto-opts.c.  */
diff --git a/gcc/lto/ChangeLog b/gcc/lto/ChangeLog
index fe8e4638a50..8ac0f8d60a4 100644
--- a/gcc/lto/ChangeLog
+++ b/gcc/lto/ChangeLog
@@ -1,3 +1,13 @@
+2013-09-06  Richard Biener  <rguenther@suse.de>
+
+	* lto-symtab.c: Move from gcc/
+	* lto.h: Include vec.h.
+	(lto_global_var_decls): Declare.
+	* lto.c (lto_global_var_decls): Move definition here.
+	* Make-lang.in (LTO_OBJS): Add lto-symtab.o.
+	(lto-symtab.o): Add.
+	* config-lang.in (gtfiles): Add lto.h.
+
 2013-08-31  Jan Hubicka  <jh@suse.cz>
 
 	* lto.c (mentions_vars_p_field_decl, lto_fixup_prevailing_decls): 
diff --git a/gcc/lto/Make-lang.in b/gcc/lto/Make-lang.in
index 1acd176dd89..c67c58e7f83 100644
--- a/gcc/lto/Make-lang.in
+++ b/gcc/lto/Make-lang.in
@@ -22,7 +22,7 @@
 # The name of the LTO compiler.
 LTO_EXE = lto1$(exeext)
 # The LTO-specific object files inclued in $(LTO_EXE).
-LTO_OBJS = lto/lto-lang.o lto/lto.o lto/lto-object.o attribs.o lto/lto-partition.o
+LTO_OBJS = lto/lto-lang.o lto/lto.o lto/lto-object.o attribs.o lto/lto-partition.o lto/lto-symtab.o
 LTO_H = lto/lto.h $(HASHTAB_H)
 LINKER_PLUGIN_API_H = $(srcdir)/../include/plugin-api.h
 LTO_TREE_H = lto/lto-tree.h $(LINKER_PLUGIN_API_H)
@@ -95,6 +95,9 @@ lto/lto-partition.o: lto/lto-partition.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
 lto/lto-object.o: lto/lto-object.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
 	$(DIAGNOSTIC_CORE_H) $(LTO_H) $(TM_H) $(LTO_STREAMER_H) \
 	../include/simple-object.h
+lto/lto-symtab.o: lto/lto-symtab.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
+	$(TREE_H) $(GIMPLE_H) $(GGC_H) $(HASHTAB_H) \
+	$(LTO_STREAMER_H) $(LINKER_PLUGIN_API_H)
 
 # LTO testing is done as part of C/C++/Fortran etc. testing.
 check-lto:
diff --git a/gcc/lto/config-lang.in b/gcc/lto/config-lang.in
index 266446de6d2..9217c5dfbaa 100644
--- a/gcc/lto/config-lang.in
+++ b/gcc/lto/config-lang.in
@@ -21,7 +21,7 @@ language="lto"
 compilers="lto1\$(exeext)"
 stagestuff="lto1\$(exeext)"
 
-gtfiles="\$(srcdir)/lto/lto-tree.h \$(srcdir)/lto/lto-lang.c \$(srcdir)/lto/lto.c"
+gtfiles="\$(srcdir)/lto/lto-tree.h \$(srcdir)/lto/lto-lang.c \$(srcdir)/lto/lto.c \$(srcdir)/lto/lto.h"
 
 # LTO is a special front end.  From a user's perspective it is not
 # really a language, but a middle end feature.  However, the GIMPLE
diff --git a/gcc/lto-symtab.c b/gcc/lto/lto-symtab.c
index 76e94400f6a..b1b7731c830 100644
--- a/gcc/lto-symtab.c
+++ b/gcc/lto/lto-symtab.c
@@ -30,9 +30,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "lto-streamer.h"
 #include "ipa-utils.h"
 
-/* Vector to keep track of external variables we've seen so far.  */
-vec<tree, va_gc> *lto_global_var_decls;
-
 /* Replace the cgraph node NODE with PREVAILING_NODE in the cgraph, merging
    all edges and removing the old node.  */
 
diff --git a/gcc/lto/lto.c b/gcc/lto/lto.c
index 0cea778f7d6..470f3c1d7a7 100644
--- a/gcc/lto/lto.c
+++ b/gcc/lto/lto.c
@@ -49,6 +49,9 @@ along with GCC; see the file COPYING3.  If not see
 #include "context.h"
 #include "pass_manager.h"
 
+/* Vector to keep track of external variables we've seen so far.  */
+vec<tree, va_gc> *lto_global_var_decls;
+
 static GTY(()) tree first_personality_decl;
 
 /* Returns a hash code for P.  */
diff --git a/gcc/lto/lto.h b/gcc/lto/lto.h
index 2699459dc18..1734fe5def1 100644
--- a/gcc/lto/lto.h
+++ b/gcc/lto/lto.h
@@ -22,6 +22,7 @@ along with GCC; see the file COPYING3.  If not see
 #define LTO_H
 
 #include "hashtab.h"
+#include "vec.h"
 
 /* A file.  */
 typedef struct lto_file_struct
@@ -40,6 +41,9 @@ extern tree lto_eh_personality (void);
 extern void lto_main (void);
 extern void lto_read_all_file_options (void);
 
+/* In lto-symtab.c  */
+extern GTY(()) vec<tree, va_gc> *lto_global_var_decls;
+
 /* In lto-elf.c or lto-coff.c  */
 extern lto_file *lto_obj_file_open (const char *filename, bool writable);
 extern void lto_obj_file_close (lto_file *file);