From patchwork Thu Oct 24 09:55:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 13848660 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8AA04CDDE6A for ; Thu, 24 Oct 2024 09:57:40 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t3ua4-0001En-PT; Thu, 24 Oct 2024 05:56:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t3uZh-00017p-A0 for qemu-devel@nongnu.org; Thu, 24 Oct 2024 05:56:15 -0400 Received: from mail-ej1-x633.google.com ([2a00:1450:4864:20::633]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1t3uZd-0003lw-N7 for qemu-devel@nongnu.org; Thu, 24 Oct 2024 05:56:13 -0400 Received: by mail-ej1-x633.google.com with SMTP id a640c23a62f3a-a9a850270e2so111784266b.0 for ; Thu, 24 Oct 2024 02:56:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1729763766; x=1730368566; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=WlYwCLJPntZpps5540Jdj5JvD8apt5/VR01vEu64SdQ=; b=TTFN/MvGzrtOITIT2IXQYJhqQtOwoheglbAWN0LWxNJQJveL6eNXnsdWhBWW71gKpW DPhQ9iwRJyxIp9R0NKFz9sUjQB95H5GlLAuCTJDbVfBr+aw/rFlfAMzIlMa4lWbliHO3 baRZO+U2M/+AK7qfI96l80tZiT6vcj/nSR5WdrONfHJHFG+lP8d5mLjbYiA/LUrZ90Yz 28naikF53mWGQiVKEgDPoRCUqd9vQRDPUZreSCl9Cg+5+QL3j8Z7MsqEPFekh6SVmAxA EcuJRT/82w+T/PGqOtXYZC6rjFWwyKh+bzZt0ZqaDuAjfmrRSr9ZL/La2Lw/E9Vc68r7 xAJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729763766; x=1730368566; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WlYwCLJPntZpps5540Jdj5JvD8apt5/VR01vEu64SdQ=; b=UQMS6ik0Vqf72OJve9Y9JPUFVZNm4iUogI+pw3zcnO5DeCtJcwxSmrhVgkS/Lej044 WS0bynbh5eQkVtPVY0vyrbWbpel8nZBeronMrFHpTgfe8oWShAO2HAz3nZikJyAblfyD jX1/PKHec5g/FI0cqCxS0M19MlRSzn8EfpKNIFbRYSi9MEfggBHbIOCC2lTp6orBXmeo HQCf7xDs10K5TwJI71cjjNqbASYWyaCi/wsksdnnBUoJwLdF7wwwne8hqTnCoEa2c/aj CIilRvc0QK2OhvaNuCnG4l4utNOtgYTOF4nPq/RPODqhzMdfLeUVWRQpoYLGcflU/2jH tBgQ== X-Gm-Message-State: AOJu0Yxa+RmGcFfGoTztaiqQaEnAvMuhitiY4u3yClSWD39sufEtsmHz 6xQMYMLF8dDBbIZH7G+syrg/MMNmqot0HGk4ytTKHQXInLOrZzRUwyWRsfjNr+M= X-Google-Smtp-Source: AGHT+IFsPt0ZN/1WYYftpt5idLLMwmTAGSaC5DoxOHWJKgqdzcaThMvPoTm9+zJR4CyEKltMgzA2nQ== X-Received: by 2002:a17:906:d554:b0:a99:5ad9:b672 with SMTP id a640c23a62f3a-a9abf853500mr478993666b.10.1729763765825; Thu, 24 Oct 2024 02:56:05 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a9a91575894sm591717166b.185.2024.10.24.02.56.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Oct 2024 02:56:04 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 1F7CA5F8AD; Thu, 24 Oct 2024 10:56:04 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Ilya Leoshkevich , Peter Maydell , Pierrick Bouvier , =?utf-8?q?Alex_Benn=C3=A9e?= , "Edgar E. Iglesias" , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta Subject: [PULL 01/17] tests/docker: Fix microblaze atomics Date: Thu, 24 Oct 2024 10:55:47 +0100 Message-Id: <20241024095603.1813285-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241024095603.1813285-1-alex.bennee@linaro.org> References: <20241024095603.1813285-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::633; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x633.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Ilya Leoshkevich GCC produces invalid code for microblaze atomics. The fix is unfortunately not upstream, so fetch it from an external location and apply it locally. Suggested-by: Peter Maydell Signed-off-by: Ilya Leoshkevich Reviewed-by: Pierrick Bouvier Message-Id: <20240919152308.10440-1-iii@linux.ibm.com> Signed-off-by: Alex Bennée Message-Id: <20241023113406.1284676-2-alex.bennee@linaro.org> diff --git a/tests/docker/dockerfiles/debian-microblaze-cross.d/build-toolchain.sh b/tests/docker/dockerfiles/debian-microblaze-cross.d/build-toolchain.sh index 23ec0aa9a7..c5cd0aa931 100755 --- a/tests/docker/dockerfiles/debian-microblaze-cross.d/build-toolchain.sh +++ b/tests/docker/dockerfiles/debian-microblaze-cross.d/build-toolchain.sh @@ -10,6 +10,8 @@ TOOLCHAIN_INSTALL=/usr/local TOOLCHAIN_BIN=${TOOLCHAIN_INSTALL}/bin CROSS_SYSROOT=${TOOLCHAIN_INSTALL}/$TARGET/sys-root +GCC_PATCH0_URL=https://raw.githubusercontent.com/Xilinx/meta-xilinx/refs/tags/xlnx-rel-v2024.1/meta-microblaze/recipes-devtools/gcc/gcc-12/0009-Patch-microblaze-Fix-atomic-boolean-return-value.patch + export PATH=${TOOLCHAIN_BIN}:$PATH # @@ -31,6 +33,12 @@ mv gcc-11.2.0 src-gcc mv musl-1.2.2 src-musl mv linux-5.10.70 src-linux +# +# Patch gcc +# + +wget -O - ${GCC_PATCH0_URL} | patch -d src-gcc -p1 + mkdir -p bld-hdr bld-binu bld-gcc bld-musl mkdir -p ${CROSS_SYSROOT}/usr/include diff --git a/tests/docker/dockerfiles/debian-toolchain.docker b/tests/docker/dockerfiles/debian-toolchain.docker index 687a97fec4..ab4ce29533 100644 --- a/tests/docker/dockerfiles/debian-toolchain.docker +++ b/tests/docker/dockerfiles/debian-toolchain.docker @@ -10,6 +10,8 @@ FROM docker.io/library/debian:11-slim # ??? The build-dep isn't working, missing a number of # minimal build dependiencies, e.g. libmpc. +RUN sed 's/^deb /deb-src /' /etc/apt/sources.list.d/deb-src.list + RUN apt update && \ DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \ DEBIAN_FRONTEND=noninteractive eatmydata \ @@ -33,6 +35,11 @@ RUN cd /root && ./build-toolchain.sh # and the build trees by restoring the original image, # then copying the built toolchain from stage 0. FROM docker.io/library/debian:11-slim +RUN apt update && \ + DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \ + DEBIAN_FRONTEND=noninteractive eatmydata \ + apt install -y --no-install-recommends \ + libmpc3 COPY --from=0 /usr/local /usr/local # As a final step configure the user (if env is defined) ARG USER