Android: Always use LLVM 7, delete build files for LLVM 3
C++ 11 is in heavy use by SwiftShader now, so SwiftShader is now unsupported for Android versions earlier than M.
Bug: b/130460252
Bug: b/130343040
Bug: b/130361288
Change-Id: Idfb64c3fa82325641cc2170f494260c1b5b1eeb4
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/28988
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Tested-by: Ben Clayton <bclayton@google.com>
Kokoro-Presubmit: Lingfeng Yang <lfy@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>
diff --git a/Android.bp b/Android.bp
index d743770..9a6f9c1 100644
--- a/Android.bp
+++ b/Android.bp
@@ -106,6 +106,6 @@
subdirs = [
"src",
"third_party/llvm-subzero",
- "third_party/LLVM",
+ "third_party/llvm-7.0",
"third_party/subzero",
]
diff --git a/Android.mk b/Android.mk
index 1cc9690..f7d5eaa 100644
--- a/Android.mk
+++ b/Android.mk
@@ -17,47 +17,25 @@
LOCAL_PATH := $(call my-dir)
swiftshader_root := $(LOCAL_PATH)
-# Default LLVM version for SwiftShader's JIT compiler (Reactor).
-REACTOR_LLVM_VERSION ?= 7
+# LLVM version for SwiftShader's JIT compiler (Reactor).
+REACTOR_LLVM_VERSION := 7
# Subzero is an alternative JIT compiler. It is smaller and generally slower.
REACTOR_USE_SUBZERO := false
-ifeq ($(REACTOR_LLVM_VERSION),3)
-# Reactor with LLVM 3.0 doesn't support ARM. Use Subzero as the Reactor JIT
-# back-end on ARM.
-ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),arm))
-REACTOR_USE_SUBZERO := true
-endif
-endif
-
-# Subzero and LLVM 7.0 require C++11.
+# SwiftShader requires C++11.
# Full C++11 support is only available from Marshmallow and up.
ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 23 && echo PreMarshmallow),PreMarshmallow)
-# Fall back to LLVM 3.0.
-REACTOR_USE_SUBZERO := false
-REACTOR_LLVM_VERSION := 3
+swiftshader_unsupported_build := true
endif
# Check whether $(TARGET_ARCH) is supported.
-ifeq ($(REACTOR_LLVM_VERSION),3)
-ifneq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),x86 x86_64 arm))
-swiftshader_unsupported_build := true
-endif
-endif
-
-ifeq ($(REACTOR_LLVM_VERSION),7)
ifneq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),x86 x86_64 arm arm64))
swiftshader_unsupported_build := true
endif
-endif
ifneq ($(swiftshader_unsupported_build),true)
include $(swiftshader_root)/src/Android.mk
include $(swiftshader_root)/tests/GLESUnitTests/Android.mk
-ifeq ($(REACTOR_LLVM_VERSION),3)
-include $(swiftshader_root)/third_party/LLVM/Android.mk
-else
include $(swiftshader_root)/third_party/llvm-7.0/Android.mk
endif
-endif
diff --git a/src/Android.bp b/src/Android.bp
index caf4804..f4838cb 100644
--- a/src/Android.bp
+++ b/src/Android.bp
@@ -181,8 +181,14 @@
"Reactor/LLVMRoutineManager.cpp",
],
+ cflags: [
+ "-DREACTOR_LLVM_VERSION=7",
+ "-Wno-unused-parameter",
+ "-Wno-implicit-fallthrough",
+ ],
+
static_libs: [
- "libLLVM_swiftshader",
+ "libLLVM7_swiftshader",
],
}
@@ -371,14 +377,14 @@
android: {
static_libs: [
"libswiftshader_llvm",
- "libLLVM_swiftshader",
+ "libLLVM7_swiftshader",
],
},
host: {
static_libs: [
"libswiftshader_llvm",
- "libLLVM_swiftshader",
+ "libLLVM7_swiftshader",
],
},
},
@@ -401,14 +407,14 @@
android: {
static_libs: [
"libswiftshader_llvm_debug",
- "libLLVM_swiftshader",
+ "libLLVM7_swiftshader",
],
},
host: {
static_libs: [
"libswiftshader_llvm_debug",
- "libLLVM_swiftshader",
+ "libLLVM7_swiftshader",
],
},
},
diff --git a/src/Android.mk b/src/Android.mk
index c6da7c9..f6f1384 100644
--- a/src/Android.mk
+++ b/src/Android.mk
@@ -17,15 +17,10 @@
else
-ifeq ($(REACTOR_LLVM_VERSION),3)
-COMMON_C_INCLUDES += \
- $(LOCAL_PATH)/../third_party/LLVM/include
-else
COMMON_C_INCLUDES += \
$(LOCAL_PATH)/../third_party/llvm-7.0/llvm/include \
$(LOCAL_PATH)/../third_party/llvm-7.0/configs/android/include \
$(LOCAL_PATH)/../third_party/llvm-7.0/configs/common/include
-endif
endif
diff --git a/src/OpenGL/libGLES_CM/Android.mk b/src/OpenGL/libGLES_CM/Android.mk
index 78ee9c5..9efbd9a 100644
--- a/src/OpenGL/libGLES_CM/Android.mk
+++ b/src/OpenGL/libGLES_CM/Android.mk
@@ -61,7 +61,7 @@
ifeq ($(REACTOR_USE_SUBZERO),true)
COMMON_STATIC_LIBRARIES := libsubzero
else
-COMMON_STATIC_LIBRARIES := libLLVM_swiftshader
+COMMON_STATIC_LIBRARIES := libLLVM7_swiftshader
endif
COMMON_SHARED_LIBRARIES := \
diff --git a/src/OpenGL/libGLESv2/Android.mk b/src/OpenGL/libGLESv2/Android.mk
index 4bc5ecf..5990f13 100644
--- a/src/OpenGL/libGLESv2/Android.mk
+++ b/src/OpenGL/libGLESv2/Android.mk
@@ -70,7 +70,7 @@
ifeq ($(REACTOR_USE_SUBZERO),true)
COMMON_STATIC_LIBRARIES := libsubzero
else
-COMMON_STATIC_LIBRARIES := libLLVM_swiftshader
+COMMON_STATIC_LIBRARIES := libLLVM7_swiftshader
endif
COMMON_SHARED_LIBRARIES := \
diff --git a/third_party/LLVM/Android.bp b/third_party/LLVM/Android.bp
deleted file mode 100644
index a5be4ab..0000000
--- a/third_party/LLVM/Android.bp
+++ /dev/null
@@ -1,455 +0,0 @@
-//
-// Copyright (C) 2018 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-// No ARM, MIPS support because there are no generated files checked in
-// for these architectures.
-
-libLLVM_swiftshader_x86_srcs = [
- "lib/Target/X86/InstPrinter/X86ATTInstPrinter.cpp",
- "lib/Target/X86/InstPrinter/X86InstComments.cpp",
- "lib/Target/X86/InstPrinter/X86IntelInstPrinter.cpp",
- "lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp",
- "lib/Target/X86/MCTargetDesc/X86MachObjectWriter.cpp",
- "lib/Target/X86/MCTargetDesc/X86MCAsmInfo.cpp",
- "lib/Target/X86/MCTargetDesc/X86MCCodeEmitter.cpp",
- "lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp",
- "lib/Target/X86/TargetInfo/X86TargetInfo.cpp",
- "lib/Target/X86/Utils/X86ShuffleDecode.cpp",
- "lib/Target/X86/X86CodeEmitter.cpp",
- "lib/Target/X86/X86ELFWriterInfo.cpp",
- "lib/Target/X86/X86FastISel.cpp",
- "lib/Target/X86/X86FloatingPoint.cpp",
- "lib/Target/X86/X86FrameLowering.cpp",
- "lib/Target/X86/X86InstrInfo.cpp",
- "lib/Target/X86/X86ISelDAGToDAG.cpp",
- "lib/Target/X86/X86ISelLowering.cpp",
- "lib/Target/X86/X86JITInfo.cpp",
- "lib/Target/X86/X86RegisterInfo.cpp",
- "lib/Target/X86/X86SelectionDAGInfo.cpp",
- "lib/Target/X86/X86Subtarget.cpp",
- "lib/Target/X86/X86TargetMachine.cpp",
- "lib/Target/X86/X86TargetObjectFile.cpp",
- "lib/Target/X86/X86VZeroUpper.cpp",
-]
-
-cc_library_static {
- name: "libLLVM_swiftshader",
-
- defaults: [ "swiftshader_common_release" ],
-
- device_supported: false,
- host_supported: true,
-
- cflags: [
- "-D_GNU_SOURCE",
- "-D__STDC_LIMIT_MACROS",
- "-D__STDC_CONSTANT_MACROS",
- "-D__STDC_FORMAT_MACROS",
- "-DLOG_TAG=\"libLLVM_swiftshader\"",
- "-Wno-implicit-fallthrough",
- "-Wno-unused-result",
- "-Wno-unused-function",
- "-Wno-unused-variable",
- "-Wno-unused-parameter",
- "-Wno-unused-local-typedef",
- "-Wno-unused-private-field",
- "-Wno-unneeded-internal-declaration",
- ],
-
- cppflags: [
- "-Wno-sign-promo",
- "-Wno-undefined-var-template",
- ],
-
- srcs: [
- "lib/Analysis/AliasAnalysis.cpp",
- "lib/Analysis/AliasSetTracker.cpp",
- "lib/Analysis/BasicAliasAnalysis.cpp",
- "lib/Analysis/BranchProbabilityInfo.cpp",
- "lib/Analysis/CaptureTracking.cpp",
- "lib/Analysis/ConstantFolding.cpp",
- "lib/Analysis/DebugInfo.cpp",
- "lib/Analysis/DIBuilder.cpp",
- "lib/Analysis/InstructionSimplify.cpp",
- "lib/Analysis/IVUsers.cpp",
- "lib/Analysis/Loads.cpp",
- "lib/Analysis/LoopInfo.cpp",
- "lib/Analysis/LoopPass.cpp",
- "lib/Analysis/MemoryBuiltins.cpp",
- "lib/Analysis/MemoryDependenceAnalysis.cpp",
- "lib/Analysis/NoAliasAnalysis.cpp",
- "lib/Analysis/PathNumbering.cpp",
- "lib/Analysis/PHITransAddr.cpp",
- "lib/Analysis/ProfileInfo.cpp",
- "lib/Analysis/ScalarEvolution.cpp",
- "lib/Analysis/ScalarEvolutionExpander.cpp",
- "lib/Analysis/ScalarEvolutionNormalization.cpp",
- "lib/Analysis/TypeBasedAliasAnalysis.cpp",
- "lib/Analysis/ValueTracking.cpp",
- "lib/CodeGen/SelectionDAG/DAGCombiner.cpp",
- "lib/CodeGen/SelectionDAG/FastISel.cpp",
- "lib/CodeGen/SelectionDAG/FunctionLoweringInfo.cpp",
- "lib/CodeGen/SelectionDAG/InstrEmitter.cpp",
- "lib/CodeGen/SelectionDAG/LegalizeDAG.cpp",
- "lib/CodeGen/SelectionDAG/LegalizeFloatTypes.cpp",
- "lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp",
- "lib/CodeGen/SelectionDAG/LegalizeTypes.cpp",
- "lib/CodeGen/SelectionDAG/LegalizeTypesGeneric.cpp",
- "lib/CodeGen/SelectionDAG/LegalizeVectorOps.cpp",
- "lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp",
- "lib/CodeGen/SelectionDAG/ScheduleDAGFast.cpp",
- "lib/CodeGen/SelectionDAG/ScheduleDAGList.cpp",
- "lib/CodeGen/SelectionDAG/ScheduleDAGRRList.cpp",
- "lib/CodeGen/SelectionDAG/ScheduleDAGSDNodes.cpp",
- "lib/CodeGen/SelectionDAG/SelectionDAG.cpp",
- "lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp",
- "lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp",
- "lib/CodeGen/SelectionDAG/SelectionDAGPrinter.cpp",
- "lib/CodeGen/SelectionDAG/TargetLowering.cpp",
- "lib/CodeGen/SelectionDAG/TargetSelectionDAGInfo.cpp",
- "lib/CodeGen/AggressiveAntiDepBreaker.cpp",
- "lib/CodeGen/AllocationOrder.cpp",
- "lib/CodeGen/Analysis.cpp",
- "lib/CodeGen/BranchFolding.cpp",
- "lib/CodeGen/CalcSpillWeights.cpp",
- "lib/CodeGen/CallingConvLower.cpp",
- "lib/CodeGen/CodeGen.cpp",
- "lib/CodeGen/CodePlacementOpt.cpp",
- "lib/CodeGen/CriticalAntiDepBreaker.cpp",
- "lib/CodeGen/DeadMachineInstructionElim.cpp",
- "lib/CodeGen/DwarfEHPrepare.cpp",
- "lib/CodeGen/EdgeBundles.cpp",
- "lib/CodeGen/ELFCodeEmitter.cpp",
- "lib/CodeGen/ELFWriter.cpp",
- "lib/CodeGen/ExecutionDepsFix.cpp",
- "lib/CodeGen/ExpandISelPseudos.cpp",
- "lib/CodeGen/ExpandPostRAPseudos.cpp",
- "lib/CodeGen/GCMetadata.cpp",
- "lib/CodeGen/GCStrategy.cpp",
- "lib/CodeGen/IfConversion.cpp",
- "lib/CodeGen/InlineSpiller.cpp",
- "lib/CodeGen/InterferenceCache.cpp",
- "lib/CodeGen/IntrinsicLowering.cpp",
- "lib/CodeGen/LatencyPriorityQueue.cpp",
- "lib/CodeGen/LexicalScopes.cpp",
- "lib/CodeGen/LiveDebugVariables.cpp",
- "lib/CodeGen/LiveIntervalAnalysis.cpp",
- "lib/CodeGen/LiveInterval.cpp",
- "lib/CodeGen/LiveIntervalUnion.cpp",
- "lib/CodeGen/LiveRangeCalc.cpp",
- "lib/CodeGen/LiveRangeEdit.cpp",
- "lib/CodeGen/LiveStackAnalysis.cpp",
- "lib/CodeGen/LiveVariables.cpp",
- "lib/CodeGen/LLVMTargetMachine.cpp",
- "lib/CodeGen/LocalStackSlotAllocation.cpp",
- "lib/CodeGen/MachineBasicBlock.cpp",
- "lib/CodeGen/MachineBlockFrequencyInfo.cpp",
- "lib/CodeGen/MachineBranchProbabilityInfo.cpp",
- "lib/CodeGen/MachineCSE.cpp",
- "lib/CodeGen/MachineDominators.cpp",
- "lib/CodeGen/MachineFunctionAnalysis.cpp",
- "lib/CodeGen/MachineFunction.cpp",
- "lib/CodeGen/MachineFunctionPass.cpp",
- "lib/CodeGen/MachineFunctionPrinterPass.cpp",
- "lib/CodeGen/MachineInstr.cpp",
- "lib/CodeGen/MachineLICM.cpp",
- "lib/CodeGen/MachineLoopInfo.cpp",
- "lib/CodeGen/MachineLoopRanges.cpp",
- "lib/CodeGen/MachineModuleInfo.cpp",
- "lib/CodeGen/MachineModuleInfoImpls.cpp",
- "lib/CodeGen/MachinePassRegistry.cpp",
- "lib/CodeGen/MachineRegisterInfo.cpp",
- "lib/CodeGen/MachineSink.cpp",
- "lib/CodeGen/MachineSSAUpdater.cpp",
- "lib/CodeGen/MachineVerifier.cpp",
- "lib/CodeGen/ObjectCodeEmitter.cpp",
- "lib/CodeGen/OcamlGC.cpp",
- "lib/CodeGen/OptimizePHIs.cpp",
- "lib/CodeGen/Passes.cpp",
- "lib/CodeGen/PeepholeOptimizer.cpp",
- "lib/CodeGen/PHIElimination.cpp",
- "lib/CodeGen/PHIEliminationUtils.cpp",
- "lib/CodeGen/PostRASchedulerList.cpp",
- "lib/CodeGen/ProcessImplicitDefs.cpp",
- "lib/CodeGen/PrologEpilogInserter.cpp",
- "lib/CodeGen/PseudoSourceValue.cpp",
- "lib/CodeGen/RegAllocBasic.cpp",
- "lib/CodeGen/RegAllocFast.cpp",
- "lib/CodeGen/RegAllocGreedy.cpp",
- "lib/CodeGen/RegAllocLinearScan.cpp",
- "lib/CodeGen/RegAllocPBQP.cpp",
- "lib/CodeGen/RegisterClassInfo.cpp",
- "lib/CodeGen/RegisterCoalescer.cpp",
- "lib/CodeGen/RegisterScavenging.cpp",
- "lib/CodeGen/RenderMachineFunction.cpp",
- "lib/CodeGen/ScheduleDAG.cpp",
- "lib/CodeGen/ScheduleDAGEmit.cpp",
- "lib/CodeGen/ScheduleDAGInstrs.cpp",
- "lib/CodeGen/ScheduleDAGPrinter.cpp",
- "lib/CodeGen/ScoreboardHazardRecognizer.cpp",
- "lib/CodeGen/ShadowStackGC.cpp",
- "lib/CodeGen/ShrinkWrapping.cpp",
- "lib/CodeGen/SjLjEHPrepare.cpp",
- "lib/CodeGen/SlotIndexes.cpp",
- "lib/CodeGen/Spiller.cpp",
- "lib/CodeGen/SpillPlacement.cpp",
- "lib/CodeGen/SplitKit.cpp",
- "lib/CodeGen/Splitter.cpp",
- "lib/CodeGen/StackProtector.cpp",
- "lib/CodeGen/StackSlotColoring.cpp",
- "lib/CodeGen/StrongPHIElimination.cpp",
- "lib/CodeGen/TailDuplication.cpp",
- "lib/CodeGen/TargetInstrInfoImpl.cpp",
- "lib/CodeGen/TargetLoweringObjectFileImpl.cpp",
- "lib/CodeGen/TwoAddressInstructionPass.cpp",
- "lib/CodeGen/UnreachableBlockElim.cpp",
- "lib/CodeGen/VirtRegMap.cpp",
- "lib/CodeGen/VirtRegRewriter.cpp",
- "lib/ExecutionEngine/JIT/Intercept.cpp",
- "lib/ExecutionEngine/JIT/JIT.cpp",
- "lib/ExecutionEngine/JIT/JITDebugRegisterer.cpp",
- "lib/ExecutionEngine/JIT/JITDwarfEmitter.cpp",
- "lib/ExecutionEngine/JIT/JITEmitter.cpp",
- "lib/ExecutionEngine/JIT/JITMemoryManager.cpp",
- "lib/ExecutionEngine/JIT/OProfileJITEventListener.cpp",
- "lib/ExecutionEngine/ExecutionEngine.cpp",
- "lib/ExecutionEngine/TargetSelect.cpp",
- "lib/MC/ELFObjectWriter.cpp",
- "lib/MC/MachObjectWriter.cpp",
- "lib/MC/MCAsmBackend.cpp",
- "lib/MC/MCAsmInfoCOFF.cpp",
- "lib/MC/MCAsmInfo.cpp",
- "lib/MC/MCAsmInfoDarwin.cpp",
- "lib/MC/MCAsmStreamer.cpp",
- "lib/MC/MCAssembler.cpp",
- "lib/MC/MCAtom.cpp",
- "lib/MC/MCCodeEmitter.cpp",
- "lib/MC/MCCodeGenInfo.cpp",
- "lib/MC/MCContext.cpp",
- "lib/MC/MCDisassembler.cpp",
- "lib/MC/MCDwarf.cpp",
- "lib/MC/MCELF.cpp",
- "lib/MC/MCELFObjectTargetWriter.cpp",
- "lib/MC/MCELFStreamer.cpp",
- "lib/MC/MCExpr.cpp",
- "lib/MC/MCInst.cpp",
- "lib/MC/MCInstPrinter.cpp",
- "lib/MC/MCInstrAnalysis.cpp",
- "lib/MC/MCLabel.cpp",
- "lib/MC/MCLoggingStreamer.cpp",
- "lib/MC/MCMachObjectTargetWriter.cpp",
- "lib/MC/MCMachOStreamer.cpp",
- "lib/MC/MCModule.cpp",
- "lib/MC/MCNullStreamer.cpp",
- "lib/MC/MCObjectFileInfo.cpp",
- "lib/MC/MCObjectStreamer.cpp",
- "lib/MC/MCObjectWriter.cpp",
- "lib/MC/MCPureStreamer.cpp",
- "lib/MC/MCSectionCOFF.cpp",
- "lib/MC/MCSection.cpp",
- "lib/MC/MCSectionELF.cpp",
- "lib/MC/MCSectionMachO.cpp",
- "lib/MC/MCStreamer.cpp",
- "lib/MC/MCSubtargetInfo.cpp",
- "lib/MC/MCSymbol.cpp",
- "lib/MC/MCTargetAsmLexer.cpp",
- "lib/MC/MCValue.cpp",
- "lib/MC/MCWin64EH.cpp",
- "lib/MC/SubtargetFeature.cpp",
- "lib/MC/WinCOFFObjectWriter.cpp",
- "lib/MC/WinCOFFStreamer.cpp",
- "lib/Support/Allocator.cpp",
- "lib/Support/APFloat.cpp",
- "lib/Support/APInt.cpp",
- "lib/Support/APSInt.cpp",
- "lib/Support/Atomic.cpp",
- "lib/Support/BlockFrequency.cpp",
- "lib/Support/BranchProbability.cpp",
- "lib/Support/circular_raw_ostream.cpp",
- "lib/Support/CommandLine.cpp",
- "lib/Support/ConstantRange.cpp",
- "lib/Support/CrashRecoveryContext.cpp",
- "lib/Support/DAGDeltaAlgorithm.cpp",
- "lib/Support/DataExtractor.cpp",
- "lib/Support/Debug.cpp",
- "lib/Support/DeltaAlgorithm.cpp",
- "lib/Support/Disassembler.cpp",
- "lib/Support/Dwarf.cpp",
- "lib/Support/DynamicLibrary.cpp",
- "lib/Support/Errno.cpp",
- "lib/Support/ErrorHandling.cpp",
- "lib/Support/FileUtilities.cpp",
- "lib/Support/FoldingSet.cpp",
- "lib/Support/FormattedStream.cpp",
- "lib/Support/GraphWriter.cpp",
- "lib/Support/Host.cpp",
- "lib/Support/IncludeFile.cpp",
- "lib/Support/IntEqClasses.cpp",
- "lib/Support/IntervalMap.cpp",
- "lib/Support/IsInf.cpp",
- "lib/Support/IsNAN.cpp",
- "lib/Support/ManagedStatic.cpp",
- "lib/Support/MemoryBuffer.cpp",
- "lib/Support/Memory.cpp",
- "lib/Support/MemoryObject.cpp",
- "lib/Support/Mutex.cpp",
- "lib/Support/Path.cpp",
- "lib/Support/PathV2.cpp",
- "lib/Support/PluginLoader.cpp",
- "lib/Support/PrettyStackTrace.cpp",
- "lib/Support/Process.cpp",
- "lib/Support/Program.cpp",
- "lib/Support/raw_os_ostream.cpp",
- "lib/Support/raw_ostream.cpp",
- "lib/Support/Regex.cpp",
- "lib/Support/RWMutex.cpp",
- "lib/Support/SearchForAddressOfSpecialSymbol.cpp",
- "lib/Support/Signals.cpp",
- "lib/Support/SmallPtrSet.cpp",
- "lib/Support/SmallVector.cpp",
- "lib/Support/SourceMgr.cpp",
- "lib/Support/Statistic.cpp",
- "lib/Support/StringExtras.cpp",
- "lib/Support/StringMap.cpp",
- "lib/Support/StringPool.cpp",
- "lib/Support/StringRef.cpp",
- "lib/Support/system_error.cpp",
- "lib/Support/SystemUtils.cpp",
- "lib/Support/TargetRegistry.cpp",
- "lib/Support/Threading.cpp",
- "lib/Support/ThreadLocal.cpp",
- "lib/Support/Timer.cpp",
- "lib/Support/TimeValue.cpp",
- "lib/Support/ToolOutputFile.cpp",
- "lib/Support/Triple.cpp",
- "lib/Support/Twine.cpp",
- "lib/Support/Valgrind.cpp",
- "lib/Target/Mangler.cpp",
- "lib/Target/Target.cpp",
- "lib/Target/TargetData.cpp",
- "lib/Target/TargetELFWriterInfo.cpp",
- "lib/Target/TargetFrameLowering.cpp",
- "lib/Target/TargetInstrInfo.cpp",
- "lib/Target/TargetLibraryInfo.cpp",
- "lib/Target/TargetLoweringObjectFile.cpp",
- "lib/Target/TargetMachine.cpp",
- "lib/Target/TargetRegisterInfo.cpp",
- "lib/Target/TargetSubtargetInfo.cpp",
- "lib/Transforms/InstCombine/InstCombineAddSub.cpp",
- "lib/Transforms/InstCombine/InstCombineAndOrXor.cpp",
- "lib/Transforms/InstCombine/InstCombineCalls.cpp",
- "lib/Transforms/InstCombine/InstCombineCasts.cpp",
- "lib/Transforms/InstCombine/InstCombineCompares.cpp",
- "lib/Transforms/InstCombine/InstCombineLoadStoreAlloca.cpp",
- "lib/Transforms/InstCombine/InstCombineMulDivRem.cpp",
- "lib/Transforms/InstCombine/InstCombinePHI.cpp",
- "lib/Transforms/InstCombine/InstCombineSelect.cpp",
- "lib/Transforms/InstCombine/InstCombineShifts.cpp",
- "lib/Transforms/InstCombine/InstCombineSimplifyDemanded.cpp",
- "lib/Transforms/InstCombine/InstCombineVectorOps.cpp",
- "lib/Transforms/InstCombine/InstructionCombining.cpp",
- "lib/Transforms/Scalar/ADCE.cpp",
- "lib/Transforms/Scalar/CodeGenPrepare.cpp",
- "lib/Transforms/Scalar/DeadStoreElimination.cpp",
- "lib/Transforms/Scalar/GVN.cpp",
- "lib/Transforms/Scalar/LICM.cpp",
- "lib/Transforms/Scalar/LoopStrengthReduce.cpp",
- "lib/Transforms/Scalar/Reassociate.cpp",
- "lib/Transforms/Scalar/Reg2Mem.cpp",
- "lib/Transforms/Scalar/ScalarReplAggregates.cpp",
- "lib/Transforms/Scalar/SCCP.cpp",
- "lib/Transforms/Scalar/SimplifyCFGPass.cpp",
- "lib/Transforms/Utils/AddrModeMatcher.cpp",
- "lib/Transforms/Utils/BasicBlockUtils.cpp",
- "lib/Transforms/Utils/BreakCriticalEdges.cpp",
- "lib/Transforms/Utils/BuildLibCalls.cpp",
- "lib/Transforms/Utils/DemoteRegToStack.cpp",
- "lib/Transforms/Utils/InstructionNamer.cpp",
- "lib/Transforms/Utils/LCSSA.cpp",
- "lib/Transforms/Utils/Local.cpp",
- "lib/Transforms/Utils/LoopSimplify.cpp",
- "lib/Transforms/Utils/LowerInvoke.cpp",
- "lib/Transforms/Utils/LowerSwitch.cpp",
- "lib/Transforms/Utils/Mem2Reg.cpp",
- "lib/Transforms/Utils/PromoteMemoryToRegister.cpp",
- "lib/Transforms/Utils/SimplifyCFG.cpp",
- "lib/Transforms/Utils/SSAUpdater.cpp",
- "lib/Transforms/Utils/UnifyFunctionExitNodes.cpp",
- "lib/VMCore/AsmWriter.cpp",
- "lib/VMCore/Attributes.cpp",
- "lib/VMCore/AutoUpgrade.cpp",
- "lib/VMCore/BasicBlock.cpp",
- "lib/VMCore/ConstantFold.cpp",
- "lib/VMCore/Constants.cpp",
- "lib/VMCore/Core.cpp",
- "lib/VMCore/DebugInfoProbe.cpp",
- "lib/VMCore/DebugLoc.cpp",
- "lib/VMCore/Dominators.cpp",
- "lib/VMCore/Function.cpp",
- "lib/VMCore/GCOV.cpp",
- "lib/VMCore/Globals.cpp",
- "lib/VMCore/GVMaterializer.cpp",
- "lib/VMCore/InlineAsm.cpp",
- "lib/VMCore/Instruction.cpp",
- "lib/VMCore/Instructions.cpp",
- "lib/VMCore/IntrinsicInst.cpp",
- "lib/VMCore/IRBuilder.cpp",
- "lib/VMCore/LeakDetector.cpp",
- "lib/VMCore/LLVMContext.cpp",
- "lib/VMCore/LLVMContextImpl.cpp",
- "lib/VMCore/Metadata.cpp",
- "lib/VMCore/Module.cpp",
- "lib/VMCore/Pass.cpp",
- "lib/VMCore/PassManager.cpp",
- "lib/VMCore/PassRegistry.cpp",
- "lib/VMCore/PrintModulePass.cpp",
- "lib/VMCore/Type.cpp",
- "lib/VMCore/Use.cpp",
- "lib/VMCore/User.cpp",
- "lib/VMCore/Value.cpp",
- "lib/VMCore/ValueSymbolTable.cpp",
- "lib/VMCore/ValueTypes.cpp",
- "lib/VMCore/Verifier.cpp",
- ],
-
- arch: {
- x86: {
- local_include_dirs: [ "lib/Target/X86" ],
-
- srcs: libLLVM_swiftshader_x86_srcs,
- },
-
- x86_64: {
- local_include_dirs: [ "lib/Target/X86" ],
-
- srcs: libLLVM_swiftshader_x86_srcs,
- },
- },
-
- target: {
- android: {
- export_include_dirs: [ "include-android", "include" ],
- },
-
- linux: {
- export_include_dirs: [ "include-linux", "include" ],
- },
-
- darwin: {
- export_include_dirs: [ "include-osx", "include" ],
- },
- },
-}
diff --git a/third_party/LLVM/Android.mk b/third_party/LLVM/Android.mk
deleted file mode 100644
index 23f7d78..0000000
--- a/third_party/LLVM/Android.mk
+++ /dev/null
@@ -1,447 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_CLANG := true
-
-LOCAL_MODULE := libLLVM_swiftshader
-LOCAL_MODULE_TAGS := optional
-LOCAL_VENDOR_MODULE := true
-
-LOCAL_SRC_FILES := \
- lib/Analysis/AliasAnalysis.cpp \
- lib/Analysis/AliasSetTracker.cpp \
- lib/Analysis/BasicAliasAnalysis.cpp \
- lib/Analysis/BranchProbabilityInfo.cpp \
- lib/Analysis/CaptureTracking.cpp \
- lib/Analysis/ConstantFolding.cpp \
- lib/Analysis/DebugInfo.cpp \
- lib/Analysis/DIBuilder.cpp \
- lib/Analysis/InstructionSimplify.cpp \
- lib/Analysis/IVUsers.cpp \
- lib/Analysis/Loads.cpp \
- lib/Analysis/LoopInfo.cpp \
- lib/Analysis/LoopPass.cpp \
- lib/Analysis/MemoryBuiltins.cpp \
- lib/Analysis/MemoryDependenceAnalysis.cpp \
- lib/Analysis/NoAliasAnalysis.cpp \
- lib/Analysis/PathNumbering.cpp \
- lib/Analysis/PHITransAddr.cpp \
- lib/Analysis/ProfileInfo.cpp \
- lib/Analysis/ScalarEvolution.cpp \
- lib/Analysis/ScalarEvolutionExpander.cpp \
- lib/Analysis/ScalarEvolutionNormalization.cpp \
- lib/Analysis/TypeBasedAliasAnalysis.cpp \
- lib/Analysis/ValueTracking.cpp \
-
-LOCAL_SRC_FILES += \
- lib/CodeGen/SelectionDAG/DAGCombiner.cpp \
- lib/CodeGen/SelectionDAG/FastISel.cpp \
- lib/CodeGen/SelectionDAG/FunctionLoweringInfo.cpp \
- lib/CodeGen/SelectionDAG/InstrEmitter.cpp \
- lib/CodeGen/SelectionDAG/LegalizeDAG.cpp \
- lib/CodeGen/SelectionDAG/LegalizeFloatTypes.cpp \
- lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp \
- lib/CodeGen/SelectionDAG/LegalizeTypes.cpp \
- lib/CodeGen/SelectionDAG/LegalizeTypesGeneric.cpp \
- lib/CodeGen/SelectionDAG/LegalizeVectorOps.cpp \
- lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp \
- lib/CodeGen/SelectionDAG/ScheduleDAGFast.cpp \
- lib/CodeGen/SelectionDAG/ScheduleDAGList.cpp \
- lib/CodeGen/SelectionDAG/ScheduleDAGRRList.cpp \
- lib/CodeGen/SelectionDAG/ScheduleDAGSDNodes.cpp \
- lib/CodeGen/SelectionDAG/SelectionDAG.cpp \
- lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp \
- lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp \
- lib/CodeGen/SelectionDAG/SelectionDAGPrinter.cpp \
- lib/CodeGen/SelectionDAG/TargetLowering.cpp \
- lib/CodeGen/SelectionDAG/TargetSelectionDAGInfo.cpp \
- lib/CodeGen/AggressiveAntiDepBreaker.cpp \
- lib/CodeGen/AllocationOrder.cpp \
- lib/CodeGen/Analysis.cpp \
- lib/CodeGen/BranchFolding.cpp \
- lib/CodeGen/CalcSpillWeights.cpp \
- lib/CodeGen/CallingConvLower.cpp \
- lib/CodeGen/CodeGen.cpp \
- lib/CodeGen/CodePlacementOpt.cpp \
- lib/CodeGen/CriticalAntiDepBreaker.cpp \
- lib/CodeGen/DeadMachineInstructionElim.cpp \
- lib/CodeGen/DwarfEHPrepare.cpp \
- lib/CodeGen/EdgeBundles.cpp \
- lib/CodeGen/ELFCodeEmitter.cpp \
- lib/CodeGen/ELFWriter.cpp \
- lib/CodeGen/ExecutionDepsFix.cpp \
- lib/CodeGen/ExpandISelPseudos.cpp \
- lib/CodeGen/ExpandPostRAPseudos.cpp \
- lib/CodeGen/GCMetadata.cpp \
- lib/CodeGen/GCStrategy.cpp \
- lib/CodeGen/IfConversion.cpp \
- lib/CodeGen/InlineSpiller.cpp \
- lib/CodeGen/InterferenceCache.cpp \
- lib/CodeGen/IntrinsicLowering.cpp \
- lib/CodeGen/LatencyPriorityQueue.cpp \
- lib/CodeGen/LexicalScopes.cpp \
- lib/CodeGen/LiveDebugVariables.cpp \
- lib/CodeGen/LiveIntervalAnalysis.cpp \
- lib/CodeGen/LiveInterval.cpp \
- lib/CodeGen/LiveIntervalUnion.cpp \
- lib/CodeGen/LiveRangeCalc.cpp \
- lib/CodeGen/LiveRangeEdit.cpp \
- lib/CodeGen/LiveStackAnalysis.cpp \
- lib/CodeGen/LiveVariables.cpp \
- lib/CodeGen/LLVMTargetMachine.cpp \
- lib/CodeGen/LocalStackSlotAllocation.cpp \
- lib/CodeGen/MachineBasicBlock.cpp \
- lib/CodeGen/MachineBlockFrequencyInfo.cpp \
- lib/CodeGen/MachineBranchProbabilityInfo.cpp \
- lib/CodeGen/MachineCSE.cpp \
- lib/CodeGen/MachineDominators.cpp \
- lib/CodeGen/MachineFunctionAnalysis.cpp \
- lib/CodeGen/MachineFunction.cpp \
- lib/CodeGen/MachineFunctionPass.cpp \
- lib/CodeGen/MachineFunctionPrinterPass.cpp \
- lib/CodeGen/MachineInstr.cpp \
- lib/CodeGen/MachineLICM.cpp \
- lib/CodeGen/MachineLoopInfo.cpp \
- lib/CodeGen/MachineLoopRanges.cpp \
- lib/CodeGen/MachineModuleInfo.cpp \
- lib/CodeGen/MachineModuleInfoImpls.cpp \
- lib/CodeGen/MachinePassRegistry.cpp \
- lib/CodeGen/MachineRegisterInfo.cpp \
- lib/CodeGen/MachineSink.cpp \
- lib/CodeGen/MachineSSAUpdater.cpp \
- lib/CodeGen/MachineVerifier.cpp \
- lib/CodeGen/ObjectCodeEmitter.cpp \
- lib/CodeGen/OcamlGC.cpp \
- lib/CodeGen/OptimizePHIs.cpp \
- lib/CodeGen/Passes.cpp \
- lib/CodeGen/PeepholeOptimizer.cpp \
- lib/CodeGen/PHIElimination.cpp \
- lib/CodeGen/PHIEliminationUtils.cpp \
- lib/CodeGen/PostRASchedulerList.cpp \
- lib/CodeGen/ProcessImplicitDefs.cpp \
- lib/CodeGen/PrologEpilogInserter.cpp \
- lib/CodeGen/PseudoSourceValue.cpp \
- lib/CodeGen/RegAllocBasic.cpp \
- lib/CodeGen/RegAllocFast.cpp \
- lib/CodeGen/RegAllocGreedy.cpp \
- lib/CodeGen/RegAllocLinearScan.cpp \
- lib/CodeGen/RegAllocPBQP.cpp \
- lib/CodeGen/RegisterClassInfo.cpp \
- lib/CodeGen/RegisterCoalescer.cpp \
- lib/CodeGen/RegisterScavenging.cpp \
- lib/CodeGen/RenderMachineFunction.cpp \
- lib/CodeGen/ScheduleDAG.cpp \
- lib/CodeGen/ScheduleDAGEmit.cpp \
- lib/CodeGen/ScheduleDAGInstrs.cpp \
- lib/CodeGen/ScheduleDAGPrinter.cpp \
- lib/CodeGen/ScoreboardHazardRecognizer.cpp \
- lib/CodeGen/ShadowStackGC.cpp \
- lib/CodeGen/ShrinkWrapping.cpp \
- lib/CodeGen/SjLjEHPrepare.cpp \
- lib/CodeGen/SlotIndexes.cpp \
- lib/CodeGen/Spiller.cpp \
- lib/CodeGen/SpillPlacement.cpp \
- lib/CodeGen/SplitKit.cpp \
- lib/CodeGen/Splitter.cpp \
- lib/CodeGen/StackProtector.cpp \
- lib/CodeGen/StackSlotColoring.cpp \
- lib/CodeGen/StrongPHIElimination.cpp \
- lib/CodeGen/TailDuplication.cpp \
- lib/CodeGen/TargetInstrInfoImpl.cpp \
- lib/CodeGen/TargetLoweringObjectFileImpl.cpp \
- lib/CodeGen/TwoAddressInstructionPass.cpp \
- lib/CodeGen/UnreachableBlockElim.cpp \
- lib/CodeGen/VirtRegMap.cpp \
- lib/CodeGen/VirtRegRewriter.cpp \
-
-LOCAL_SRC_FILES += \
- lib/ExecutionEngine/JIT/Intercept.cpp \
- lib/ExecutionEngine/JIT/JIT.cpp \
- lib/ExecutionEngine/JIT/JITDebugRegisterer.cpp \
- lib/ExecutionEngine/JIT/JITDwarfEmitter.cpp \
- lib/ExecutionEngine/JIT/JITEmitter.cpp \
- lib/ExecutionEngine/JIT/JITMemoryManager.cpp \
- lib/ExecutionEngine/JIT/OProfileJITEventListener.cpp \
- lib/ExecutionEngine/ExecutionEngine.cpp \
- lib/ExecutionEngine/TargetSelect.cpp \
-
-LOCAL_SRC_FILES += \
- lib/MC/ELFObjectWriter.cpp \
- lib/MC/MachObjectWriter.cpp \
- lib/MC/MCAsmBackend.cpp \
- lib/MC/MCAsmInfoCOFF.cpp \
- lib/MC/MCAsmInfo.cpp \
- lib/MC/MCAsmInfoDarwin.cpp \
- lib/MC/MCAsmStreamer.cpp \
- lib/MC/MCAssembler.cpp \
- lib/MC/MCAtom.cpp \
- lib/MC/MCCodeEmitter.cpp \
- lib/MC/MCCodeGenInfo.cpp \
- lib/MC/MCContext.cpp \
- lib/MC/MCDisassembler.cpp \
- lib/MC/MCDwarf.cpp \
- lib/MC/MCELF.cpp \
- lib/MC/MCELFObjectTargetWriter.cpp \
- lib/MC/MCELFStreamer.cpp \
- lib/MC/MCExpr.cpp \
- lib/MC/MCInst.cpp \
- lib/MC/MCInstPrinter.cpp \
- lib/MC/MCInstrAnalysis.cpp \
- lib/MC/MCLabel.cpp \
- lib/MC/MCLoggingStreamer.cpp \
- lib/MC/MCMachObjectTargetWriter.cpp \
- lib/MC/MCMachOStreamer.cpp \
- lib/MC/MCModule.cpp \
- lib/MC/MCNullStreamer.cpp \
- lib/MC/MCObjectFileInfo.cpp \
- lib/MC/MCObjectStreamer.cpp \
- lib/MC/MCObjectWriter.cpp \
- lib/MC/MCPureStreamer.cpp \
- lib/MC/MCSectionCOFF.cpp \
- lib/MC/MCSection.cpp \
- lib/MC/MCSectionELF.cpp \
- lib/MC/MCSectionMachO.cpp \
- lib/MC/MCStreamer.cpp \
- lib/MC/MCSubtargetInfo.cpp \
- lib/MC/MCSymbol.cpp \
- lib/MC/MCTargetAsmLexer.cpp \
- lib/MC/MCValue.cpp \
- lib/MC/MCWin64EH.cpp \
- lib/MC/SubtargetFeature.cpp \
- lib/MC/WinCOFFObjectWriter.cpp \
- lib/MC/WinCOFFStreamer.cpp \
-
-LOCAL_SRC_FILES += \
- lib/Support/Allocator.cpp \
- lib/Support/APFloat.cpp \
- lib/Support/APInt.cpp \
- lib/Support/APSInt.cpp \
- lib/Support/Atomic.cpp \
- lib/Support/BlockFrequency.cpp \
- lib/Support/BranchProbability.cpp \
- lib/Support/circular_raw_ostream.cpp \
- lib/Support/CommandLine.cpp \
- lib/Support/ConstantRange.cpp \
- lib/Support/CrashRecoveryContext.cpp \
- lib/Support/DAGDeltaAlgorithm.cpp \
- lib/Support/DataExtractor.cpp \
- lib/Support/Debug.cpp \
- lib/Support/DeltaAlgorithm.cpp \
- lib/Support/Disassembler.cpp \
- lib/Support/Dwarf.cpp \
- lib/Support/DynamicLibrary.cpp \
- lib/Support/Errno.cpp \
- lib/Support/ErrorHandling.cpp \
- lib/Support/FileUtilities.cpp \
- lib/Support/FoldingSet.cpp \
- lib/Support/FormattedStream.cpp \
- lib/Support/GraphWriter.cpp \
- lib/Support/Host.cpp \
- lib/Support/IncludeFile.cpp \
- lib/Support/IntEqClasses.cpp \
- lib/Support/IntervalMap.cpp \
- lib/Support/IsInf.cpp \
- lib/Support/IsNAN.cpp \
- lib/Support/ManagedStatic.cpp \
- lib/Support/MemoryBuffer.cpp \
- lib/Support/Memory.cpp \
- lib/Support/MemoryObject.cpp \
- lib/Support/Mutex.cpp \
- lib/Support/Path.cpp \
- lib/Support/PathV2.cpp \
- lib/Support/PluginLoader.cpp \
- lib/Support/PrettyStackTrace.cpp \
- lib/Support/Process.cpp \
- lib/Support/Program.cpp \
- lib/Support/raw_os_ostream.cpp \
- lib/Support/raw_ostream.cpp \
- lib/Support/Regex.cpp \
- lib/Support/RWMutex.cpp \
- lib/Support/SearchForAddressOfSpecialSymbol.cpp \
- lib/Support/Signals.cpp \
- lib/Support/SmallPtrSet.cpp \
- lib/Support/SmallVector.cpp \
- lib/Support/SourceMgr.cpp \
- lib/Support/Statistic.cpp \
- lib/Support/StringExtras.cpp \
- lib/Support/StringMap.cpp \
- lib/Support/StringPool.cpp \
- lib/Support/StringRef.cpp \
- lib/Support/system_error.cpp \
- lib/Support/SystemUtils.cpp \
- lib/Support/TargetRegistry.cpp \
- lib/Support/Threading.cpp \
- lib/Support/ThreadLocal.cpp \
- lib/Support/Timer.cpp \
- lib/Support/TimeValue.cpp \
- lib/Support/ToolOutputFile.cpp \
- lib/Support/Triple.cpp \
- lib/Support/Twine.cpp \
- lib/Support/Valgrind.cpp \
-
-LOCAL_SRC_FILES += \
- lib/Target/X86/InstPrinter/X86ATTInstPrinter.cpp \
- lib/Target/X86/InstPrinter/X86InstComments.cpp \
- lib/Target/X86/InstPrinter/X86IntelInstPrinter.cpp \
- lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp \
- lib/Target/X86/MCTargetDesc/X86MachObjectWriter.cpp \
- lib/Target/X86/MCTargetDesc/X86MCAsmInfo.cpp \
- lib/Target/X86/MCTargetDesc/X86MCCodeEmitter.cpp \
- lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp \
- lib/Target/X86/TargetInfo/X86TargetInfo.cpp \
- lib/Target/X86/Utils/X86ShuffleDecode.cpp \
- lib/Target/X86/X86CodeEmitter.cpp \
- lib/Target/X86/X86ELFWriterInfo.cpp \
- lib/Target/X86/X86FastISel.cpp \
- lib/Target/X86/X86FloatingPoint.cpp \
- lib/Target/X86/X86FrameLowering.cpp \
- lib/Target/X86/X86InstrInfo.cpp \
- lib/Target/X86/X86ISelDAGToDAG.cpp \
- lib/Target/X86/X86ISelLowering.cpp \
- lib/Target/X86/X86JITInfo.cpp \
- lib/Target/X86/X86RegisterInfo.cpp \
- lib/Target/X86/X86SelectionDAGInfo.cpp \
- lib/Target/X86/X86Subtarget.cpp \
- lib/Target/X86/X86TargetMachine.cpp \
- lib/Target/X86/X86TargetObjectFile.cpp \
- lib/Target/X86/X86VZeroUpper.cpp \
- lib/Target/Mangler.cpp \
- lib/Target/Target.cpp \
- lib/Target/TargetData.cpp \
- lib/Target/TargetELFWriterInfo.cpp \
- lib/Target/TargetFrameLowering.cpp \
- lib/Target/TargetInstrInfo.cpp \
- lib/Target/TargetLibraryInfo.cpp \
- lib/Target/TargetLoweringObjectFile.cpp \
- lib/Target/TargetMachine.cpp \
- lib/Target/TargetRegisterInfo.cpp \
- lib/Target/TargetSubtargetInfo.cpp \
-
-LOCAL_SRC_FILES += \
- lib/Transforms/InstCombine/InstCombineAddSub.cpp \
- lib/Transforms/InstCombine/InstCombineAndOrXor.cpp \
- lib/Transforms/InstCombine/InstCombineCalls.cpp \
- lib/Transforms/InstCombine/InstCombineCasts.cpp \
- lib/Transforms/InstCombine/InstCombineCompares.cpp \
- lib/Transforms/InstCombine/InstCombineLoadStoreAlloca.cpp \
- lib/Transforms/InstCombine/InstCombineMulDivRem.cpp \
- lib/Transforms/InstCombine/InstCombinePHI.cpp \
- lib/Transforms/InstCombine/InstCombineSelect.cpp \
- lib/Transforms/InstCombine/InstCombineShifts.cpp \
- lib/Transforms/InstCombine/InstCombineSimplifyDemanded.cpp \
- lib/Transforms/InstCombine/InstCombineVectorOps.cpp \
- lib/Transforms/InstCombine/InstructionCombining.cpp \
- lib/Transforms/Scalar/ADCE.cpp \
- lib/Transforms/Scalar/CodeGenPrepare.cpp \
- lib/Transforms/Scalar/DeadStoreElimination.cpp \
- lib/Transforms/Scalar/GVN.cpp \
- lib/Transforms/Scalar/LICM.cpp \
- lib/Transforms/Scalar/LoopStrengthReduce.cpp \
- lib/Transforms/Scalar/Reassociate.cpp \
- lib/Transforms/Scalar/Reg2Mem.cpp \
- lib/Transforms/Scalar/ScalarReplAggregates.cpp \
- lib/Transforms/Scalar/SCCP.cpp \
- lib/Transforms/Scalar/SimplifyCFGPass.cpp \
- lib/Transforms/Utils/AddrModeMatcher.cpp \
- lib/Transforms/Utils/BasicBlockUtils.cpp \
- lib/Transforms/Utils/BreakCriticalEdges.cpp \
- lib/Transforms/Utils/BuildLibCalls.cpp \
- lib/Transforms/Utils/DemoteRegToStack.cpp \
- lib/Transforms/Utils/InstructionNamer.cpp \
- lib/Transforms/Utils/LCSSA.cpp \
- lib/Transforms/Utils/Local.cpp \
- lib/Transforms/Utils/LoopSimplify.cpp \
- lib/Transforms/Utils/LowerInvoke.cpp \
- lib/Transforms/Utils/LowerSwitch.cpp \
- lib/Transforms/Utils/Mem2Reg.cpp \
- lib/Transforms/Utils/PromoteMemoryToRegister.cpp \
- lib/Transforms/Utils/SimplifyCFG.cpp \
- lib/Transforms/Utils/SSAUpdater.cpp \
- lib/Transforms/Utils/UnifyFunctionExitNodes.cpp \
-
-LOCAL_SRC_FILES += \
- lib/VMCore/AsmWriter.cpp \
- lib/VMCore/Attributes.cpp \
- lib/VMCore/AutoUpgrade.cpp \
- lib/VMCore/BasicBlock.cpp \
- lib/VMCore/ConstantFold.cpp \
- lib/VMCore/Constants.cpp \
- lib/VMCore/Core.cpp \
- lib/VMCore/DebugInfoProbe.cpp \
- lib/VMCore/DebugLoc.cpp \
- lib/VMCore/Dominators.cpp \
- lib/VMCore/Function.cpp \
- lib/VMCore/GCOV.cpp \
- lib/VMCore/Globals.cpp \
- lib/VMCore/GVMaterializer.cpp \
- lib/VMCore/InlineAsm.cpp \
- lib/VMCore/Instruction.cpp \
- lib/VMCore/Instructions.cpp \
- lib/VMCore/IntrinsicInst.cpp \
- lib/VMCore/IRBuilder.cpp \
- lib/VMCore/LeakDetector.cpp \
- lib/VMCore/LLVMContext.cpp \
- lib/VMCore/LLVMContextImpl.cpp \
- lib/VMCore/Metadata.cpp \
- lib/VMCore/Module.cpp \
- lib/VMCore/Pass.cpp \
- lib/VMCore/PassManager.cpp \
- lib/VMCore/PassRegistry.cpp \
- lib/VMCore/PrintModulePass.cpp \
- lib/VMCore/Type.cpp \
- lib/VMCore/Use.cpp \
- lib/VMCore/User.cpp \
- lib/VMCore/Value.cpp \
- lib/VMCore/ValueSymbolTable.cpp \
- lib/VMCore/ValueTypes.cpp \
- lib/VMCore/Verifier.cpp \
-
-LOCAL_CFLAGS += \
- -DLOG_TAG=\"libLLVM_swiftshader\" \
- -Wall \
- -Werror \
- -Wno-implicit-exception-spec-mismatch \
- -Wno-implicit-fallthrough \
- -Wno-overloaded-virtual \
- -Wno-undefined-var-template \
- -Wno-unneeded-internal-declaration \
- -Wno-unused-const-variable \
- -Wno-unused-function \
- -Wno-unused-local-typedef \
- -Wno-unused-parameter \
- -Wno-unused-private-field \
- -Wno-unused-variable \
- -Wno-unknown-warning-option
-
-ifneq (16,${PLATFORM_SDK_VERSION})
-LOCAL_CFLAGS += -Xclang -fuse-init-array
-else
-LOCAL_CFLAGS += -D__STDC_INT64__
-endif
-
-ifeq (19,${PLATFORM_SDK_VERSION})
-# The compiler that shipped with K had false positives for missing sentinels
-LOCAL_CFLAGS += -Wno-sentinel
-endif
-
-LOCAL_CFLAGS += -fomit-frame-pointer -Os -ffunction-sections -fdata-sections
-LOCAL_CFLAGS += -fno-operator-names -msse2 -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS
-LOCAL_CFLAGS += -std=c++11
-LOCAL_CFLAGS += -DANDROID_PLATFORM_SDK_VERSION=$(PLATFORM_SDK_VERSION)
-
-# Android's make system also uses NDEBUG, so we need to set/unset it forcefully
-# Uncomment for debug ON:
-# LOCAL_CFLAGS += -UNDEBUG -g -O0
-
-LOCAL_C_INCLUDES += \
- bionic \
- $(LOCAL_PATH)/include-android \
- $(LOCAL_PATH)/include \
- $(LOCAL_PATH)/lib/Target/X86 \
-
-# Marshmallow does not have stlport, but comes with libc++ by default
-ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 23 && echo PreMarshmallow),PreMarshmallow)
-LOCAL_C_INCLUDES += external/stlport/stlport
-endif
-
-include $(BUILD_STATIC_LIBRARY)
diff --git a/third_party/llvm-7.0/Android.bp b/third_party/llvm-7.0/Android.bp
index fd1d590..6865e55 100644
--- a/third_party/llvm-7.0/Android.bp
+++ b/third_party/llvm-7.0/Android.bp
@@ -3,6 +3,7 @@
cc_library_static {
name: "libLLVM7_swiftshader",
device_supported: true,
+ host_supported: true,
vendor: true,
srcs: [
