Merge with LLVM upstream 2011/10/20 (r142530)

Conflicts:
	lib/Support/Unix/Host.inc

Change-Id: Idc00db3b63912dca6348bddd9f8a1af2a8d5d147

diff --cc lib/CodeGen/AsmPrinter/AsmPrinter.cpp
index b84f49e,1999f36..c9de6d2
--- 1/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
--- 2/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
+++ b/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
@@@ -47,8 -44,8 +46,9 @@@
  #include "llvm/ADT/Statistic.h"
  #include "llvm/Support/ErrorHandling.h"
  #include "llvm/Support/Format.h"
+ #include "llvm/Support/MathExtras.h"
  #include "llvm/Support/Timer.h"
 +#include <ctype.h>
  using namespace llvm;
  
  static const char *DWARFGroupName = "DWARF Emission";

diff --cc lib/CodeGen/AsmPrinter/AsmPrinterInlineAsm.cpp
Simple merge

diff --cc lib/Support/Atomic.cpp
index 05339f4,94760cc..b3a730d
--- 1/lib/Support/Atomic.cpp
--- 2/lib/Support/Atomic.cpp
+++ b/lib/Support/Atomic.cpp
@@@ -58,11 -53,9 +58,11 @@@ sys::cas_flag sys::CompareAndSwap(volat
  }
  
  sys::cas_flag sys::AtomicIncrement(volatile sys::cas_flag* ptr) {
- #if LLVM_MULTITHREADED==0
+ #if LLVM_HAS_ATOMICS == 0
    ++(*ptr);
    return *ptr;
 +#elif defined(ANDROID_TARGET_BUILD)
 +  return __atomic_inc((volatile int*)ptr);
  #elif defined(__GNUC__)
    return __sync_add_and_fetch(ptr, 1);
  #elif defined(_MSC_VER)
@@@ -73,11 -66,9 +73,11 @@@
  }
  
  sys::cas_flag sys::AtomicDecrement(volatile sys::cas_flag* ptr) {
- #if LLVM_MULTITHREADED==0
+ #if LLVM_HAS_ATOMICS == 0
    --(*ptr);
    return *ptr;
 +#elif defined(ANDROID_TARGET_BUILD)
 +  return __atomic_dec((volatile int*)ptr);
  #elif defined(__GNUC__)
    return __sync_sub_and_fetch(ptr, 1);
  #elif defined(_MSC_VER)
@@@ -88,16 -79,9 +88,16 @@@
  }
  
  sys::cas_flag sys::AtomicAdd(volatile sys::cas_flag* ptr, sys::cas_flag val) {
- #if LLVM_MULTITHREADED==0
+ #if LLVM_HAS_ATOMICS == 0
    *ptr += val;
    return *ptr;
 +#elif defined(ANDROID_TARGET_BUILD)
 +  sys::cas_flag original, result;
 +  do {
 +    original = *ptr;
 +    result = original + val;
 +  } while (__atomic_cmpxchg(original, result, (volatile int*)ptr) != original);
 +  return result;
  #elif defined(__GNUC__)
    return __sync_add_and_fetch(ptr, val);
  #elif defined(_MSC_VER)

diff --cc lib/Support/DynamicLibrary.cpp
Simple merge

diff --cc lib/Support/Unix/PathV2.inc
index 15df8a2,bbbc344..b5488de
--- 1/lib/Support/Unix/PathV2.inc
--- 2/lib/Support/Unix/PathV2.inc
+++ b/lib/Support/Unix/PathV2.inc
@@@ -42,9 -42,10 +42,12 @@@
  #if HAVE_STDIO_H
  #include <stdio.h>
  #endif
+ #if HAVE_LIMITS_H
+ #include <limits.h>
+ #endif
  
 +extern "C" int truncate (const char*, off_t);
 +
  using namespace llvm;
  
  namespace {

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

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