aboutsummaryrefslogtreecommitdiff
path: root/lib/Target/X86
diff options
context:
space:
mode:
Diffstat (limited to 'lib/Target/X86')
-rw-r--r--lib/Target/X86/Android.bp52
-rw-r--r--lib/Target/X86/Android.mk59
-rw-r--r--lib/Target/X86/AsmParser/Android.bp9
-rw-r--r--lib/Target/X86/AsmParser/Android.mk62
-rw-r--r--lib/Target/X86/Disassembler/Android.bp9
-rw-r--r--lib/Target/X86/Disassembler/Android.mk55
-rw-r--r--lib/Target/X86/InstPrinter/Android.bp9
-rw-r--r--lib/Target/X86/InstPrinter/Android.mk55
-rw-r--r--lib/Target/X86/MCTargetDesc/Android.bp9
-rw-r--r--lib/Target/X86/MCTargetDesc/Android.mk46
-rw-r--r--lib/Target/X86/TargetInfo/Android.bp9
-rw-r--r--lib/Target/X86/TargetInfo/Android.mk53
-rw-r--r--lib/Target/X86/Utils/Android.bp9
-rw-r--r--lib/Target/X86/Utils/Android.mk34
14 files changed, 106 insertions, 364 deletions
diff --git a/lib/Target/X86/Android.bp b/lib/Target/X86/Android.bp
new file mode 100644
index 000000000000..177039adf5fd
--- /dev/null
+++ b/lib/Target/X86/Android.bp
@@ -0,0 +1,52 @@
+cc_library_static {
+ name: "libLLVMX86CodeGen",
+ defaults: [
+ "llvm-defaults",
+ "llvm-generated-headers",
+ "llvm-x86-defaults",
+ ],
+ srcs: ["*.cpp"],
+
+ // b/31559947, b/31938382 clang-tidy segmentation fault.
+ tidy_checks: [
+ "-clang-analyzer-*",
+ "-readability-*",
+ "-google-readability-*",
+ ],
+}
+
+cc_defaults {
+ name: "llvm-x86-defaults",
+ generated_headers: ["llvm-gen-x86"],
+ static_libs: ["llvm-x86-headers"],
+}
+
+cc_library_static {
+ name: "llvm-x86-headers",
+ host_supported: true,
+ target: {
+ windows: {
+ enabled: true,
+ },
+ },
+ export_include_dirs: ["."],
+}
+
+llvm_tblgen {
+ name: "llvm-gen-x86",
+ in: "X86.td",
+ outs: [
+ "X86GenAsmMatcher.inc",
+ "X86GenAsmWriter.inc",
+ "X86GenAsmWriter1.inc",
+ "X86GenDisassemblerTables.inc",
+ "X86GenRegisterInfo.inc",
+ "X86GenInstrInfo.inc",
+ "X86GenDAGISel.inc",
+ "X86GenFastISel.inc",
+ "X86GenSubtargetInfo.inc",
+ "X86GenCallingConv.inc",
+ ],
+}
+
+subdirs = ["*"]
diff --git a/lib/Target/X86/Android.mk b/lib/Target/X86/Android.mk
deleted file mode 100644
index 96a8d3d90cb0..000000000000
--- a/lib/Target/X86/Android.mk
+++ /dev/null
@@ -1,59 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-x86_codegen_TBLGEN_TABLES := \
- X86GenAsmMatcher.inc \
- X86GenAsmWriter.inc \
- X86GenAsmWriter1.inc \
- X86GenDisassemblerTables.inc \
- X86GenRegisterInfo.inc \
- X86GenInstrInfo.inc \
- X86GenDAGISel.inc \
- X86GenFastISel.inc \
- X86GenSubtargetInfo.inc \
- X86GenCallingConv.inc
-
-x86_codegen_SRC_FILES := $(sort $(notdir $(wildcard $(LOCAL_PATH)/*.cpp)))
-
-# For the host
-# =====================================================
-include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS)
-
-# b/31559947, b/31938382 clang-tidy segmentation fault.
-LOCAL_TIDY_CHECKS := -clang-analyzer-*,-readability-*,-google-readability-*
-
-TBLGEN_TABLES := $(x86_codegen_TBLGEN_TABLES)
-
-LOCAL_SRC_FILES := $(x86_codegen_SRC_FILES)
-
-LOCAL_MODULE:= libLLVMX86CodeGen
-
-LOCAL_MODULE_HOST_OS := darwin linux windows
-
-include $(LLVM_HOST_BUILD_MK)
-include $(LLVM_TBLGEN_RULES_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
-include $(BUILD_HOST_STATIC_LIBRARY)
-
-# For the device only
-# =====================================================
-ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
-include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS)
-
-# b/31559947, b/31938382 clang-tidy segmentation fault.
-LOCAL_TIDY_CHECKS := -clang-analyzer-*,-readability-*,-google-readability-*
-
-TBLGEN_TABLES := $(x86_codegen_TBLGEN_TABLES)
-
-LOCAL_SRC_FILES := $(x86_codegen_SRC_FILES)
-
-LOCAL_MODULE:= libLLVMX86CodeGen
-
-include $(LLVM_DEVICE_BUILD_MK)
-include $(LLVM_TBLGEN_RULES_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
-include $(BUILD_STATIC_LIBRARY)
-endif
diff --git a/lib/Target/X86/AsmParser/Android.bp b/lib/Target/X86/AsmParser/Android.bp
new file mode 100644
index 000000000000..4823fa56f848
--- /dev/null
+++ b/lib/Target/X86/AsmParser/Android.bp
@@ -0,0 +1,9 @@
+cc_library_static {
+ name: "libLLVMX86AsmParser",
+ defaults: [
+ "llvm-defaults",
+ "llvm-generated-headers",
+ "llvm-x86-defaults",
+ ],
+ srcs: ["*.cpp"],
+}
diff --git a/lib/Target/X86/AsmParser/Android.mk b/lib/Target/X86/AsmParser/Android.mk
deleted file mode 100644
index e377b75a9220..000000000000
--- a/lib/Target/X86/AsmParser/Android.mk
+++ /dev/null
@@ -1,62 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-# For the device only
-# =====================================================
-include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS)
-
-x86_asm_parser_SRC_FILES := \
- X86AsmInstrumentation.cpp \
- X86AsmParser.cpp
-
-x86_asm_parser_TBLGEN_TABLES := \
- X86GenAsmMatcher.inc \
- X86GenInstrInfo.inc \
- X86GenRegisterInfo.inc \
- X86GenSubtargetInfo.inc
-
-x86_asm_parser_TBLGEN_TD_DIR := $(LOCAL_PATH)/..
-
-x86_asm_parser_C_INCLUDES += \
- $(LOCAL_PATH)/..
-
-
-#===---------------------------------------------------------------===
-# libX86AsmParser (host)
-#===---------------------------------------------------------------===
-include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS)
-
-LOCAL_MODULE:= libLLVMX86AsmParser
-LOCAL_MODULE_HOST_OS := darwin linux windows
-LOCAL_SRC_FILES := $(x86_asm_parser_SRC_FILES)
-LOCAL_C_INCLUDES += $(x86_asm_parser_C_INCLUDES)
-TBLGEN_TABLES := $(x86_asm_parser_TBLGEN_TABLES)
-TBLGEN_TD_DIR := $(x86_asm_parser_TBLGEN_TD_DIR)
-
-include $(LLVM_HOST_BUILD_MK)
-include $(LLVM_TBLGEN_RULES_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
-include $(BUILD_HOST_STATIC_LIBRARY)
-
-
-#===---------------------------------------------------------------===
-# libX86AsmParser (target)
-#===---------------------------------------------------------------===
-ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
-include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS)
-
-LOCAL_MODULE:= libLLVMX86AsmParser
-LOCAL_SRC_FILES := $(x86_asm_parser_SRC_FILES)
-LOCAL_C_INCLUDES += $(x86_asm_parser_C_INCLUDES)
-TBLGEN_TABLES := $(x86_asm_parser_TBLGEN_TABLES)
-TBLGEN_TD_DIR := $(x86_asm_parser_TBLGEN_TD_DIR)
-
-include $(LLVM_DEVICE_BUILD_MK)
-include $(LLVM_TBLGEN_RULES_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
-include $(BUILD_STATIC_LIBRARY)
-endif
diff --git a/lib/Target/X86/Disassembler/Android.bp b/lib/Target/X86/Disassembler/Android.bp
new file mode 100644
index 000000000000..4dd9660f8a01
--- /dev/null
+++ b/lib/Target/X86/Disassembler/Android.bp
@@ -0,0 +1,9 @@
+cc_library_static {
+ name: "libLLVMX86Disassembler",
+ defaults: [
+ "llvm-defaults",
+ "llvm-generated-headers",
+ "llvm-x86-defaults",
+ ],
+ srcs: ["*.cpp"],
+}
diff --git a/lib/Target/X86/Disassembler/Android.mk b/lib/Target/X86/Disassembler/Android.mk
deleted file mode 100644
index 7b4bbc8c55d0..000000000000
--- a/lib/Target/X86/Disassembler/Android.mk
+++ /dev/null
@@ -1,55 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-x86_disassembler_TBLGEN_TABLES := \
- X86GenDisassemblerTables.inc \
- X86GenInstrInfo.inc \
- X86GenRegisterInfo.inc \
- X86GenSubtargetInfo.inc
-
-x86_disassembler_SRC_FILES := \
- X86Disassembler.cpp \
- X86DisassemblerDecoder.cpp
-
-
-# For the device
-# =====================================================
-ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
-include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS)
-
-TBLGEN_TABLES := $(x86_disassembler_TBLGEN_TABLES)
-
-TBLGEN_TD_DIR := $(LOCAL_PATH)/..
-
-LOCAL_SRC_FILES := $(x86_disassembler_SRC_FILES)
-
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
-
-LOCAL_MODULE:= libLLVMX86Disassembler
-
-include $(LLVM_DEVICE_BUILD_MK)
-include $(LLVM_TBLGEN_RULES_MK)
-include $(BUILD_STATIC_LIBRARY)
-endif
-
-# For the host
-# =====================================================
-include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS)
-
-TBLGEN_TABLES := $(x86_disassembler_TBLGEN_TABLES)
-
-TBLGEN_TD_DIR := $(LOCAL_PATH)/..
-
-LOCAL_SRC_FILES := $(x86_disassembler_SRC_FILES)
-
-LOCAL_C_INCLUDES += \
- $(LOCAL_PATH)/..
-
-LOCAL_MODULE:= libLLVMX86Disassembler
-
-LOCAL_MODULE_HOST_OS := darwin linux windows
-
-include $(LLVM_HOST_BUILD_MK)
-include $(LLVM_TBLGEN_RULES_MK)
-include $(BUILD_HOST_STATIC_LIBRARY)
diff --git a/lib/Target/X86/InstPrinter/Android.bp b/lib/Target/X86/InstPrinter/Android.bp
new file mode 100644
index 000000000000..b07c58e9e0ab
--- /dev/null
+++ b/lib/Target/X86/InstPrinter/Android.bp
@@ -0,0 +1,9 @@
+cc_library_static {
+ name: "libLLVMX86AsmPrinter",
+ defaults: [
+ "llvm-defaults",
+ "llvm-generated-headers",
+ "llvm-x86-defaults",
+ ],
+ srcs: ["*.cpp"],
+}
diff --git a/lib/Target/X86/InstPrinter/Android.mk b/lib/Target/X86/InstPrinter/Android.mk
deleted file mode 100644
index 13288cf4f0e5..000000000000
--- a/lib/Target/X86/InstPrinter/Android.mk
+++ /dev/null
@@ -1,55 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-x86_instprinter_TBLGEN_TABLES := \
- X86GenAsmWriter.inc \
- X86GenAsmWriter1.inc \
- X86GenInstrInfo.inc \
- X86GenRegisterInfo.inc \
- X86GenSubtargetInfo.inc
-
-x86_instprinter_SRC_FILES := \
- X86ATTInstPrinter.cpp \
- X86IntelInstPrinter.cpp \
- X86InstComments.cpp
-
-# For the device
-# =====================================================
-ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
-include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS)
-
-TBLGEN_TABLES := $(x86_instprinter_TBLGEN_TABLES)
-
-TBLGEN_TD_DIR := $(LOCAL_PATH)/..
-
-LOCAL_SRC_FILES := $(x86_instprinter_SRC_FILES)
-
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
-
-LOCAL_MODULE:= libLLVMX86AsmPrinter
-
-include $(LLVM_DEVICE_BUILD_MK)
-include $(LLVM_TBLGEN_RULES_MK)
-include $(BUILD_STATIC_LIBRARY)
-endif
-
-# For the host
-# =====================================================
-include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS)
-
-TBLGEN_TABLES := $(x86_instprinter_TBLGEN_TABLES)
-
-TBLGEN_TD_DIR := $(LOCAL_PATH)/..
-
-LOCAL_SRC_FILES := $(x86_instprinter_SRC_FILES)
-
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
-
-LOCAL_MODULE := libLLVMX86AsmPrinter
-
-LOCAL_MODULE_HOST_OS := darwin linux windows
-
-include $(LLVM_HOST_BUILD_MK)
-include $(LLVM_TBLGEN_RULES_MK)
-include $(BUILD_HOST_STATIC_LIBRARY)
diff --git a/lib/Target/X86/MCTargetDesc/Android.bp b/lib/Target/X86/MCTargetDesc/Android.bp
new file mode 100644
index 000000000000..65d516e2ccbf
--- /dev/null
+++ b/lib/Target/X86/MCTargetDesc/Android.bp
@@ -0,0 +1,9 @@
+cc_library_static {
+ name: "libLLVMX86Desc",
+ defaults: [
+ "llvm-defaults",
+ "llvm-generated-headers",
+ "llvm-x86-defaults",
+ ],
+ srcs: ["*.cpp"],
+}
diff --git a/lib/Target/X86/MCTargetDesc/Android.mk b/lib/Target/X86/MCTargetDesc/Android.mk
deleted file mode 100644
index 705a30310466..000000000000
--- a/lib/Target/X86/MCTargetDesc/Android.mk
+++ /dev/null
@@ -1,46 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-x86_mc_desc_TBLGEN_TABLES := \
- X86GenRegisterInfo.inc \
- X86GenInstrInfo.inc \
- X86GenSubtargetInfo.inc
-
-x86_mc_desc_SRC_FILES := $(sort $(notdir $(wildcard $(LOCAL_PATH)/*.cpp)))
-
-# For the host
-# =====================================================
-include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS)
-
-LOCAL_MODULE:= libLLVMX86Desc
-LOCAL_MODULE_HOST_OS := darwin linux windows
-
-LOCAL_SRC_FILES := $(x86_mc_desc_SRC_FILES)
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
-TBLGEN_TABLES := $(x86_mc_desc_TBLGEN_TABLES)
-TBLGEN_TD_DIR := $(LOCAL_PATH)/..
-
-include $(LLVM_HOST_BUILD_MK)
-include $(LLVM_TBLGEN_RULES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
-include $(BUILD_HOST_STATIC_LIBRARY)
-
-# For the device only
-# =====================================================
-ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
-include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS)
-
-
-LOCAL_MODULE:= libLLVMX86Desc
-
-LOCAL_SRC_FILES := $(x86_mc_desc_SRC_FILES)
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
-TBLGEN_TABLES := $(x86_mc_desc_TBLGEN_TABLES)
-TBLGEN_TD_DIR := $(LOCAL_PATH)/..
-
-include $(LLVM_DEVICE_BUILD_MK)
-include $(LLVM_TBLGEN_RULES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
-include $(BUILD_STATIC_LIBRARY)
-endif
diff --git a/lib/Target/X86/TargetInfo/Android.bp b/lib/Target/X86/TargetInfo/Android.bp
new file mode 100644
index 000000000000..83a963b13adc
--- /dev/null
+++ b/lib/Target/X86/TargetInfo/Android.bp
@@ -0,0 +1,9 @@
+cc_library_static {
+ name: "libLLVMX86Info",
+ defaults: [
+ "llvm-defaults",
+ "llvm-generated-headers",
+ "llvm-x86-defaults",
+ ],
+ srcs: ["*.cpp"],
+}
diff --git a/lib/Target/X86/TargetInfo/Android.mk b/lib/Target/X86/TargetInfo/Android.mk
deleted file mode 100644
index e3b6e2b055be..000000000000
--- a/lib/Target/X86/TargetInfo/Android.mk
+++ /dev/null
@@ -1,53 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-x86_target_info_TBLGEN_TABLES := \
- X86GenRegisterInfo.inc \
- X86GenSubtargetInfo.inc \
- X86GenInstrInfo.inc
-
-x86_target_info_SRC_FILES := \
- X86TargetInfo.cpp
-
-# For the host
-# =====================================================
-include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS)
-
-TBLGEN_TABLES := $(x86_target_info_TBLGEN_TABLES)
-
-TBLGEN_TD_DIR := $(LOCAL_PATH)/..
-
-LOCAL_SRC_FILES := $(x86_target_info_SRC_FILES)
-
-LOCAL_C_INCLUDES += \
- $(LOCAL_PATH)/..
-
-LOCAL_MODULE:= libLLVMX86Info
-
-LOCAL_MODULE_HOST_OS := darwin linux windows
-
-include $(LLVM_HOST_BUILD_MK)
-include $(LLVM_TBLGEN_RULES_MK)
-include $(BUILD_HOST_STATIC_LIBRARY)
-
-# For the device
-# =====================================================
-ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
-include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS)
-
-TBLGEN_TABLES := $(x86_target_info_TBLGEN_TABLES)
-
-TBLGEN_TD_DIR := $(LOCAL_PATH)/..
-
-LOCAL_SRC_FILES := $(x86_target_info_SRC_FILES)
-
-LOCAL_C_INCLUDES += \
- $(LOCAL_PATH)/..
-
-LOCAL_MODULE:= libLLVMX86Info
-
-include $(LLVM_DEVICE_BUILD_MK)
-include $(LLVM_TBLGEN_RULES_MK)
-include $(BUILD_STATIC_LIBRARY)
-endif
diff --git a/lib/Target/X86/Utils/Android.bp b/lib/Target/X86/Utils/Android.bp
new file mode 100644
index 000000000000..e54f12c70d91
--- /dev/null
+++ b/lib/Target/X86/Utils/Android.bp
@@ -0,0 +1,9 @@
+cc_library_static {
+ name: "libLLVMX86Utils",
+ defaults: [
+ "llvm-defaults",
+ "llvm-generated-headers",
+ "llvm-x86-defaults",
+ ],
+ srcs: ["*.cpp"],
+}
diff --git a/lib/Target/X86/Utils/Android.mk b/lib/Target/X86/Utils/Android.mk
deleted file mode 100644
index ad16c16f2736..000000000000
--- a/lib/Target/X86/Utils/Android.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-x86_utils_SRC_FILES := \
- X86ShuffleDecode.cpp
-
-# For the device
-# =====================================================
-ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := $(x86_utils_SRC_FILES)
-
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
-
-LOCAL_MODULE:= libLLVMX86Utils
-
-include $(LLVM_DEVICE_BUILD_MK)
-include $(BUILD_STATIC_LIBRARY)
-endif
-
-# For the host
-# =====================================================
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := $(x86_utils_SRC_FILES)
-
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
-
-LOCAL_MODULE:= libLLVMX86Utils
-
-LOCAL_MODULE_HOST_OS := darwin linux windows
-
-include $(LLVM_HOST_BUILD_MK)
-include $(BUILD_HOST_STATIC_LIBRARY)
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 15:15:58 +0000