From f345227a0cfefcdd2c6d7757e5e5c87b441fc73e Mon Sep 17 00:00:00 2001 From: Sriraman Tallam Date: Tue, 13 Oct 2009 00:39:31 +0000 Subject: [PATCH] * 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. --- gold/ChangeLog | 12 ++++++++++++ gold/arm.cc | 1 + gold/gc.h | 1 + gold/gold.cc | 1 + gold/i386.cc | 1 + gold/powerpc.cc | 1 + gold/sparc.cc | 1 + gold/symtab.h | 8 +++----- gold/x86_64.cc | 1 + 9 files changed, 22 insertions(+), 5 deletions(-) diff --git a/gold/ChangeLog b/gold/ChangeLog index 8f0b895bfd0..c3c0dea4df7 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,3 +1,15 @@ +2009-10-12 Sriraman Tallam + + * 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 * plugin.cc: Include "gold.h" before other header files. diff --git a/gold/arm.cc b/gold/arm.cc index 7067de71831..dd5f67dca23 100644 --- 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 ffb721c7fb8..8cc7767311d 100644 --- 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 ac2f62c5d80..01a518f8f7d 100644 --- 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 c01b5f22332..18eb8493561 100644 --- 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 637cbbdf678..71f2ae468e5 100644 --- 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 3d31dd6e775..eac983f8ef9 100644 --- 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 148634ed8c0..d186cc17bb5 100644 --- 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 #include #include -#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 46e879df5f8..3562065611b 100644 --- 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 { -- 2.30.2