LLVM: Add ELF Note section to NaCl object files identifying them as such to gold

lib/Target/ARM/ARMAsmPrinter.cpp

Index: lib/Target/ARM/ARMAsmPrinter.cpp
diff --git a/lib/Target/ARM/ARMAsmPrinter.cpp b/lib/Target/ARM/ARMAsmPrinter.cpp
index c48df8a96f9ec4b5d031a24ec1955b1ba867e3b3..0143d95c1962fb9cd199ca120697f0a3688ad08c 100644
--- a/lib/Target/ARM/ARMAsmPrinter.cpp
+++ b/lib/Target/ARM/ARMAsmPrinter.cpp
@@ -40,6 +40,7 @@
 #include "llvm/MC/MCELFStreamer.h"
 #include "llvm/MC/MCInst.h"
 #include "llvm/MC/MCInstBuilder.h"
+#include "llvm/MC/MCNaCl.h"
 #include "llvm/MC/MCObjectStreamer.h"
 #include "llvm/MC/MCSectionMachO.h"
 #include "llvm/MC/MCStreamer.h"
@@ -733,11 +734,15 @@ void ARMAsmPrinter::EmitStartOfAsmFile(Module &M) {
     emitAttributes();
 
   // @LOCALMOD-BEGIN
-  if (Subtarget->isTargetNaCl() && OutStreamer.hasRawTextSupport()) {
-    std::string str;
-    raw_string_ostream OS(str);
-    EmitSFIHeaders(OS);
-    OutStreamer.EmitRawText(StringRef(OS.str()));
+  if (Subtarget->isTargetNaCl()) {
+    if (OutStreamer.hasRawTextSupport()) {
+      std::string str;
+      raw_string_ostream OS(str);
+      EmitSFIHeaders(OS);
+      OutStreamer.EmitRawText(StringRef(OS.str()));
+    }
+    initializeNaClMCStreamer(OutStreamer, OutContext,
+                             Subtarget->getTargetTriple());
   }
   // @LOCALMOD-END
 }