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 smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (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 CB432C54798 for ; Thu, 29 Feb 2024 21:58:01 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 5BAD182B69; Thu, 29 Feb 2024 21:58:01 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 1x5_nl8qtH5H; Thu, 29 Feb 2024 21:57:59 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org EFE0D82BF4 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id EFE0D82BF4; Thu, 29 Feb 2024 21:57:58 +0000 (UTC) Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 619FA1BF20F for ; Thu, 29 Feb 2024 21:57:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id CFDC182B1A for ; Thu, 29 Feb 2024 21:57:45 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id bQnSz9zblHgT for ; Thu, 29 Feb 2024 21:57:45 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.167.122; helo=busybox.osuosl.org; envelope-from=buildroot-git-push@osuosl.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 1C4C882AC6 Received: from busybox.osuosl.org (busybox.osuosl.org [140.211.167.122]) by smtp1.osuosl.org (Postfix) with ESMTP id 1C4C882AC6 for ; Thu, 29 Feb 2024 21:57:45 +0000 (UTC) Received: by busybox.osuosl.org (Postfix, from userid 4053) id E93ED87DF3; Thu, 29 Feb 2024 21:57:44 +0000 (UTC) From: Peter Korsgaard To: buildroot@buildroot.org Date: Thu, 29 Feb 2024 22:54:12 +0100 X-Git-Refname: refs/heads/2023.02.x X-Git-Oldrev: eada744ed0e993fc32e25823b102c684ede74464 X-Git-Newrev: ff6150db0a3c7aa342c9a308942745632657798a X-Patchwork-Hint: ignore Message-Id: <20240229215744.E93ED87DF3@busybox.osuosl.org> Subject: [Buildroot] [git commit branch/2023.02.x] package/sdl2: force arm mode instead of Thumb mode X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" commit: https://git.buildroot.net/buildroot/commit/?id=ff6150db0a3c7aa342c9a308942745632657798a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Fix the following build failure in Thumb mode: /home/autobuild/autobuild/instance-12/output-1/build/sdl2-2.28.5/src/atomic/SDL_atomic.c:292:2: error: #error This file should be built in arm mode so the mcr instruction is available for memory barriers 292 | #error This file should be built in arm mode so the mcr instruction is available for memory barriers | ^~~~~ Fixes: - http://autobuild.buildroot.org/results/70587e7c2452563d655d054a7623bb2fd969862e - http://autobuild.buildroot.org/results/2cb11b1f3c013c1f49e2b5383a11ba3f1db6a24c Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit ecedc4ae8c0632cdd9ba0bf63a64a51e67a1525b) Signed-off-by: Peter Korsgaard --- package/sdl2/sdl2.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/package/sdl2/sdl2.mk b/package/sdl2/sdl2.mk index 5f2e1e0ed1..4e7494b3d2 100644 --- a/package/sdl2/sdl2.mk +++ b/package/sdl2/sdl2.mk @@ -54,6 +54,10 @@ SDL2_POST_INSTALL_STAGING_HOOKS += SDL2_FIX_SDL2_CONFIG_CMAKE # We must enable static build to get compilation successful. SDL2_CONF_OPTS += --enable-static +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +SDL2_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -marm" +endif + ifeq ($(BR2_PACKAGE_HAS_UDEV),y) SDL2_DEPENDENCIES += udev SDL2_CONF_OPTS += --enable-libudev @@ -76,7 +80,7 @@ endif ifeq ($(BR2_PACKAGE_SDL2_DIRECTFB),y) SDL2_DEPENDENCIES += directfb SDL2_CONF_OPTS += --enable-video-directfb -SDL2_CONF_ENV = ac_cv_path_DIRECTFBCONFIG=$(STAGING_DIR)/usr/bin/directfb-config +SDL2_CONF_ENV += ac_cv_path_DIRECTFBCONFIG=$(STAGING_DIR)/usr/bin/directfb-config else SDL2_CONF_OPTS += --disable-video-directfb endif _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot