diff --git a/lib/clang/libclang/Makefile b/lib/clang/libclang/Makefile
index c610c811af09..1e30756094ef 100644
--- a/lib/clang/libclang/Makefile
+++ b/lib/clang/libclang/Makefile
@@ -514,8 +514,8 @@ SRCS_FUL+=	StaticAnalyzer/Checkers/MisusedMovedObjectChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/NSAutoreleasePoolChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/NSErrorChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/NoReturnFunctionChecker.cpp
-SRCS_FUL+=	StaticAnalyzer/Checkers/NonnullGlobalConstantsChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/NonNullParamChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/NonnullGlobalConstantsChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/NullabilityChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/NumberObjectConversionChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/ObjCAtSyncChecker.cpp
diff --git a/lib/clang/libllvm/Makefile b/lib/clang/libllvm/Makefile
index e1bb9b8ec702..c0cf7b745d17 100644
--- a/lib/clang/libllvm/Makefile
+++ b/lib/clang/libllvm/Makefile
@@ -101,6 +101,8 @@ SRCS_MIN+=	Analysis/VectorUtils.cpp
 SRCS_MIN+=	AsmParser/LLLexer.cpp
 SRCS_MIN+=	AsmParser/LLParser.cpp
 SRCS_MIN+=	AsmParser/Parser.cpp
+SRCS_MIN+=	BinaryFormat/Dwarf.cpp
+SRCS_MIN+=	BinaryFormat/Magic.cpp
 SRCS_MIN+=	Bitcode/Reader/BitReader.cpp
 SRCS_MIN+=	Bitcode/Reader/BitcodeReader.cpp
 SRCS_MIN+=	Bitcode/Reader/BitstreamReader.cpp
@@ -110,8 +112,6 @@ SRCS_MIN+=	Bitcode/Writer/BitWriter.cpp
 SRCS_MIN+=	Bitcode/Writer/BitcodeWriter.cpp
 SRCS_MIN+=	Bitcode/Writer/BitcodeWriterPass.cpp
 SRCS_MIN+=	Bitcode/Writer/ValueEnumerator.cpp
-SRCS_MIN+=	BinaryFormat/Dwarf.cpp
-SRCS_MIN+=	BinaryFormat/Magic.cpp
 SRCS_MIN+=	CodeGen/AggressiveAntiDepBreaker.cpp
 SRCS_MIN+=	CodeGen/AllocationOrder.cpp
 SRCS_MIN+=	CodeGen/Analysis.cpp
@@ -194,8 +194,8 @@ SRCS_MIN+=	CodeGen/LexicalScopes.cpp
 SRCS_MIN+=	CodeGen/LiveDebugValues.cpp
 SRCS_MIN+=	CodeGen/LiveDebugVariables.cpp
 SRCS_MIN+=	CodeGen/LiveInterval.cpp
-SRCS_MIN+=	CodeGen/LiveIntervals.cpp
 SRCS_MIN+=	CodeGen/LiveIntervalUnion.cpp
+SRCS_MIN+=	CodeGen/LiveIntervals.cpp
 SRCS_MIN+=	CodeGen/LivePhysRegs.cpp
 SRCS_MIN+=	CodeGen/LiveRangeCalc.cpp
 SRCS_MIN+=	CodeGen/LiveRangeEdit.cpp
@@ -292,12 +292,12 @@ SRCS_MIN+=	CodeGen/SelectionDAG/LegalizeTypesGeneric.cpp
 SRCS_MIN+=	CodeGen/SelectionDAG/LegalizeVectorOps.cpp
 SRCS_MIN+=	CodeGen/SelectionDAG/LegalizeVectorTypes.cpp
 SRCS_MIN+=	CodeGen/SelectionDAG/ResourcePriorityQueue.cpp
-SRCS_MIN+=	CodeGen/SelectionDAG/SelectionDAGAddressAnalysis.cpp
 SRCS_MIN+=	CodeGen/SelectionDAG/ScheduleDAGFast.cpp
 SRCS_MIN+=	CodeGen/SelectionDAG/ScheduleDAGRRList.cpp
 SRCS_MIN+=	CodeGen/SelectionDAG/ScheduleDAGSDNodes.cpp
 SRCS_MIN+=	CodeGen/SelectionDAG/ScheduleDAGVLIW.cpp
 SRCS_MIN+=	CodeGen/SelectionDAG/SelectionDAG.cpp
+SRCS_MIN+=	CodeGen/SelectionDAG/SelectionDAGAddressAnalysis.cpp
 SRCS_MIN+=	CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
 SRCS_MIN+=	CodeGen/SelectionDAG/SelectionDAGDumper.cpp
 SRCS_MIN+=	CodeGen/SelectionDAG/SelectionDAGISel.cpp
@@ -417,8 +417,8 @@ SRCS_EXT+=	DebugInfo/PDB/Native/NamedStreamMap.cpp
 SRCS_EXT+=	DebugInfo/PDB/Native/NativeBuiltinSymbol.cpp
 SRCS_EXT+=	DebugInfo/PDB/Native/NativeCompilandSymbol.cpp
 SRCS_EXT+=	DebugInfo/PDB/Native/NativeEnumModules.cpp
-SRCS_EXT+=	DebugInfo/PDB/Native/NativeEnumTypes.cpp
 SRCS_EXT+=	DebugInfo/PDB/Native/NativeEnumSymbol.cpp
+SRCS_EXT+=	DebugInfo/PDB/Native/NativeEnumTypes.cpp
 SRCS_EXT+=	DebugInfo/PDB/Native/NativeExeSymbol.cpp
 SRCS_EXT+=	DebugInfo/PDB/Native/NativeRawSymbol.cpp
 SRCS_EXT+=	DebugInfo/PDB/Native/NativeSession.cpp