4 files changed, 17 insertions, 0 deletions
diff --git a/tools/gccld/GenerateCode.cpp b/tools/gccld/GenerateCode.cpp
index bf32400c63..aac1f93d32 100644
--- a/tools/gccld/GenerateCode.cpp
+++ b/tools/gccld/GenerateCode.cpp
@@ -25,11 +25,14 @@
 #include "Support/SystemUtils.h"
 #include "Support/CommandLine.h"
 
+using namespace llvm;
+
 namespace {
   cl::opt<bool>
   DisableInline("disable-inlining", cl::desc("Do not run the inliner pass"));
 }
 
+namespace llvm {
 
 /// GenerateBytecode - generates a bytecode file from the specified module.
 ///
@@ -221,3 +224,5 @@ GenerateNative(const std::string &OutputFilename,
   // Run the compiler to assembly and link together the program.
   return ExecWait(&(cmd[0]), clean_env);
 }
+
+} // End llvm namespace
diff --git a/tools/gccld/Linker.cpp b/tools/gccld/Linker.cpp
index 06f0635749..9c22891775 100644
--- a/tools/gccld/Linker.cpp
+++ b/tools/gccld/Linker.cpp
@@ -30,6 +30,8 @@
 #include <memory>
 #include <set>
 
+namespace llvm {
+
 /// FindLib - Try to convert Filename into the name of a file that we can open,
 /// if it does not already name a file we can open, by first trying to open
 /// Filename, then libFilename.<suffix> for each of a set of several common
@@ -405,3 +407,5 @@ bool LinkLibraries(const char *progname,
 
   return false;
 }
+
+} // End llvm namespace
diff --git a/tools/gccld/gccld.cpp b/tools/gccld/gccld.cpp
index 45163f4396..5a1b26100a 100644
--- a/tools/gccld/gccld.cpp
+++ b/tools/gccld/gccld.cpp
@@ -36,6 +36,8 @@
 #include <fstream>
 #include <memory>
 
+using namespace llvm;
+
 namespace {
   cl::list<std::string> 
   InputFilenames(cl::Positional, cl::desc("<input bytecode files>"),
@@ -86,6 +88,8 @@ namespace {
   CO5("eh-frame-hdr", cl::Hidden, cl::desc("Compatibility option: ignored"));
 }
 
+namespace llvm {
+
 //
 // Function: PrintAndReturn ()
 //
@@ -211,6 +215,7 @@ void RemoveEnv(const char * name, char ** const envp) {
   return;
 }
 
+} // End llvm namespace
 
 int main(int argc, char **argv, char **envp) {
   cl::ParseCommandLineOptions(argc, argv, " llvm linker for GCC\n");
diff --git a/tools/gccld/gccld.h b/tools/gccld/gccld.h
index e3c5504209..9b7eb1e877 100644
--- a/tools/gccld/gccld.h
+++ b/tools/gccld/gccld.h
@@ -17,6 +17,8 @@
 #include <set>
 #include <ostream>
 
+namespace llvm {
+
 int
 PrintAndReturn (const char *progname,
                 const std::string &Message,
@@ -69,3 +71,4 @@ LinkFiles (const char * progname,
            const std::vector<std::string> & Files,
            bool Verbose);
 
+} // End llvm namespace