* symtab.h: Check for GOLD_SYMTAB_H before header includes. Remove

	includes to gc.h and icf.h.
	* arm.cc: Include gc.h.
	* gold.cc: Likewise.
	* i386.cc: Likewise.
	* powerpc.cc: Likewise.
	* sparc.cc: Likewise.
	* x86_64.cc: Likewise.
	* gc.h: Include icf.h.

diff --git a/gold/ChangeLog b/gold/ChangeLog
index 8f0b895..c3c0dea 100644 (file)
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,15 @@
+2009-10-12  Sriraman Tallam  <tmsriram@google.com>
+
+       * symtab.h: Check for GOLD_SYMTAB_H before header includes. Remove
+       includes to gc.h and icf.h.
+       * arm.cc: Include gc.h.
+       * gold.cc: Likewise.
+       * i386.cc: Likewise.
+       * powerpc.cc: Likewise.
+       * sparc.cc: Likewise.
+       * x86_64.cc: Likewise.
+       * gc.h: Include icf.h.
+
 2009-10-11  Ian Lance Taylor  <iant@google.com>
 
        * plugin.cc: Include "gold.h" before other header files.

diff --git a/gold/arm.cc b/gold/arm.cc
index 7067de7..dd5f67d 100644 (file)
--- a/gold/arm.cc
+++ b/gold/arm.cc
@@ -42,6 +42,7 @@
 #include "target-select.h"
 #include "tls.h"
 #include "defstd.h"
+#include "gc.h"
 
 namespace
 {

diff --git a/gold/gc.h b/gold/gc.h
index ffb721c..8cc7767 100644 (file)
--- a/gold/gc.h
+++ b/gold/gc.h
@@ -28,6 +28,7 @@
 
 #include "elfcpp.h"
 #include "symtab.h"
+#include "icf.h"
 
 namespace gold
 {

diff --git a/gold/gold.cc b/gold/gold.cc
index ac2f62c..01a518f 100644 (file)
--- a/gold/gold.cc
+++ b/gold/gold.cc
@@ -41,6 +41,7 @@
 #include "reloc.h"
 #include "defstd.h"
 #include "plugin.h"
+#include "gc.h"
 #include "icf.h"
 #include "incremental.h"
 

diff --git a/gold/i386.cc b/gold/i386.cc
index c01b5f2..18eb849 100644 (file)
--- a/gold/i386.cc
+++ b/gold/i386.cc
@@ -38,6 +38,7 @@
 #include "target-select.h"
 #include "tls.h"
 #include "freebsd.h"
+#include "gc.h"
 
 namespace
 {

diff --git a/gold/powerpc.cc b/gold/powerpc.cc
index 637cbbd..71f2ae4 100644 (file)
--- a/gold/powerpc.cc
+++ b/gold/powerpc.cc
@@ -37,6 +37,7 @@
 #include "target-select.h"
 #include "tls.h"
 #include "errors.h"
+#include "gc.h"
 
 namespace
 {

diff --git a/gold/sparc.cc b/gold/sparc.cc
index 3d31dd6..eac983f 100644 (file)
--- a/gold/sparc.cc
+++ b/gold/sparc.cc
@@ -40,6 +40,7 @@
 #include "target-select.h"
 #include "tls.h"
 #include "errors.h"
+#include "gc.h"
 
 namespace
 {

diff --git a/gold/symtab.h b/gold/symtab.h
index 148634e..d186cc1 100644 (file)
--- a/gold/symtab.h
+++ b/gold/symtab.h
@@ -23,20 +23,18 @@
 // Symbol_table
 //   The symbol table.
 
+#ifndef GOLD_SYMTAB_H
+#define GOLD_SYMTAB_H
+
 #include <string>
 #include <utility>
 #include <vector>
 
-#include "gc.h"
-#include "icf.h"
 #include "elfcpp.h"
 #include "parameters.h"
 #include "stringpool.h"
 #include "object.h"
 
-#ifndef GOLD_SYMTAB_H
-#define GOLD_SYMTAB_H
-
 namespace gold
 {
 

diff --git a/gold/x86_64.cc b/gold/x86_64.cc
index 46e879d..3562065 100644 (file)
--- a/gold/x86_64.cc
+++ b/gold/x86_64.cc
@@ -38,6 +38,7 @@
 #include "target-select.h"
 #include "tls.h"
 #include "freebsd.h"
+#include "gc.h"
 
 namespace
 {