Drop support for i586

[ipfire-2.x.git] / lfs / gcc

diff --git a/lfs/gcc b/lfs/gcc
index 9cc6ce3359ae4e6e5f48853f8ec4f8337d32f3c3..ade02dcda1b081fa56dd314f8bc13d1238a46859 100644 (file)
--- a/lfs/gcc
+++ b/lfs/gcc
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2017  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2021  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # 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        #
@@ -24,29 +24,37 @@
 
 include Config
 
-VER        = 6.3.0
+VER        = 11.1.0
 
-GMP_VER    = 5.0.5
-MPFR_VER   = 2.4.2
-MPC_VER    = 1.0.3
+GMP_VER    = 6.2.1
+MPFR_VER   = 4.1.0
+MPC_VER    = 1.2.1
 
 THISAPP    = gcc-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
+ifeq "$(PASS)" "1"
 CFLAGS    := $(patsubst -march=%,,$(CFLAGS))
 CFLAGS    := $(patsubst -mfpu=%,,$(CFLAGS))
 CFLAGS    := $(patsubst -mtune=%,,$(CFLAGS))
 CFLAGS    := $(patsubst -mfloat-abi=%,,$(CFLAGS))
 CFLAGS    := $(filter-out -fexceptions,$(CFLAGS))
+
+CFLAGS    := $(patsubst -mindirect-branch=%,,$(CFLAGS))
+CFLAGS    := $(patsubst -mfunction-return=%,,$(CFLAGS))
+CFLAGS    := $(patsubst -fstack-clash-protection,,$(CFLAGS))
+CFLAGS    := $(patsubst -fcf-protection,,$(CFLAGS))
+endif
+
 CXXFLAGS  := $(CFLAGS)
 
 ifeq "$(BUILD_ARCH)" "armv7hl"
        FULL_BOOTSTRAP = 1
 endif
 
-ifeq "$(BUILD_ARCH)" "armv5tel"
+ifeq "$(BUILD_ARCH)" "armv6l"
        FULL_BOOTSTRAP = 1
 endif
 
@@ -143,21 +151,27 @@ endif
 endif
 endif
 
+ifeq "$(BUILD_ARCH)" "aarch64"
+       EXTRA_CONFIG += \
+               --enable-standard-branch-protection
+endif
+
 ifeq "$(BUILD_ARCH)" "armv7hl"
        EXTRA_CONFIG += \
                --with-float=hard
 endif
 
-ifeq "$(BUILD_ARCH)" "armv5tel"
+ifeq "$(BUILD_ARCH)" "armv6l"
        EXTRA_CONFIG += \
-               --with-float=soft \
-               --disable-sjlj-exceptions
+               --with-arch=armv6zk+fp \
+               --with-float=softfp
+#              --disable-sjlj-exceptions
 endif
 
-ifeq "$(BUILD_ARCH)" "i586"
+ifeq "$(BUILD_ARCH)" "riscv64"
        EXTRA_CONFIG += \
-               --with-arch=i586 \
-               --with-tune=generic
+               --with-arch=rv64gc \
+               --with-abi=lp64d
 endif
 
 EXTRA_CONFIG += \
@@ -174,19 +188,19 @@ export TCFLAGS = $(CFLAGS)
 ###############################################################################
 
 objects = $(DL_FILE) \
-       gmp-$(GMP_VER).tar.bz2 \
-       mpfr-$(MPFR_VER).tar.bz2 \
+       gmp-$(GMP_VER).tar.xz \
+       mpfr-$(MPFR_VER).tar.xz \
        mpc-$(MPC_VER).tar.gz
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-gmp-$(GMP_VER).tar.bz2 = $(DL_FROM)/gmp-$(GMP_VER).tar.bz2
-mpfr-$(MPFR_VER).tar.bz2 = $(DL_FROM)/mpfr-$(MPFR_VER).tar.bz2
+gmp-$(GMP_VER).tar.xz = $(DL_FROM)/gmp-$(GMP_VER).tar.xz
+mpfr-$(MPFR_VER).tar.xz = $(DL_FROM)/mpfr-$(MPFR_VER).tar.xz
 mpc-$(MPC_VER).tar.gz = $(DL_FROM)/mpc-$(MPC_VER).tar.gz
 
-$(DL_FILE)_MD5                 = 6e5ea04789678f1250c1b30c4d9ec417
-gmp-$(GMP_VER).tar.bz2_MD5     = 041487d25e9c230b0c42b106361055fe
-mpfr-$(MPFR_VER).tar.bz2_MD5   = 89e59fe665e2b3ad44a6789f40b059a0
-mpc-$(MPC_VER).tar.gz_MD5      = d6a1d5f8ddea3abd2cc3e98f58352d26
+$(DL_FILE)_MD5                 = 77f6252be0861ab918042acf42bc10ff
+gmp-$(GMP_VER).tar.xz_MD5      = 0b82665c4a92fd2ade7440c13fcaa42b
+mpfr-$(MPFR_VER).tar.xz_MD5    = bdd3d5efba9c17da8d83a35ec552baef
+mpc-$(MPC_VER).tar.gz_MD5      = 9f16c976c25bb0f76b50be749cd7a3a8
 
 install : $(TARGET)
 
@@ -216,6 +230,10 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) $(DIR_SRC)/gcc-build && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/gcc/gcc.git-745dae5-remove_cyclades.patch
+
+
        @mkdir $(DIR_SRC)/gcc-build
 
        cd $(DIR_APP) && sed -i 's/install_to_$$(INSTALL_DEST) //' libiberty/Makefile.in
@@ -225,9 +243,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
 ifeq "$(TOOLCHAIN)" "1"
        # Build gmp and mpfr internally in toolchain.
-       cd $(DIR_APP) && tar xfa $(DIR_DL)/gmp-$(GMP_VER).tar.bz2
+       cd $(DIR_APP) && tar xfa $(DIR_DL)/gmp-$(GMP_VER).tar.xz
        cd $(DIR_APP) && mv -v gmp-$(GMP_VER) gmp
-       cd $(DIR_APP) && tar xfa $(DIR_DL)/mpfr-$(MPFR_VER).tar.bz2
+       cd $(DIR_APP) && tar xfa $(DIR_DL)/mpfr-$(MPFR_VER).tar.xz
        cd $(DIR_APP) && mv -v mpfr-$(MPFR_VER) mpfr
        cd $(DIR_APP) && tar xfa $(DIR_DL)/mpc-$(MPC_VER).tar.gz
        cd $(DIR_APP) && mv -v mpc-$(MPC_VER) mpc
@@ -265,7 +283,7 @@ else
                $(EXTRA_ENV) \
                $(DIR_APP)/configure \
                        $(EXTRA_CONFIG)
-       cd $(DIR_SRC)/gcc-build && make $(EXTRA_MAKE)
+       cd $(DIR_SRC)/gcc-build && make $(EXTRA_MAKE) $(MAKETUNING)
        cd $(DIR_SRC)/gcc-build && make $(EXTRA_INSTALL) install
 endif