From mboxrd@z Thu Jan  1 00:00:00 1970
From: Arne Fitzenreiter <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated.
 512111959126a5484b575a983b20e07b24f0968d
Date: Wed, 06 Dec 2023 07:21:30 +0000
Message-ID: <4SlTNc3865z2xf8@people01.haj.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2299441250006002158=="
List-Id: <ipfire-scm.lists.ipfire.org>

--===============2299441250006002158==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  512111959126a5484b575a983b20e07b24f0968d (commit)
       via  ea381f64a8426ad89ef7d49c80d5cbd9ada8147c (commit)
      from  43d72238cb760e409d9912a35eb28406eee539de (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 512111959126a5484b575a983b20e07b24f0968d
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Wed Dec 6 08:18:42 2023 +0100

    gcc: fix toolchain crossbuild
    
    gcc doesn't support mbranch-predict=standard on x86_64
    so this is removed in toolchain pass1

commit ea381f64a8426ad89ef7d49c80d5cbd9ada8147c
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Wed Dec 6 08:16:33 2023 +0100

    binutils: fix toolchain crossbuild
    
    gcc on x86_64 doesn't support mbrach-predict=standard so this has removed
    for toolchain pass1

-----------------------------------------------------------------------

Summary of changes:
 lfs/binutils | 2 ++
 lfs/gcc      | 1 +
 2 files changed, 3 insertions(+)

Difference in files:
diff --git a/lfs/binutils b/lfs/binutils
index 2b5c65592..b4b3cd921 100644
--- a/lfs/binutils
+++ b/lfs/binutils
@@ -51,6 +51,8 @@ ifeq "$(PASS)" "1"
   CFLAGS := $(patsubst -mfloat-abi=%,,$(CFLAGS))
   CFLAGS := $(patsubst -mindirect-branch=%,,$(CFLAGS))
   CFLAGS := $(patsubst -mfunction-return=%,,$(CFLAGS))
+  CFLAGS := $(patsubst -mbranch-protection=%,,$(CFLAGS))
+  CXXFLAGS := $(patsubst -mbranch-protection=%,,$(CXXFLAGS))
   CFLAGS := $(patsubst -fstack-clash-protection,,$(CFLAGS))
   CFLAGS := $(patsubst -fcf-protection,,$(CFLAGS))
 
diff --git a/lfs/gcc b/lfs/gcc
index c979aa199..5183903c7 100644
--- a/lfs/gcc
+++ b/lfs/gcc
@@ -43,6 +43,7 @@ CFLAGS    := $(patsubst -mfloat-abi=%,,$(CFLAGS))
 CFLAGS    := $(filter-out -fexceptions,$(CFLAGS))
 
 CFLAGS    := $(patsubst -mindirect-branch=%,,$(CFLAGS))
+CFLAGS    := $(patsubst -mbranch-protection=%,,$(CFLAGS))
 CFLAGS    := $(patsubst -mfunction-return=%,,$(CFLAGS))
 CFLAGS    := $(patsubst -fstack-clash-protection,,$(CFLAGS))
 CFLAGS    := $(patsubst -fcf-protection,,$(CFLAGS))


hooks/post-receive
--
IPFire 2.x development tree

--===============2299441250006002158==--