Merge branch 'upstream' into merge-20120305

Conflicts:
	lib/Support/Atomic.cpp

Change-Id: I563b3bc2a82942ccbae5bed42e53b9149a8bf3a0

diff --cc lib/CodeGen/AsmPrinter/AsmPrinter.cpp
index f0e1fe4,c3106f4..d5926f9
--- 1/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
--- 2/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
+++ b/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
@@@ -872,8 -859,13 +874,14 @@@ bool AsmPrinter::doFinalization(Module 
      EmitVisibility(Name, V, false);
    }
  
+   // Emit module flags.
+   SmallVector<Module::ModuleFlagEntry, 8> ModuleFlags;
+   M.getModuleFlagsMetadata(ModuleFlags);
+   if (!ModuleFlags.empty())
+     getObjFileLowering().emitModuleFlags(OutStreamer, ModuleFlags, Mang, TM);
+ 
    // Finalize debug and EH information.
 +#if !defined(ANDROID_TARGET_BUILD) || defined(ANDROID_ENGINEERING_BUILD)
    if (DE) {
      {
        NamedRegionTimer T(EHTimerName, DWARFGroupName, TimePassesIsEnabled);

diff --cc lib/Support/Atomic.cpp
index b3a730d,3001f6c..015b9c5
--- 1/lib/Support/Atomic.cpp
--- 2/lib/Support/Atomic.cpp
+++ b/lib/Support/Atomic.cpp
@@@ -12,10 -12,7 +12,10 @@@
  //===----------------------------------------------------------------------===//
  
  #include "llvm/Support/Atomic.h"
- #include "llvm/Config/config.h"
+ #include "llvm/Config/llvm-config.h"
 +#if defined(ANDROID_TARGET_BUILD)
 +#  include "sys/atomics.h"
 +#endif
  
  using namespace llvm;
  

diff --cc lib/Support/Unix/PathV2.inc
Simple merge

diff --cc lib/Target/ARM/ARMCodeEmitter.cpp
Simple merge

diff --cc lib/Target/ARM/ARMRelocations.h
Simple merge

diff --cc utils/TableGen/CodeEmitterGen.cpp
Simple merge