[PULL 02/21] Makefile: dtc: update, build the libfdt target

qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed

From: "Alex Bennée" <alex.bennee@linaro.org>
To: peter.maydell@linaro.org
Cc: "Alex Bennée" <alex.bennee@linaro.org>,
	"Philippe Mathieu-Daudé" <philmd@redhat.com>,
	qemu-devel@nongnu.org, "Claudio Fontana" <cfontana@suse.de>
Subject: [PULL 02/21] Makefile: dtc: update, build the libfdt target
Date: Tue, 16 Jun 2020 13:53:05 +0100	[thread overview]
Message-ID: <20200616125324.19045-3-alex.bennee@linaro.org> (raw)
In-Reply-To: <20200616125324.19045-1-alex.bennee@linaro.org>

From: Claudio Fontana <cfontana@suse.de>

dtc submodule update, now call the libfdt target from the new
dtc Makefile, which has been changed to not require bison, flex, etc.
This removes warnings during the build.

scripts/ symlink and tests directory creation are not necessary,
and neither is calling the clean rule explicitly.

Signed-off-by: Claudio Fontana <cfontana@suse.de>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20200518160319.18861-2-cfontana@suse.de>
Message-Id: <20200612190237.30436-3-alex.bennee@linaro.org>

diff --git a/configure b/configure
index 89867a17208..8a9f544b0b7 100755
--- a/configure
+++ b/configure
@@ -4312,7 +4312,6 @@ EOF
           mkdir -p dtc
           if [ "$pwd_is_source_path" != "y" ] ; then
               symlink "$source_path/dtc/Makefile" "dtc/Makefile"
-              symlink "$source_path/dtc/scripts" "dtc/scripts"
           fi
           fdt_cflags="-I\$(SRC_PATH)/dtc/libfdt"
           fdt_ldflags="-L\$(BUILD_DIR)/dtc/libfdt"
diff --git a/Makefile b/Makefile
index ed0ed93b2d6..895410fbf9c 100644
--- a/Makefile
+++ b/Makefile
@@ -526,13 +526,14 @@ $(SOFTMMU_FUZZ_RULES): $(edk2-decompressed)
 $(TARGET_DIRS_RULES):
 	$(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C $(dir $@) V="$(V)" TARGET_DIR="$(dir $@)" $(notdir $@),)
 
-DTC_MAKE_ARGS=-I$(SRC_PATH)/dtc VPATH=$(SRC_PATH)/dtc -C dtc V="$(V)" LIBFDT_srcdir=$(SRC_PATH)/dtc/libfdt
+# LIBFDT_lib="": avoid breaking existing trees with objects requiring -fPIC
+DTC_MAKE_ARGS=-I$(SRC_PATH)/dtc VPATH=$(SRC_PATH)/dtc -C dtc V="$(V)" LIBFDT_lib=""
 DTC_CFLAGS=$(CFLAGS) $(QEMU_CFLAGS)
-DTC_CPPFLAGS=-I$(BUILD_DIR)/dtc -I$(SRC_PATH)/dtc -I$(SRC_PATH)/dtc/libfdt
+DTC_CPPFLAGS=-I$(SRC_PATH)/dtc/libfdt
 
 .PHONY: dtc/all
-dtc/all: .git-submodule-status dtc/libfdt dtc/tests
-	$(call quiet-command,$(MAKE) $(DTC_MAKE_ARGS) CPPFLAGS="$(DTC_CPPFLAGS)" CFLAGS="$(DTC_CFLAGS)" LDFLAGS="$(QEMU_LDFLAGS)" ARFLAGS="$(ARFLAGS)" CC="$(CC)" AR="$(AR)" LD="$(LD)" $(SUBDIR_MAKEFLAGS) libfdt/libfdt.a,)
+dtc/all: .git-submodule-status dtc/libfdt
+	$(call quiet-command,$(MAKE) $(DTC_MAKE_ARGS) CPPFLAGS="$(DTC_CPPFLAGS)" CFLAGS="$(DTC_CFLAGS)" LDFLAGS="$(QEMU_LDFLAGS)" ARFLAGS="$(ARFLAGS)" CC="$(CC)" AR="$(AR)" LD="$(LD)" $(SUBDIR_MAKEFLAGS) libfdt,)
 
 dtc/%: .git-submodule-status
 	@mkdir -p $@
@@ -820,7 +821,6 @@ distclean: clean
 	rm -rf $$d || exit 1 ; \
         done
 	rm -Rf .sdk
-	if test -f dtc/version_gen.h; then $(MAKE) $(DTC_MAKE_ARGS) clean; fi
 
 KEYMAPS=da     en-gb  et  fr     fr-ch  is  lt  no  pt-br  sv \
 ar      de     en-us  fi  fr-be  hr     it  lv  nl         pl  ru     th \
diff --git a/dtc b/dtc
index 88f18909db7..85e5d839847 160000
--- a/dtc
+++ b/dtc
@@ -1 +1 @@
-Subproject commit 88f18909db731a627456f26d779445f84e449536
+Subproject commit 85e5d839847af54efab170f2b1331b2a6421e647
-- 
2.20.1

next prev parent reply	other threads:[~2020-06-16 12:58 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-06-16 12:53 [PULL 00/21] testing and plugin updates (tsan, plugins, cross-builds) Alex Bennée
2020-06-16 12:53 ` [PULL 01/21] tests/docker: bump fedora to 32 Alex Bennée
2020-06-16 13:23   ` Philippe Mathieu-Daudé
2020-06-16 13:52     ` Alex Bennée
2020-06-16 14:43       ` Philippe Mathieu-Daudé
2020-06-16 12:53 ` Alex Bennée [this message]
2020-06-16 12:53 ` [PULL 03/21] Makefile: remove old compatibility gunks Alex Bennée
2020-06-16 12:53 ` [PULL 04/21] configure: add --enable-tsan flag + fiber annotations for coroutine-ucontext Alex Bennée
2020-06-16 12:53 ` [PULL 05/21] cpu: convert queued work to a QSIMPLEQ Alex Bennée
2020-06-16 12:53 ` [PULL 06/21] thread: add qemu_spin_destroy Alex Bennée
2020-06-16 12:53 ` [PULL 07/21] cputlb: destroy CPUTLB with tlb_destroy Alex Bennée
2020-06-16 12:53 ` [PULL 08/21] qht: call qemu_spin_destroy for head buckets Alex Bennée
2020-06-16 12:53 ` [PULL 09/21] tcg: call qemu_spin_destroy for tb->jmp_lock Alex Bennée
2020-06-16 12:53 ` [PULL 10/21] translate-all: call qemu_spin_destroy for PageDesc Alex Bennée
2020-06-16 12:53 ` [PULL 11/21] thread: add tsan annotations to QemuSpin Alex Bennée
2020-06-16 12:53 ` [PULL 12/21] tests/docker: Added docker build support for TSan Alex Bennée
2020-06-16 12:53 ` [PULL 13/21] include/qemu: Added tsan.h for annotations Alex Bennée
2020-06-16 12:53 ` [PULL 14/21] util: Added tsan annotate for thread name Alex Bennée
2020-06-16 12:53 ` [PULL 15/21] docs: Added details on TSan to testing.rst Alex Bennée
2020-06-16 12:53 ` [PULL 16/21] tests: Disable select tests under TSan, which hit TSan issue Alex Bennée
2020-06-16 12:53 ` [PULL 17/21] Revert ".shippable: temporaily disable some cross builds" Alex Bennée
2020-06-16 12:53 ` [PULL 18/21] cirrus.yml: serialise make check Alex Bennée
2020-06-16 12:53 ` [PULL 19/21] tests/tcg: build plugin list from contents of src directory Alex Bennée
2020-06-16 12:53 ` [PULL 20/21] tests/tcg: ensure -cpu max also used for plugin run Alex Bennée
2020-06-16 12:53 ` [PULL 21/21] plugins: new lockstep plugin for debugging TCG changes Alex Bennée

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:89867a1720 dfblob:8a9f544b0b dfblob:ed0ed93b2d
dfblob:895410fbf9 dfblob:88f18909db dfblob:85e5d83984 )
 OR (
bs:"[PULL 02/21] Makefile: dtc: update, build the libfdt target" )
	(help)

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=20200616125324.19045-3-alex.bennee@linaro.org \
    --to=alex.bennee@linaro.org \
    --cc=cfontana@suse.de \
    --cc=peter.maydell@linaro.org \
    --cc=philmd@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).