From d7a5d9444d6d2125b706f696b4d16f5a09d9f5ce Mon Sep 17 00:00:00 2001
From: Rafael Espindola <rafael.espindola@gmail.com>
Date: Tue, 29 Jul 2014 19:17:44 +0000
Subject: [PATCH] Small gold plugin simplifications.

* Use a range loop.
* Store the extra options as "const char *".

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@214199 91177308-0d34-0410-b5e6-96231b3b80d8
---
 tools/gold/gold-plugin.cpp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/tools/gold/gold-plugin.cpp b/tools/gold/gold-plugin.cpp
index b90851019fe..8c30ba2a428 100644
--- a/tools/gold/gold-plugin.cpp
+++ b/tools/gold/gold-plugin.cpp
@@ -89,7 +89,7 @@ namespace options {
   // as plugin exclusive to pass to the code generator.
   // For example, "generate-api-file" and "as"options are for the plugin
   // use only and will not be passed.
-  static std::vector<std::string> extra;
+  static std::vector<const char *> extra;
 
   static void process_plugin_option(const char* opt_)
   {
@@ -122,7 +122,7 @@ namespace options {
       }
     } else {
       // Save this option to pass to the code generator.
-      extra.push_back(opt);
+      extra.push_back(opt_);
     }
   }
 }
@@ -237,10 +237,8 @@ ld_plugin_status onload(ld_plugin_tv *tv) {
 
   // Pass through extra options to the code generator.
   if (!options::extra.empty()) {
-    for (std::vector<std::string>::iterator it = options::extra.begin();
-         it != options::extra.end(); ++it) {
-      CodeGen->setCodeGenDebugOptions((*it).c_str());
-    }
+    for (const char *Opt : options::extra)
+      CodeGen->setCodeGenDebugOptions(Opt);
   }
 
   CodeGen->parseCodeGenDebugOptions();