From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arne Fitzenreiter To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, master, updated. cf58f6593148f55b2016e2a18af75925271ef1b7 Date: Thu, 24 Sep 2020 05:41:21 +0000 Message-ID: <4BxkS13Yddz2y8c@people01.haj.ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2644103728376228921==" List-Id: --===============2644103728376228921== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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, master has been updated via cf58f6593148f55b2016e2a18af75925271ef1b7 (commit) via d83422d1c06058b66762477d9dcd008ff70bf485 (commit) from 5eab2b3893538800a2f0aa9433028508a3ca7c0f (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 cf58f6593148f55b2016e2a18af75925271ef1b7 Author: Arne Fitzenreiter Date: Thu Sep 24 07:38:56 2020 +0200 make.sh fix i586 code generation. =20 -fcf-protection insert non i586 instructions that crash on amd k6 and geo= de to build a working glibc also the toolchain compiler must build without t= his so this need a new toolchain. =20 Signed-off-by: Arne Fitzenreiter commit d83422d1c06058b66762477d9dcd008ff70bf485 Author: Arne Fitzenreiter Date: Thu Sep 24 07:36:01 2020 +0200 toolchain: fix build with gcc<8 on builder. =20 gcc-7 not support -fcf-protection so filter it from CFLAGS. also filter -mtune in first pass because it should optimized for the actual host. =20 Signed-off-by: Arne Fitzenreiter ----------------------------------------------------------------------- Summary of changes: lfs/binutils | 2 ++ lfs/ccache | 5 ++++- lfs/gcc | 4 +++- lfs/glibc | 2 +- make.sh | 4 ++-- 5 files changed, 12 insertions(+), 5 deletions(-) Difference in files: diff --git a/lfs/binutils b/lfs/binutils index 334adad25..6db2e990f 100644 --- a/lfs/binutils +++ b/lfs/binutils @@ -51,6 +51,8 @@ ifeq "$(PASS)" "1" CFLAGS :=3D $(patsubst -mfloat-abi=3D%,,$(CFLAGS)) CFLAGS :=3D $(patsubst -mindirect-branch=3D%,,$(CFLAGS)) CFLAGS :=3D $(patsubst -mfunction-return=3D%,,$(CFLAGS)) + CFLAGS :=3D $(patsubst -fstack-clash-protection,,$(CFLAGS)) + CFLAGS :=3D $(patsubst -fcf-protection,,$(CFLAGS)) =20 TARGET =3D $(DIR_INFO)/$(THISAPP)-tools1 EXTRA_CONFIG =3D \ diff --git a/lfs/ccache b/lfs/ccache index 94d7bd149..1361f3ed0 100644 --- a/lfs/ccache +++ b/lfs/ccache @@ -1,7 +1,7 @@ ############################################################################= ### # = # # IPFire.org - A linux based firewall = # -# Copyright (C) 2007-2018 IPFire Team = # +# Copyright (C) 2007-2020 IPFire Team = # # = # # This program is free software: you can redistribute it and/or modify = # # it under the terms of the GNU General Public License as published by = # @@ -34,10 +34,13 @@ TARGET =3D $(DIR_INFO)/$(THISAPP)-pass$(PASS) =20 ifeq "$(PASS)" "1" CFLAGS :=3D $(patsubst -march=3D%,,$(CFLAGS)) + CFLAGS :=3D $(patsubst -mtune=3D%,,$(CFLAGS)) CFLAGS :=3D $(patsubst -mfpu=3D%,,$(CFLAGS)) CFLAGS :=3D $(patsubst -mfloat-abi=3D%,,$(CFLAGS)) CFLAGS :=3D $(patsubst -mindirect-branch=3D%,,$(CFLAGS)) CFLAGS :=3D $(patsubst -mfunction-return=3D%,,$(CFLAGS)) + CFLAGS :=3D $(patsubst -fstack-clash-protection,,$(CFLAGS)) + CFLAGS :=3D $(patsubst -fcf-protection,,$(CFLAGS)) endif =20 ############################################################################= ### diff --git a/lfs/gcc b/lfs/gcc index 7cbc8e9e8..3aa147ce8 100644 --- a/lfs/gcc +++ b/lfs/gcc @@ -1,7 +1,7 @@ ############################################################################= ### # = # # IPFire.org - A linux based firewall = # -# Copyright (C) 2007-2018 IPFire Team = # +# Copyright (C) 2007-2020 IPFire Team = # # = # # This program is free software: you can redistribute it and/or modify = # # it under the terms of the GNU General Public License as published by = # @@ -44,6 +44,8 @@ CFLAGS :=3D $(filter-out -fexceptions,$(CFLAGS)) ifeq "$(PASS)" "1" CFLAGS :=3D $(patsubst -mindirect-branch=3D%,,$(CFLAGS)) CFLAGS :=3D $(patsubst -mfunction-return=3D%,,$(CFLAGS)) +CFLAGS :=3D $(patsubst -fstack-clash-protection,,$(CFLAGS)) +CFLAGS :=3D $(patsubst -fcf-protection,,$(CFLAGS)) endif =20 CXXFLAGS :=3D $(CFLAGS) diff --git a/lfs/glibc b/lfs/glibc index 802c372a9..281c290dc 100644 --- a/lfs/glibc +++ b/lfs/glibc @@ -1,7 +1,7 @@ ############################################################################= ### # = # # IPFire.org - A linux based firewall = # -# Copyright (C) 2007-2018 IPFire Team = # +# Copyright (C) 2007-2020 IPFire Team = # # = # # This program is free software: you can redistribute it and/or modify = # # it under the terms of the GNU General Public License as published by = # diff --git a/make.sh b/make.sh index 2a6198e05..ab90e5143 100755 --- a/make.sh +++ b/make.sh @@ -39,7 +39,7 @@ GIT_BRANCH=3D"$(git rev-parse --abbrev-ref HEAD)" # Git B= ranch GIT_TAG=3D"$(git tag | tail -1)" # Git Tag GIT_LASTCOMMIT=3D"$(git rev-parse --verify HEAD)" # Last commit =20 -TOOLCHAINVER=3D20200814 +TOOLCHAINVER=3D20200924 =20 ############################################################################= ### # @@ -153,7 +153,7 @@ configure_build() { BUILDTARGET=3D"${build_arch}-pc-linux-gnu" CROSSTARGET=3D"${build_arch}-cross-linux-gnu" BUILD_PLATFORM=3D"x86" - CFLAGS_ARCH=3D"-march=3Di586 -mtune=3Dgeneric -fomit-frame-pointer -fcf-p= rotection" + CFLAGS_ARCH=3D"-march=3Di586 -mtune=3Dgeneric -fomit-frame-pointer" ;; =20 aarch64) hooks/post-receive -- IPFire 2.x development tree --===============2644103728376228921==--