Merge commit 'c723eb1aef817d47feec620933ee1ec6005cdd14'

This merges r159618 from upstream into master. It goes with clang rev
af50aab0c317462129d73ae8000c6394c718598d

Conflicts:
	include/llvm/CodeGen/LexicalScopes.h
	include/llvm/Target/TargetOptions.h
	lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
	lib/Target/ARM/ARMBaseInstrInfo.cpp
	lib/Target/ARM/ARMTargetMachine.cpp
	lib/Target/ARM/ARMTargetObjectFile.cpp
	lib/Target/Mips/MCTargetDesc/MipsAsmBackend.cpp
	lib/Target/Mips/MipsISelDAGToDAG.cpp
	lib/Target/Mips/MipsInstrFPU.td
	lib/Target/Mips/MipsMCInstLower.cpp
	lib/Target/Mips/MipsTargetMachine.cpp
	lib/Target/TargetMachine.cpp
	lib/Target/X86/X86ISelLowering.cpp
	lib/Target/X86/X86RegisterInfo.cpp
	lib/Target/X86/X86TargetObjectFile.cpp
	lib/Target/X86/X86TargetObjectFile.h
	tools/llc/llc.cpp

(tools/llc/llc.cpp is from a merged version of r160532 because it was a bit
hairy and I didn't want to redo it.)

1 files changed, 2 insertions, 1 deletions

diff --git a/docs/CodeGenerator.html b/docs/CodeGenerator.html
index 672dc294a7..651eb96603 100644
--- a/docs/CodeGenerator.html
+++ b/docs/CodeGenerator.html
@@ -218,7 +218,8 @@
    support completely non-traditional code generation targets.  For example, the
    C backend does not require register allocation, instruction selection, or any
    of the other standard components provided by the system.  As such, it only
-   implements these two interfaces, and does its own thing.  Another example of
+   implements these two interfaces, and does its own thing. Note that C backend
+   was removed from the trunk since LLVM 3.1 release. Another example of
    a code generator like this is a (purely hypothetical) backend that converts
    LLVM to the GCC RTL form and uses GCC to emit machine code for a target.</p>