From 12f15c9155b31fc9f964a5233b0fbec9196f56f3 Mon Sep 17 00:00:00 2001 From: Alice Frosi Date: Tue, 30 Jan 2018 14:38:28 +0100 Subject: Fix configure for s390 qemu on alpine and other busybox environments In alpine docker image the qemu-system-s390x build is broken and it throws this error: qemu-system-s390x: Initialization of device s390-ipl failed: could not load bootloader 's390-ccw.img' The grep command of busybox uses regex. This fails on binary data (e.g. stops on every \0), so it does not identify the string BiGeNdIaN in the test case big/little. Therefore, it assumes that the architecture is little endian. This fix solves the grep problem by printing the content of TMPO with strings Signed-off-by: Alice Frosi Signed-off-by: Christian Borntraeger [some changes to patch description, add -a option to strings] Message-Id: <20180130133828.77336-2-borntraeger@de.ibm.com> Reviewed-by: Eric Blake Signed-off-by: Cornelia Huck --- configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 831ebf248f..1be413a004 100755 --- a/configure +++ b/configure @@ -1933,9 +1933,9 @@ int main(int argc, char *argv[]) { EOF if compile_object ; then - if grep -q BiGeNdIaN $TMPO ; then + if strings -a $TMPO | grep -q BiGeNdIaN ; then bigendian="yes" - elif grep -q LiTtLeEnDiAn $TMPO ; then + elif strings -a $TMPO | grep -q LiTtLeEnDiAn ; then bigendian="no" else echo big/little test failed -- cgit v1.2.1 From 63685bc489f68530d50f381a241d8fef5924f41c Mon Sep 17 00:00:00 2001 From: David Hildenbrand Date: Mon, 29 Jan 2018 13:56:20 +0100 Subject: configure: s390x supports mttcg now s390x is ready. Most likely we are missing some pieces, but it should already be in pretty good shape now. Signed-off-by: David Hildenbrand Message-Id: <20180129125623.21729-16-david@redhat.com> Signed-off-by: Cornelia Huck --- configure | 1 + 1 file changed, 1 insertion(+) (limited to 'configure') diff --git a/configure b/configure index 1be413a004..2cf383549c 100755 --- a/configure +++ b/configure @@ -6731,6 +6731,7 @@ case "$target_name" in echo "TARGET_ABI32=y" >> $config_target_mak ;; s390x) + mttcg=yes gdb_xml_files="s390x-core64.xml s390-acr.xml s390-fpr.xml s390-vx.xml s390-cr.xml s390-virt.xml s390-gs.xml" ;; tilegx) -- cgit v1.2.1