All of lore.kernel.org
 help / color / mirror / Atom feed
From: Thomas Huth <thuth@redhat.com>
To: alex.bennee@linaro.org, pbonzini@redhat.com, rkrcmar@redhat.com
Cc: drjones@redhat.com, kvm@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org,
	kvmarm@lists.cs.columbia.edu, christoffer.dall@linaro.org,
	marc.zyngier@arm.com
Subject: [RFC kvm-unit-tests PATCH 9/8] Makefiles: Fix up the powerpc build include and link paths
Date: Fri,  7 Apr 2017 08:58:10 +0200	[thread overview]
Message-ID: <1491548290-11401-1-git-send-email-thuth@redhat.com> (raw)
In-Reply-To: <20170406190727.5624-9-alex.bennee@linaro.org>

The changes for out-of-tree builds are here pretty much the same
as for the ARM Makefile.common.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 powerpc/Makefile.common | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/powerpc/Makefile.common b/powerpc/Makefile.common
index e536ffe..1fbcafb 100644
--- a/powerpc/Makefile.common
+++ b/powerpc/Makefile.common
@@ -12,7 +12,10 @@ tests-common = \
 	$(TEST_DIR)/tm.elf \
 	$(TEST_DIR)/sprs.elf
 
-tests-all = $(tests-common) $(tests)
+scripts-common += $(TEST_DIR)/run
+scripts-common += $(TEST_DIR)/unittests.cfg
+
+tests-all = $(tests-common) $(tests) $(scripts_common)
 all: $(TEST_DIR)/boot_rom.bin $(tests-all)
 
 ##################################################################
@@ -21,14 +24,14 @@ CFLAGS += -std=gnu99
 CFLAGS += -ffreestanding
 CFLAGS += -Wextra
 CFLAGS += -O2
-CFLAGS += -I lib -I lib/libfdt
+CFLAGS += -I $(SRCDIR)/lib -I $(SRCDIR)/lib/libfdt -I lib
 CFLAGS += -Wa,-mregnames
 
 # We want to keep intermediate files
 .PRECIOUS: %.o
 
 asm-offsets = lib/$(ARCH)/asm-offsets.h
-include scripts/asm-offsets.mak
+include $(SRCDIR)/scripts/asm-offsets.mak
 
 cflatobjs += lib/util.o
 cflatobjs += lib/alloc.o
@@ -44,10 +47,11 @@ cflatobjs += lib/powerpc/smp.o
 FLATLIBS = $(libcflat) $(LIBFDT_archive)
 %.elf: CFLAGS += $(arch_CFLAGS)
 %.elf: LDFLAGS = $(arch_LDFLAGS) -nostdlib -pie -n
-%.elf: %.o $(FLATLIBS) powerpc/flat.lds $(cstart.o) $(reloc.o)
-	$(CC) $(CFLAGS) -c -o $(@:.elf=.aux.o) lib/auxinfo.c -DPROGNAME=\"$@\"
+%.elf: %.o $(FLATLIBS) $(SRCDIR)/powerpc/flat.lds $(cstart.o) $(reloc.o)
+	$(CC) $(CFLAGS) -c -o $(@:.elf=.aux.o) $(SRCDIR)/lib/auxinfo.c \
+		-DPROGNAME=\"$@\"
 	$(LD) $(LDFLAGS) -o $@ \
-		-T powerpc/flat.lds --build-id=none \
+		-T $(SRCDIR)/powerpc/flat.lds --build-id=none \
 		$(filter %.o, $^) $(FLATLIBS) $(@:.elf=.aux.o)
 	$(RM) $(@:.elf=.aux.o)
 	@echo -n Checking $@ for unsupported reloc types...
-- 
1.8.3.1

WARNING: multiple messages have this Message-ID (diff)
From: thuth@redhat.com (Thomas Huth)
To: linux-arm-kernel@lists.infradead.org
Subject: [RFC kvm-unit-tests PATCH 9/8] Makefiles: Fix up the powerpc build include and link paths
Date: Fri,  7 Apr 2017 08:58:10 +0200	[thread overview]
Message-ID: <1491548290-11401-1-git-send-email-thuth@redhat.com> (raw)
In-Reply-To: <20170406190727.5624-9-alex.bennee@linaro.org>

The changes for out-of-tree builds are here pretty much the same
as for the ARM Makefile.common.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 powerpc/Makefile.common | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/powerpc/Makefile.common b/powerpc/Makefile.common
index e536ffe..1fbcafb 100644
--- a/powerpc/Makefile.common
+++ b/powerpc/Makefile.common
@@ -12,7 +12,10 @@ tests-common = \
 	$(TEST_DIR)/tm.elf \
 	$(TEST_DIR)/sprs.elf
 
-tests-all = $(tests-common) $(tests)
+scripts-common += $(TEST_DIR)/run
+scripts-common += $(TEST_DIR)/unittests.cfg
+
+tests-all = $(tests-common) $(tests) $(scripts_common)
 all: $(TEST_DIR)/boot_rom.bin $(tests-all)
 
 ##################################################################
@@ -21,14 +24,14 @@ CFLAGS += -std=gnu99
 CFLAGS += -ffreestanding
 CFLAGS += -Wextra
 CFLAGS += -O2
-CFLAGS += -I lib -I lib/libfdt
+CFLAGS += -I $(SRCDIR)/lib -I $(SRCDIR)/lib/libfdt -I lib
 CFLAGS += -Wa,-mregnames
 
 # We want to keep intermediate files
 .PRECIOUS: %.o
 
 asm-offsets = lib/$(ARCH)/asm-offsets.h
-include scripts/asm-offsets.mak
+include $(SRCDIR)/scripts/asm-offsets.mak
 
 cflatobjs += lib/util.o
 cflatobjs += lib/alloc.o
@@ -44,10 +47,11 @@ cflatobjs += lib/powerpc/smp.o
 FLATLIBS = $(libcflat) $(LIBFDT_archive)
 %.elf: CFLAGS += $(arch_CFLAGS)
 %.elf: LDFLAGS = $(arch_LDFLAGS) -nostdlib -pie -n
-%.elf: %.o $(FLATLIBS) powerpc/flat.lds $(cstart.o) $(reloc.o)
-	$(CC) $(CFLAGS) -c -o $(@:.elf=.aux.o) lib/auxinfo.c -DPROGNAME=\"$@\"
+%.elf: %.o $(FLATLIBS) $(SRCDIR)/powerpc/flat.lds $(cstart.o) $(reloc.o)
+	$(CC) $(CFLAGS) -c -o $(@:.elf=.aux.o) $(SRCDIR)/lib/auxinfo.c \
+		-DPROGNAME=\"$@\"
 	$(LD) $(LDFLAGS) -o $@ \
-		-T powerpc/flat.lds --build-id=none \
+		-T $(SRCDIR)/powerpc/flat.lds --build-id=none \
 		$(filter %.o, $^) $(FLATLIBS) $(@:.elf=.aux.o)
 	$(RM) $(@:.elf=.aux.o)
 	@echo -n Checking $@ for unsupported reloc types...
-- 
1.8.3.1

  reply	other threads:[~2017-04-07  6:58 UTC|newest]

Thread overview: 62+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-04-06 19:07 [RFC kvm-unit-tests PATCH 0/8] Support for out-of-tree builds Alex Bennée
2017-04-06 19:07 ` Alex Bennée
2017-04-06 19:07 ` [RFC kvm-unit-tests PATCH 1/8] configure: make it run-able from outside source tree Alex Bennée
2017-04-06 19:07   ` Alex Bennée
2017-04-07 11:40   ` Andrew Jones
2017-04-07 11:40     ` Andrew Jones
2017-04-07 11:46     ` Peter Maydell
2017-04-07 11:46       ` Peter Maydell
2017-04-06 19:07 ` [RFC kvm-unit-tests PATCH 2/8] Makefile: ensure build-head works out-of-src-tree Alex Bennée
2017-04-06 19:07   ` Alex Bennée
2017-04-07 11:44   ` Andrew Jones
2017-04-07 11:44     ` Andrew Jones
2017-04-06 19:07 ` [RFC kvm-unit-tests PATCH 3/8] Makefile: set VPATH based on SRCDIR Alex Bennée
2017-04-06 19:07   ` Alex Bennée
2017-04-07 11:56   ` Andrew Jones
2017-04-07 11:56     ` Andrew Jones
2017-04-06 19:07 ` [RFC kvm-unit-tests PATCH 4/8] Makefiles: use explicit path for including sub-Makefiles Alex Bennée
2017-04-06 19:07   ` Alex Bennée
2017-04-07  8:53   ` Thomas Huth
2017-04-07  8:53     ` Thomas Huth
2017-04-07  9:21     ` Alex Bennée
2017-04-07  9:21       ` Alex Bennée
2017-04-07 12:20   ` Andrew Jones
2017-04-07 12:20     ` Andrew Jones
2017-04-27 15:54     ` Paolo Bonzini
2017-04-27 15:54       ` Paolo Bonzini
2017-04-06 19:07 ` [RFC kvm-unit-tests PATCH 5/8] Makefile: add explicit mkdir for .o targets Alex Bennée
2017-04-06 19:07   ` Alex Bennée
2017-04-07 14:42   ` Andrew Jones
2017-04-07 14:42     ` Andrew Jones
2017-04-27 15:57   ` Paolo Bonzini
2017-04-27 15:57     ` Paolo Bonzini
2017-05-11 15:30     ` Alex Bennée
2017-05-11 15:30       ` Alex Bennée
2017-05-12 10:36       ` Paolo Bonzini
2017-05-12 10:36         ` Paolo Bonzini
2017-05-12 11:14         ` Alex Bennée
2017-05-12 11:14           ` Alex Bennée
2017-04-06 19:07 ` [RFC kvm-unit-tests PATCH 6/8] Makefiles: handle linking of scripts into build-tree Alex Bennée
2017-04-06 19:07   ` Alex Bennée
2017-04-07  9:22   ` Thomas Huth
2017-04-07  9:22     ` Thomas Huth
2017-04-07 10:38     ` Alex Bennée
2017-04-07 10:38       ` Alex Bennée
2017-04-07 13:37       ` Andrew Jones
2017-04-07 13:37         ` Andrew Jones
2017-04-06 19:07 ` [RFC kvm-unit-tests PATCH 7/8] Makefiles: fix up the x86 build include and link paths Alex Bennée
2017-04-06 19:07   ` Alex Bennée
2017-04-07 13:31   ` Andrew Jones
2017-04-07 13:31     ` Andrew Jones
2017-04-07 14:30     ` Alex Bennée
2017-04-07 14:30       ` Alex Bennée
2017-04-06 19:07 ` [RFC kvm-unit-tests PATCH 8/8] Makefiles: fix up the arm " Alex Bennée
2017-04-06 19:07   ` Alex Bennée
2017-04-07  6:58   ` Thomas Huth [this message]
2017-04-07  6:58     ` [RFC kvm-unit-tests PATCH 9/8] Makefiles: Fix up the powerpc " Thomas Huth
2017-04-07  8:02     ` Alex Bennée
2017-04-07  8:02       ` Alex Bennée
2017-04-07 13:56   ` [RFC kvm-unit-tests PATCH 8/8] Makefiles: fix up the arm " Andrew Jones
2017-04-07 13:56     ` Andrew Jones
2017-04-07 14:29     ` Alex Bennée
2017-04-07 14:29       ` Alex Bennée

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1491548290-11401-1-git-send-email-thuth@redhat.com \
    --to=thuth@redhat.com \
    --cc=alex.bennee@linaro.org \
    --cc=christoffer.dall@linaro.org \
    --cc=drjones@redhat.com \
    --cc=kvm@vger.kernel.org \
    --cc=kvmarm@lists.cs.columbia.edu \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=marc.zyngier@arm.com \
    --cc=pbonzini@redhat.com \
    --cc=rkrcmar@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.