2009-10-02 Rafael Avila de Espindola <espindola@google.com>

	* Makefile.am (liblto_plugin_la_SOURCES): Remove
	$(top_srcdir)/../gcc/lto/common.c
	* Makefile.in: Regenerate.

2009-10-02  Rafael Avila de Espindola  <espindola@google.com>

	* Make-lang.in (LTO_OBJS): Remove lto/common.o.
	(lto/common.o): Remove.
	* common.c: Remove.
	* common.h (lto_kind_str): Remove.
	(lto_visibility_str): Remove.
	(lto_resolution_str): Make it static.



git-svn-id: https://gcc.gnu.org/svn/gcc/branches/lto@152401 138bc75d-0d04-0410-961f-82ee72b054a4

6 files changed, 31 insertions, 18 deletions

diff --git a/gcc/lto/ChangeLog b/gcc/lto/ChangeLog
index 3e8b0303fb7..fdaa16a6284 100644
--- a/gcc/lto/ChangeLog
+++ b/gcc/lto/ChangeLog
@@ -1,3 +1,12 @@
+2009-10-02  Rafael Avila de Espindola  <espindola@google.com>
+
+	* Make-lang.in (LTO_OBJS): Remove lto/common.o.
+	(lto/common.o): Remove.
+	* common.c: Remove.
+	* common.h (lto_kind_str): Remove.
+	(lto_visibility_str): Remove.
+	(lto_resolution_str): Make it static.
+
 2009-10-01  Diego Novillo  <dnovillo@google.com>
 
 	* lto.c (lto_read_decls): Add comment.
diff --git a/gcc/lto/Make-lang.in b/gcc/lto/Make-lang.in
index 3dbe30d90f6..f8f75bf8629 100644
--- a/gcc/lto/Make-lang.in
+++ b/gcc/lto/Make-lang.in
@@ -23,7 +23,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-elf.o lto/common.o attribs.o
+LTO_OBJS = lto/lto-lang.o lto/lto.o lto/lto-elf.o attribs.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)
@@ -87,4 +87,3 @@ lto/lto.o: lto/lto.c $(CONFIG_H) $(SYSTEM_H) coretypes.h opts.h \
 	$(LTO_TAGS_H) $(LTO_STREAMER_H)
 lto/lto-elf.o: lto/lto-elf.c $(CONFIG_H) coretypes.h $(SYSTEM_H) \
 	toplev.h $(LTO_H) $(TM_H) $(LIBIBERTY_H) $(GGC_H) $(LTO_STREAMER_H)
-lto/common.o: lto/common.h
diff --git a/gcc/lto/common.h b/gcc/lto/common.h
index 8f096aafc1b..e82184795ba 100644
--- a/gcc/lto/common.h
+++ b/gcc/lto/common.h
@@ -18,10 +18,17 @@ You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING3.  If not see
 <http://www.gnu.org/licenses/>.  */
 
-extern const char *lto_kind_str[5] __attribute__ ((visibility ("hidden")));
 
-extern const char *
-lto_visibility_str[4] __attribute__ ((visibility ("hidden")));
 
-extern const char *
-lto_resolution_str[9] __attribute__ ((visibility ("hidden")));
+static const char *lto_resolution_str[9] =
+{
+  "UNKNOWN",
+  "UNDEF",
+  "PREVAILING_DEF",
+  "PREVAILING_DEF_IRONLY",
+  "PREEMPTED_REG",
+  "PREEMPTED_IR",
+  "RESOLVED_IR",
+  "RESOLVED_EXEC",
+  "RESOLVED_DYN"
+};
diff --git a/lto-plugin/ChangeLog b/lto-plugin/ChangeLog
index bc5b4c2f250..91d44a3f1d4 100644
--- a/lto-plugin/ChangeLog
+++ b/lto-plugin/ChangeLog
@@ -1,3 +1,9 @@
+2009-10-02  Rafael Avila de Espindola  <espindola@google.com>
+
+	* Makefile.am (liblto_plugin_la_SOURCES): Remove
+	$(top_srcdir)/../gcc/lto/common.c
+	* Makefile.in: Regenerate.
+
 2009-10-01  Rafael Avila de Espindola  <espindola@google.com>
 
 	* lto-plugin.c (pass_through_items): New.
diff --git a/lto-plugin/Makefile.am b/lto-plugin/Makefile.am
index 94a39320737..86517b31b5d 100644
--- a/lto-plugin/Makefile.am
+++ b/lto-plugin/Makefile.am
@@ -15,5 +15,5 @@ AM_CFLAGS = -Wall -Werror
 
 libexecsub_LTLIBRARIES = liblto_plugin.la
 
-liblto_plugin_la_SOURCES = lto-plugin.c $(top_srcdir)/../gcc/lto/common.c
+liblto_plugin_la_SOURCES = lto-plugin.c
 liblto_plugin_la_LIBADD = $(LIBELFLIBS) -L../libiberty/pic -liberty
diff --git a/lto-plugin/Makefile.in b/lto-plugin/Makefile.in
index 35ab61c024a..d3bc9078705 100644
--- a/lto-plugin/Makefile.in
+++ b/lto-plugin/Makefile.in
@@ -68,7 +68,7 @@ libexecsubLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(libexecsub_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 liblto_plugin_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am_liblto_plugin_la_OBJECTS = lto-plugin.lo common.lo
+am_liblto_plugin_la_OBJECTS = lto-plugin.lo
 liblto_plugin_la_OBJECTS = $(am_liblto_plugin_la_OBJECTS)
 DEFAULT_INCLUDES = -I. -I$(srcdir)
 depcomp = $(SHELL) $(top_srcdir)/../depcomp
@@ -215,7 +215,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/../include -D_LARGEFILE_SOURCE \
 
 AM_CFLAGS = -Wall -Werror
 libexecsub_LTLIBRARIES = liblto_plugin.la
-liblto_plugin_la_SOURCES = lto-plugin.c $(top_srcdir)/../gcc/lto/common.c
+liblto_plugin_la_SOURCES = lto-plugin.c
 liblto_plugin_la_LIBADD = $(LIBELFLIBS) -L../libiberty/pic -liberty
 all: all-am
 
@@ -290,7 +290,6 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/common.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lto-plugin.Plo@am__quote@
 
 .c.o:
@@ -314,13 +313,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
-common.lo: $(top_srcdir)/../gcc/lto/common.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT common.lo -MD -MP -MF "$(DEPDIR)/common.Tpo" -c -o common.lo `test -f '$(top_srcdir)/../gcc/lto/common.c' || echo '$(srcdir)/'`$(top_srcdir)/../gcc/lto/common.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/common.Tpo" "$(DEPDIR)/common.Plo"; else rm -f "$(DEPDIR)/common.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/../gcc/lto/common.c' object='common.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o common.lo `test -f '$(top_srcdir)/../gcc/lto/common.c' || echo '$(srcdir)/'`$(top_srcdir)/../gcc/lto/common.c
-
 mostlyclean-libtool:
 	-rm -f *.lo