Diff below makes clang and lld build again on armv7.  Sorted the files
such that they match the order in the CMakeLists.txt file.

ok?


Index: gnu/usr.bin/clang/libLLVMARMCodeGen/Makefile
===================================================================
RCS file: /cvs/src/gnu/usr.bin/clang/libLLVMARMCodeGen/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- gnu/usr.bin/clang/libLLVMARMCodeGen/Makefile        9 Jul 2017 15:28:34 
-0000       1.3
+++ gnu/usr.bin/clang/libLLVMARMCodeGen/Makefile        11 Oct 2017 10:17:13 
-0000
@@ -11,7 +11,6 @@ SRCS= A15SDOptimizer.cpp \
        ARMAsmPrinter.cpp \
        ARMBaseInstrInfo.cpp \
        ARMBaseRegisterInfo.cpp \
-       ARMComputeBlockSize.cpp \
        ARMConstantIslandPass.cpp \
        ARMConstantPoolValue.cpp \
        ARMExpandPseudoInsts.cpp \
@@ -24,6 +23,7 @@ SRCS= A15SDOptimizer.cpp \
        ARMLoadStoreOptimizer.cpp \
        ARMMCInstLower.cpp \
        ARMMachineFunctionInfo.cpp \
+       ARMMacroFusion.cpp \
        ARMRegisterInfo.cpp \
        ARMOptimizeBarriersPass.cpp \
        ARMSelectionDAGInfo.cpp \
@@ -37,7 +37,8 @@ SRCS= A15SDOptimizer.cpp \
        ThumbRegisterInfo.cpp \
        Thumb2ITBlockPass.cpp \
        Thumb2InstrInfo.cpp \
-       Thumb2SizeReduction.cpp
+       Thumb2SizeReduction.cpp \
+       ARMComputeBlockSize.cpp
 
 .PATH: ${.CURDIR}/../../../llvm/lib/Target/ARM
 

Reply via email to