From patchwork Tue Aug 6 13:05:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Woodrow Douglass X-Patchwork-Id: 1969547 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.133; helo=smtp2.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WdYTw0qf0z1ydt for ; Tue, 6 Aug 2024 23:06:28 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 43492400F6; Tue, 6 Aug 2024 13:06:25 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id npOfAgWR-Jm2; Tue, 6 Aug 2024 13:06:24 +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 smtp2.osuosl.org 018AA409EC Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id 018AA409EC; Tue, 6 Aug 2024 13:06:24 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 8E4921BF300; Tue, 6 Aug 2024 13:06:22 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 7C3AC81194; Tue, 6 Aug 2024 13:06:22 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id 7GboaOFTogtI; Tue, 6 Aug 2024 13:06:21 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=34.202.193.197; helo=sendmail.purelymail.com; envelope-from=git@douglass.dev; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp1.osuosl.org 7764E81190 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 7764E81190 Received: from sendmail.purelymail.com (sendmail.purelymail.com [34.202.193.197]) by smtp1.osuosl.org (Postfix) with ESMTPS id 7764E81190 for ; Tue, 6 Aug 2024 13:06:21 +0000 (UTC) Feedback-ID: 3578:1022:null:purelymail X-Pm-Original-To: buildroot@buildroot.org Received: by smtp.purelymail.com (Purelymail SMTP) with ESMTPSA id 304458; (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384); Tue, 06 Aug 2024 13:06:16 +0000 (UTC) To: buildroot@buildroot.org Date: Tue, 6 Aug 2024 09:05:53 -0400 Message-Id: <20240806130553.981094-1-wdouglass@carnegierobotics.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dmarc=fail (p=quarantine dis=none) header.from=carnegierobotics.com Subject: [Buildroot] [PATCH] package/chicken: pass TARGET_CFLAGS to chicken build system explicitly 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: , X-Patchwork-Original-From: Woodrow Douglass via buildroot From: Woodrow Douglass Reply-To: Woodrow Douglass Cc: Woodrow Douglass Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Chicken Scheme's build system wants cflags to be passed as a make variable in a way that's different then what buildroot expects. this bridges the gap. This commit also fixes the xtensa build problems, negating the need for the xtensa build patch Signed-off-by: Woodrow Douglass --- .../0001-xtensa-text-section-literals.patch | 30 ------------------- package/chicken/chicken.mk | 3 +- 2 files changed, 1 insertion(+), 32 deletions(-) delete mode 100644 package/chicken/0001-xtensa-text-section-literals.patch diff --git a/package/chicken/0001-xtensa-text-section-literals.patch b/package/chicken/0001-xtensa-text-section-literals.patch deleted file mode 100644 index b93aaf9e21..0000000000 --- a/package/chicken/0001-xtensa-text-section-literals.patch +++ /dev/null @@ -1,30 +0,0 @@ -From e8d177f4d4e1c6bc41787ea1621e323ff4ad493e Mon Sep 17 00:00:00 2001 -From: Woodrow Douglass -Date: Mon, 22 Jul 2024 08:50:37 -0400 -Subject: [PATCH] Move literals into text section for xtensa architecture - -Upstream: https://bugs.call-cc.org/ticket/1840 -Signed-off-by: Woodrow Douglass ---- - Makefile.linux | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/Makefile.linux b/Makefile.linux -index b628cda4..e97c2b94 100644 ---- a/Makefile.linux -+++ b/Makefile.linux -@@ -52,6 +52,11 @@ USES_SONAME = yes - - # architectures - -+ifeq ($(ARCH),xtensa) -+C_COMPILER_OPTIONS += -mtext-section-literals -+LINKER_OPTIONS += -mtext-section-literals -+endif -+ - ifeq ($(ARCH),x32) - C_COMPILER_OPTIONS += -mx32 - LINKER_OPTIONS += -mx32 --- -2.39.2 - diff --git a/package/chicken/chicken.mk b/package/chicken/chicken.mk index 0520280134..e7a2384f5a 100644 --- a/package/chicken/chicken.mk +++ b/package/chicken/chicken.mk @@ -16,8 +16,6 @@ CHICKEN_INSTALL_STAGING = YES # values that have an effect, or pass "unused" here ifeq ($(NORMALIZED_ARCH),x86_64) CHICKEN_ARCH = x86-64 -else ifeq ($(NORMALIZED_ARCH),xtensa) -CHICKEN_ARCH = xtensa else CHICKEN_ARCH = unused endif @@ -25,6 +23,7 @@ endif CHICKEN_MAKE_OPTS = \ ARCH="$(CHICKEN_ARCH)" \ C_COMPILER="$(TARGET_CC)" \ + C_COMPILER_OPTIONS="$(TARGET_CFLAGS) -fwrapv -DHAVE_CHICKEN_CONFIG_H -DC_ENABLE_PTABLES" \ CXX_COMPILER="$(TARGET_CXX)" \ PREFIX=/usr \ PLATFORM=linux \