[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC for-2.9 01/11] Makefile: Allow CPU targets to reside i
From: |
Thomas Huth |
Subject: |
[Qemu-devel] [RFC for-2.9 01/11] Makefile: Allow CPU targets to reside in target/ folder, too |
Date: |
Wed, 30 Nov 2016 10:47:35 +0100 |
To be able to compile the CPU targets from within a subfolder
of the target/ folder, we've got to adapt the Makefile.target
a little bit first.
Signed-off-by: Thomas Huth <address@hidden>
---
Makefile.target | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/Makefile.target b/Makefile.target
index 7a5080e..90b25ae 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -7,11 +7,17 @@ include config-target.mak
include config-devices.mak
include $(SRC_PATH)/rules.mak
+ifneq ($(wildcard $(SRC_PATH)/target/$(TARGET_BASE_ARCH)),)
+TARGET_FOLDER=target/$(TARGET_BASE_ARCH)
+else
+TARGET_FOLDER=target-$(TARGET_BASE_ARCH)
+endif
+
$(call set-vpath, $(SRC_PATH):$(BUILD_DIR))
ifdef CONFIG_LINUX
QEMU_CFLAGS += -I../linux-headers
endif
-QEMU_CFLAGS += -I.. -I$(SRC_PATH)/target-$(TARGET_BASE_ARCH) -DNEED_CPU_H
+QEMU_CFLAGS += -I.. -I$(SRC_PATH)/$(TARGET_FOLDER) -DNEED_CPU_H
QEMU_CFLAGS+=-I$(SRC_PATH)/include
@@ -92,7 +98,7 @@ obj-$(CONFIG_TCG_INTERPRETER) += tci.o
obj-y += tcg/tcg-common.o
obj-$(CONFIG_TCG_INTERPRETER) += disas/tci.o
obj-y += fpu/softfloat.o
-obj-y += target-$(TARGET_BASE_ARCH)/
+obj-y += $(TARGET_FOLDER)/
obj-y += disas.o
obj-y += tcg-runtime.o
obj-$(call notempty,$(TARGET_XML_FILES)) += gdbstub-xml.o
--
1.8.3.1
- [Qemu-devel] [RFC for-2.9 00/11] Move target-* CPU file into a target/ folder, Thomas Huth, 2016/11/30
- [Qemu-devel] [RFC for-2.9 01/11] Makefile: Allow CPU targets to reside in target/ folder, too,
Thomas Huth <=
- [Qemu-devel] [RFC for-2.9 02/11] tilegx: Move CPU files to target/ folder, Thomas Huth, 2016/11/30
- [Qemu-devel] [RFC for-2.9 03/11] m68k: Move CPU files to target/ folder, Thomas Huth, 2016/11/30
- [Qemu-devel] [RFC for-2.9 04/11] alpha: Move CPU files to target/ folder, Thomas Huth, 2016/11/30
- [Qemu-devel] [RFC for-2.9 05/11] arm: Move CPU files to target/ folder, Thomas Huth, 2016/11/30
- [Qemu-devel] [RFC for-2.9 06/11] ppc: Move CPU files to target/ folder, Thomas Huth, 2016/11/30
- [Qemu-devel] [RFC for-2.9 07/11] i386: Move CPU files to target/ folder, Thomas Huth, 2016/11/30
- [Qemu-devel] [RFC for-2.9 08/11] microblaze: Move CPU files to target/ folder, Thomas Huth, 2016/11/30
- [Qemu-devel] [RFC for-2.9 09/11] mips: Move CPU files to target/ folder, Thomas Huth, 2016/11/30
- [Qemu-devel] [RFC for-2.9 10/11] s390x: Move CPU files to target/ folder, Thomas Huth, 2016/11/30
- [Qemu-devel] [RFC for-2.9 11/11] sparc: Move CPU files to target/ folder, Thomas Huth, 2016/11/30