Skip to content

SR-DT: Fix GCC 13 SME build compatibility #746

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chetan-rathore merged 1 commit into from
Jun 3, 2026
Merged

SR-DT: Fix GCC 13 SME build compatibility #746

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions SystemReady-devicetree-band/Yocto/meta-woden/recipes-acs/bsa-acs-uefi/bsa-acs.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ COMPATIBLE_MACHINE:genericarm64 = "genericarm64"
SRC_URI += "git://github.com/ARM-software/sysarch-acs;destsuffix=edk2/ShellPkg/Application/sysarch-acs;protocol=https;branch=main;name=sysarch-acs \
git://github.com/tianocore/edk2-libc;destsuffix=edk2/edk2-libc;protocol=https;branch=master;name=edk2-libc \
file://bsa_dtversion.patch;patch=1;patchdir=ShellPkg/Application/sysarch-acs \
file://0001-bsa-Remove-SME-build-flag-for-GCC-13.patch;patch=1;patchdir=ShellPkg/Application/sysarch-acs \
"

SRCREV_sysarch-acs = "${AUTOREV}"
Expand Down
30 changes: 30 additions & 0 deletions ...meta-woden/recipes-acs/bsa-acs-uefi/files/0001-bsa-Remove-SME-build-flag-for-GCC-13.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
diff --git a/apps/uefi/Bsa.inf b/apps/uefi/Bsa.inf
index a50c841..a3d8957 100644
--- a/apps/uefi/Bsa.inf
+++ b/apps/uefi/Bsa.inf
@@ -359,4 +359,4 @@

[BuildOptions]
GCC:*_*_*_ASM_FLAGS = -march=armv8.1-a
- GCC:*_*_*_CC_FLAGS = -O0 -march=armv8.6-a+sve+sve2+sme+profile+lse $(ACS_CORE_INCLUDE_FLAGS) $(ACS_GIC_INCLUDE_FLAGS) $(ACS_PCIE_INCLUDE_FLAGS) -DTARGET_UEFI
+ GCC:*_*_*_CC_FLAGS = -O0 -march=armv8.6-a+sve+sve2+profile+lse $(ACS_CORE_INCLUDE_FLAGS) $(ACS_GIC_INCLUDE_FLAGS) $(ACS_PCIE_INCLUDE_FLAGS) -DTARGET_UEFI
diff --git a/val/ValLib.inf b/val/ValLib.inf
index 09c043a..030d6cf 100644
--- a/val/ValLib.inf
+++ b/val/ValLib.inf
@@ -88,4 +88,4 @@

[BuildOptions]
GCC:*_*_*_ASM_FLAGS = -march=armv8.6-a+sve+profile
- GCC:*_*_*_CC_FLAGS = -march=armv8.6-a+sve+sve2+sme+profile+lse $(ACS_CORE_INCLUDE_FLAGS) $(ACS_GIC_INCLUDE_FLAGS) $(ACS_PCIE_INCLUDE_FLAGS) -DTARGET_UEFI
+ GCC:*_*_*_CC_FLAGS = -march=armv8.6-a+sve+sve2+profile+lse $(ACS_CORE_INCLUDE_FLAGS) $(ACS_GIC_INCLUDE_FLAGS) $(ACS_PCIE_INCLUDE_FLAGS) -DTARGET_UEFI
diff --git a/val/ValLibRB.inf b/val/ValLibRB.inf
index 47fbc59..0ef20ce 100644
--- a/val/ValLibRB.inf
+++ b/val/ValLibRB.inf
@@ -93,4 +93,4 @@

[BuildOptions]
GCC:*_*_*_ASM_FLAGS = -march=armv8.6-a+sve+profile
- GCC:*_*_*_CC_FLAGS = -march=armv8.6-a+sve+sve2+sme+profile+lse $(ACS_CORE_INCLUDE_FLAGS) $(ACS_GIC_INCLUDE_FLAGS) $(ACS_PCIE_INCLUDE_FLAGS) -DTARGET_UEFI -DCOMPILE_RB_EXE
+ GCC:*_*_*_CC_FLAGS = -march=armv8.6-a+sve+sve2+profile+lse $(ACS_CORE_INCLUDE_FLAGS) $(ACS_GIC_INCLUDE_FLAGS) $(ACS_PCIE_INCLUDE_FLAGS) -DTARGET_UEFI -DCOMPILE_RB_EXE
20 changes: 20 additions & 0 deletions ...to/meta-woden/recipes-acs/pfdi-acs/files/0001-pfdi-Remove-SME-build-flag-for-GCC-13.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
diff --git a/val/ValLib.inf b/val/ValLib.inf
index 09c043a..030d6cf 100644
--- a/val/ValLib.inf
+++ b/val/ValLib.inf
@@ -88,4 +88,4 @@

[BuildOptions]
GCC:*_*_*_ASM_FLAGS = -march=armv8.6-a+sve+profile
- GCC:*_*_*_CC_FLAGS = -march=armv8.6-a+sve+sve2+sme+profile+lse $(ACS_CORE_INCLUDE_FLAGS) $(ACS_GIC_INCLUDE_FLAGS) $(ACS_PCIE_INCLUDE_FLAGS) -DTARGET_UEFI
+ GCC:*_*_*_CC_FLAGS = -march=armv8.6-a+sve+sve2+profile+lse $(ACS_CORE_INCLUDE_FLAGS) $(ACS_GIC_INCLUDE_FLAGS) $(ACS_PCIE_INCLUDE_FLAGS) -DTARGET_UEFI
diff --git a/val/ValLibRB.inf b/val/ValLibRB.inf
index 47fbc59..0ef20ce 100644
--- a/val/ValLibRB.inf
+++ b/val/ValLibRB.inf
@@ -93,4 +93,4 @@

[BuildOptions]
GCC:*_*_*_ASM_FLAGS = -march=armv8.6-a+sve+profile
- GCC:*_*_*_CC_FLAGS = -march=armv8.6-a+sve+sve2+sme+profile+lse $(ACS_CORE_INCLUDE_FLAGS) $(ACS_GIC_INCLUDE_FLAGS) $(ACS_PCIE_INCLUDE_FLAGS) -DTARGET_UEFI -DCOMPILE_RB_EXE
+ GCC:*_*_*_CC_FLAGS = -march=armv8.6-a+sve+sve2+profile+lse $(ACS_CORE_INCLUDE_FLAGS) $(ACS_GIC_INCLUDE_FLAGS) $(ACS_PCIE_INCLUDE_FLAGS) -DTARGET_UEFI -DCOMPILE_RB_EXE
1 change: 1 addition & 0 deletions SystemReady-devicetree-band/Yocto/meta-woden/recipes-acs/pfdi-acs/pfdi-acs.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ COMPATIBLE_MACHINE:genericarm64 = "genericarm64"
SRC_URI += "git://github.com/ARM-software/sysarch-acs;destsuffix=edk2/ShellPkg/Application/sysarch-acs;protocol=https;branch=main;name=sysarch-acs \
git://github.com/tianocore/edk2-libc;destsuffix=edk2/edk2-libc;protocol=https;branch=master;name=edk2-libc \
file://pfdi_dtversion.patch;patch=1;patchdir=ShellPkg/Application/sysarch-acs \
file://0001-pfdi-Remove-SME-build-flag-for-GCC-13.patch;patch=1;patchdir=ShellPkg/Application/sysarch-acs \
"

SRCREV_sysarch-acs = "${AUTOREV}"
Expand Down
Loading