Skip to contentSkip to conversation

package/chicken: pass TARGET_CFLAGS to the build system

PATCH In review Max Filippov 2 participants 7 messages Aug 11, 2024 – Aug 12, 2024

lore
Share & tools
lore
#0 lore raw

cover package/chicken: pass TARGET_CFLAGS to the build system

Hello,

this series reverts xtensa-specific patch applied to the chicken package and instead passes TARGET_CFLAGS to the chicken build system.

Max Filippov (2):
Revert "package/chicken: move literals into text section for xtensa
architecture"
package/chicken: pass TARGET_CFLAGS to the build system

 .../0001-xtensa-text-section-literals.patch   | 30 -------------------
 package/chicken/chicken.mk                    | 15 ++--------
 2 files changed, 3 insertions(+), 42 deletions(-)
 delete mode 100644 package/chicken/0001-xtensa-text-section-literals.patch
Signature · 6 lines
2.39.2

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw

PATCH 1/2 Revert "package/chicken: move literals into text section for xtensa architecture"

This reverts commit 86e51fd5fe2810bbf833b48c4914dcd2de01bdbe.

---
 .../0001-xtensa-text-section-literals.patch   | 30 -------------------
 package/chicken/chicken.mk                    | 14 ++-------
 2 files changed, 2 insertions(+), 42 deletions(-)
 delete mode 100644 package/chicken/0001-xtensa-text-section-literals.patch
package/chicken/0001-xtensa-text-section-literals.patch deleted +0 -30
deleted file mode 100644
index b93aaf9e218d..000000000000
@@ -1,30 +0,0 @@
-From e8d177f4d4e1c6bc41787ea1621e323ff4ad493e Mon Sep 17 00:00:00 2001
-From: Woodrow Douglass <[email protected]>
-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 <[email protected]>
----
- 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
-
package/chicken/chicken.mk +2 -12
index 0520280134ab..2667f7823d8a 100644
@@ -11,19 +11,9 @@ CHICKEN_LICENSE_FILES = LICENSE
 CHICKEN_CPE_ID_VENDOR = call-cc
 CHICKEN_INSTALL_STAGING = YES
 
-# Chicken only uses the "arch" variable for some special-case compile
-# arguments If it's empty, it tries to detect the arch host Filter out
-# 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
-
+# If ARCH is not set, it attempts to autodiscover. But it is anyway not used.
 CHICKEN_MAKE_OPTS = \
-	ARCH="$(CHICKEN_ARCH)" \
+	ARCH=unused \
 	C_COMPILER="$(TARGET_CC)" \
 	CXX_COMPILER="$(TARGET_CXX)" \
 	PREFIX=/usr \
Signature · 6 lines
2.39.2

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#2 lore raw

Re: [Buildroot] [PATCH 1/2] Revert "package/chicken: move literals into text section for xtensa architecture"

Quoted 52 lines · Max Filippov

CAUTION: This email originated from outside of the organization. Do not click links or open attachments unless you recognize the sender.

This reverts commit 86e51fd5fe2810bbf833b48c4914dcd2de01bdbe.

---
  .../0001-xtensa-text-section-literals.patch   | 30 -------------------
  package/chicken/chicken.mk                    | 14 ++-------
  2 files changed, 2 insertions(+), 42 deletions(-)

delete mode 100644 package/chicken/0001-xtensa-text-section-literals.patch

package/chicken/0001-xtensa-text-section-literals.patch deleted +0 -30
deleted file mode 100644
index b93aaf9e218d..000000000000
@@ -1,30 +0,0 @@
-From e8d177f4d4e1c6bc41787ea1621e323ff4ad493e Mon Sep 17 00:00:00 2001
-From: Woodrow Douglass <[email protected]>
-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 <[email protected]>
----
- 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
-
package/chicken/chicken.mk +0 -0
index 0520280134ab..2667f7823d8a 100644

package/chicken/chicken.mk CHICKEN_LICENSE_FILES = LICENSE · line 18

Quoted 8 lines
package/chicken/chicken.mk +0 -5
@@ -11,19 +11,9 @@ CHICKEN_LICENSE_FILES = LICENSE
  CHICKEN_CPE_ID_VENDOR = call-cc
  CHICKEN_INSTALL_STAGING = YES
 
-# Chicken only uses the "arch" variable for some special-case compile
-# arguments If it's empty, it tries to detect the arch host Filter out
-# values that have an effect, or pass "unused" here
-ifeq ($(NORMALIZED_ARCH),x86_64)
-CHICKEN_ARCH = x86-64

changing the spelling to x86-64 here is a good idea i think, because chicken does add some flags. Other then that, i agree that the C_COMPILER_OPTIMIZATION_OPTIONS approach is better here

Quoted 14 lines
package/chicken/chicken.mk +2 -8
-else ifeq ($(NORMALIZED_ARCH),xtensa)
-CHICKEN_ARCH = xtensa
-else
-CHICKEN_ARCH = unused
-endif
-
+# If ARCH is not set, it attempts to autodiscover. But it is anyway not used.
  CHICKEN_MAKE_OPTS = \
-       ARCH="$(CHICKEN_ARCH)" \
+       ARCH=unused \
         C_COMPILER="$(TARGET_CC)" \
         CXX_COMPILER="$(TARGET_CXX)" \
         PREFIX=/usr \
--
Quoted 2 lines

2.39.2

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

#3 lore raw

Re: [Buildroot] [PATCH 1/2] Revert "package/chicken: move literals into text section for xtensa architecture"

Quoted 56 lines · Woody Douglass
Quoted 55 lines · Max Filippov

CAUTION: This email originated from outside of the organization. Do not click links or open attachments unless you recognize the sender.

This reverts commit 86e51fd5fe2810bbf833b48c4914dcd2de01bdbe.

---
  .../0001-xtensa-text-section-literals.patch   | 30 -------------------
  package/chicken/chicken.mk                    | 14 ++-------
  2 files changed, 2 insertions(+), 42 deletions(-)

delete mode 100644 package/chicken/0001-xtensa-text-section-literals.patch

package/chicken/0001-xtensa-text-section-literals.patch deleted +0 -30
deleted file mode 100644
index b93aaf9e218d..000000000000
@@ -1,30 +0,0 @@
-From e8d177f4d4e1c6bc41787ea1621e323ff4ad493e Mon Sep 17 00:00:00 2001
-From: Woodrow Douglass <[email protected]>
-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 <[email protected]>
----
- 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
-
package/chicken/chicken.mk +0 -0
index 0520280134ab..2667f7823d8a 100644
@@ -11,19 +11,9 @@ CHICKEN_LICENSE_FILES = LICENSE
  CHICKEN_CPE_ID_VENDOR = call-cc
  CHICKEN_INSTALL_STAGING = YES
 
Quoted 9 lines

package/chicken/chicken.mk CHICKEN_LICENSE_FILES = LICENSE · line 18

Quoted 5 lines
package/chicken/chicken.mk +0 -5
-# Chicken only uses the "arch" variable for some special-case compile
-# arguments If it's empty, it tries to detect the arch host Filter out
-# values that have an effect, or pass "unused" here
-ifeq ($(NORMALIZED_ARCH),x86_64)
-CHICKEN_ARCH = x86-64

changing the spelling to x86-64 here is a good idea i think, because chicken does add some flags. Other then that, i agree that the C_COMPILER_OPTIMIZATION_OPTIONS approach is better here

I believe that it should be done in a separate change as it has nothing to do with the topic of 'move literals into text section for xtensa architecture'.

Signature · 6 lines
Thanks.
-- Max
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#4 lore raw

Re: [Buildroot] [PATCH 1/2] Revert "package/chicken: move literals into text section for xtensa architecture"

Quoted 69 lines · Max Filippov

CAUTION: This email originated from outside of the organization. Do not click links or open attachments unless you recognize the sender.

Quoted 56 lines · Woody Douglass
Quoted 55 lines · Max Filippov

CAUTION: This email originated from outside of the organization. Do not click links or open attachments unless you recognize the sender.

This reverts commit 86e51fd5fe2810bbf833b48c4914dcd2de01bdbe.

---
   .../0001-xtensa-text-section-literals.patch   | 30 -------------------
   package/chicken/chicken.mk                    | 14 ++-------
   2 files changed, 2 insertions(+), 42 deletions(-)

delete mode 100644 package/chicken/0001-xtensa-text-section-literals.patch

package/chicken/0001-xtensa-text-section-literals.patch deleted +0 -30
deleted file mode 100644
index b93aaf9e218d..000000000000
@@ -1,30 +0,0 @@
-From e8d177f4d4e1c6bc41787ea1621e323ff4ad493e Mon Sep 17 00:00:00 2001
-From: Woodrow Douglass <[email protected]>
-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 <[email protected]>
----
- 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
-
package/chicken/chicken.mk +0 -0
index 0520280134ab..2667f7823d8a 100644
@@ -11,19 +11,9 @@ CHICKEN_LICENSE_FILES = LICENSE
   CHICKEN_CPE_ID_VENDOR = call-cc
   CHICKEN_INSTALL_STAGING = YES
 
Quoted 8 lines

package/chicken/chicken.mk CHICKEN_LICENSE_FILES = LICENSE · line 18

Quoted 5 lines
package/chicken/chicken.mk +0 -5
-# Chicken only uses the "arch" variable for some special-case compile
-# arguments If it's empty, it tries to detect the arch host Filter out
-# values that have an effect, or pass "unused" here
-ifeq ($(NORMALIZED_ARCH),x86_64)
-CHICKEN_ARCH = x86-64

changing the spelling to x86-64 here is a good idea i think, because chicken does add some flags. Other then that, i agree that the C_COMPILER_OPTIMIZATION_OPTIONS approach is better here

Quoted 7 lines

I believe that it should be done in a separate change as it has nothing to do with the topic of 'move literals into text section for xtensa architecture'.

--
Thanks.
-- Max

Sorry, this email was sent by mistake -- the git send-email workflow is very new for me.

-Woody Douglass

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

#5 lore raw

PATCH 2/2 package/chicken: pass TARGET_CFLAGS to the build system

In reply to Max Filippov

chicken build system expects non-standard environment variables with compiler names and compiler options. Pass buildroot TARGET_CFLAGS in chicken C_COMPILER_OPTIMIZATION_OPTIONS.

---
 package/chicken/chicken.mk | 1 +
 1 file changed, 1 insertion(+)
package/chicken/chicken.mk +1 -0
index 2667f7823d8a..0000fc635ed5 100644
@@ -16,6 +16,7 @@ CHICKEN_MAKE_OPTS = \
 	ARCH=unused \
 	C_COMPILER="$(TARGET_CC)" \
 	CXX_COMPILER="$(TARGET_CXX)" \
+	C_COMPILER_OPTIMIZATION_OPTIONS="$(TARGET_CFLAGS)" \
 	PREFIX=/usr \
 	PLATFORM=linux \
 	LIBRARIAN="$(TARGET_AR)"
Signature · 6 lines
2.39.2

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#6 lore raw
In reply to Max Filippov
Quoted 4 lines · On Sat, 10 Aug 2024 17:00:27 -0700 Max Filippov <[email protected]> wrote:

Max Filippov (2):
Revert "package/chicken: move literals into text section for xtensa
architecture"
package/chicken: pass TARGET_CFLAGS to the build system

Thanks, both applied to master!

Thomas

Signature · 7 lines
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot