qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Alex Bennée" <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: fam@euphon.net, berrange@redhat.com,
	"Eduardo Habkost" <ehabkost@redhat.com>,
	"Richard Henderson" <richard.henderson@linaro.org>,
	f4bug@amsat.org, stefanha@redhat.com, crosa@redhat.com,
	pbonzini@redhat.com, "Alex Bennée" <alex.bennee@linaro.org>,
	aurelien@aurel32.net
Subject: [PATCH  v2 06/11] tests/tcg/i386: force -fno-pie for test-i386
Date: Thu,  1 Apr 2021 11:25:25 +0100	[thread overview]
Message-ID: <20210401102530.12030-7-alex.bennee@linaro.org> (raw)
In-Reply-To: <20210401102530.12030-1-alex.bennee@linaro.org>

The containerised compiler defaults to no-pie anyway but if we are
relying on the users installed cross compiler we need to check it
works for building 16 bit code first.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
 tests/tcg/configure.sh         |  6 ++++++
 tests/tcg/i386/Makefile.target | 16 +++++++++++++---
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh
index 90fd81f506..46bc8634bb 100755
--- a/tests/tcg/configure.sh
+++ b/tests/tcg/configure.sh
@@ -281,6 +281,12 @@ for target in $target_list; do
                 echo "CROSS_CC_HAS_POWER8_VECTOR=y" >> $config_target_mak
             fi
         ;;
+        i386-linux-user)
+            if do_compiler "$target_compiler" $target_compiler_cflags \
+                -Werror -fno-pie -no-pie -o $TMPE $TMPC; then
+                echo "CROSS_CC_HAS_I386_NOPIE=y" >> $config_target_mak
+            fi
+        ;;
     esac
 
     enabled_cross_compilers="$enabled_cross_compilers $target_compiler"
diff --git a/tests/tcg/i386/Makefile.target b/tests/tcg/i386/Makefile.target
index c4a6f91966..f7efaab918 100644
--- a/tests/tcg/i386/Makefile.target
+++ b/tests/tcg/i386/Makefile.target
@@ -27,13 +27,23 @@ run-plugin-test-i386-bmi2-%: QEMU_OPTS += -cpu max
 hello-i386: CFLAGS+=-ffreestanding
 hello-i386: LDFLAGS+=-nostdlib
 
-#
-# test-386 includes a couple of additional objects that need to be linked together
-#
+# test-386 includes a couple of additional objects that need to be
+# linked together, we also need a no-pie capable compiler due to the
+# non-pic calls into 16-bit mode
+ifneq ($(DOCKER_IMAGE)$(CROSS_CC_HAS_I386_NOPIE),)
+test-i386: CFLAGS += -fno-pie
 
 test-i386: test-i386.c test-i386-code16.S test-i386-vm86.S test-i386.h test-i386-shift.h test-i386-muldiv.h
 	$(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_CFLAGS) -o $@ \
 	   $(<D)/test-i386.c $(<D)/test-i386-code16.S $(<D)/test-i386-vm86.S -lm
+else
+test-i386:
+	$(call skip-test, "BUILD of $@", "missing -no-pie compiler support")
+run-test-i386:
+	$(call skip-test, "RUN of test-i386", "not built")
+run-plugin-test-i386-with-%:
+	$(call skip-test, "RUN of test-i386 ($*)", "not built")
+endif
 
 ifeq ($(SPEED), slow)
 
-- 
2.20.1



  parent reply	other threads:[~2021-04-01 10:36 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-01 10:25 [PATCH for 6.0-rc2 v2 00/11] various fixes, pre-PR (check-tcg, gdbstub, gitlab) Alex Bennée
2021-04-01 10:25 ` [PATCH v2 01/11] tests/tcg: update the defaults for x86 compilers Alex Bennée
2021-04-06 10:29   ` Philippe Mathieu-Daudé
2021-04-01 10:25 ` [PATCH v2 02/11] tests/docker: don't set DOCKER_REGISTRY on non-x86_64 Alex Bennée
2021-04-01 10:25 ` [PATCH v2 03/11] tests/tcg: add concept of container_hosts Alex Bennée
2021-04-02 16:23   ` Richard Henderson
2021-04-06 11:16   ` Philippe Mathieu-Daudé
2021-04-01 10:25 ` [PATCH v2 04/11] tests/tcg/configure.sh: make sure we pick up x86_64 cross compilers Alex Bennée
2021-04-02 16:26   ` Richard Henderson
2021-04-06  9:46     ` Alex Bennée
2021-04-01 10:25 ` [PATCH v2 05/11] tests/tcg/i386: expand .data sections for system tests Alex Bennée
2021-04-01 10:25 ` Alex Bennée [this message]
2021-04-02 16:27   ` [PATCH v2 06/11] tests/tcg/i386: force -fno-pie for test-i386 Richard Henderson
2021-04-06 13:59     ` Alex Bennée
2021-04-01 10:25 ` [PATCH v2 07/11] tests/tcg: relax the next step precision of the gdb sha1 test Alex Bennée
2021-04-02 16:41   ` Richard Henderson
2021-04-02 18:38     ` Richard Henderson
2021-04-06  9:43     ` Alex Bennée
2021-04-01 10:25 ` [PATCH v2 08/11] docs/system/gdb.rst: Add some more heading structure Alex Bennée
2021-04-01 10:25 ` [PATCH v2 09/11] docs/system/gdb.rst: Document how to debug multicore machines Alex Bennée
2021-04-01 10:25 ` [PATCH v2 10/11] gitlab-ci.yml: Fix the filtering for the git submodules Alex Bennée
2021-04-01 14:17   ` Willian Rampazzo
2021-04-01 10:25 ` [PATCH v2 11/11] gitlab-ci.yml: Test the dtrace backend in one of the jobs 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=20210401102530.12030-7-alex.bennee@linaro.org \
    --to=alex.bennee@linaro.org \
    --cc=aurelien@aurel32.net \
    --cc=berrange@redhat.com \
    --cc=crosa@redhat.com \
    --cc=ehabkost@redhat.com \
    --cc=f4bug@amsat.org \
    --cc=fam@euphon.net \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=richard.henderson@linaro.org \
    --cc=stefanha@redhat.com \
    --subject='Re: [PATCH  v2 06/11] tests/tcg/i386: force -fno-pie for test-i386' \
    /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

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).