Merge remote-tracking branch 'origin/next'

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

diff --git a/lfs/gcc b/lfs/gcc
index 224a94bc738b02ae084a96e987de183fc7576597..3aa147ce813247da7cc0af876064ca13c67165ae 100644 (file)
--- a/lfs/gcc
+++ b/lfs/gcc
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2020  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,10 +24,10 @@
 
 include Config
 
-VER        = 9.2.0
+VER        = 10.2.0
 
-GMP_VER    = 6.1.2
-MPFR_VER   = 4.0.2
+GMP_VER    = 6.2.0
+MPFR_VER   = 4.1.0
 MPC_VER    = 1.1.0
 
 THISAPP    = gcc-$(VER)
@@ -44,6 +44,8 @@ CFLAGS    := $(filter-out -fexceptions,$(CFLAGS))
 ifeq "$(PASS)" "1"
 CFLAGS    := $(patsubst -mindirect-branch=%,,$(CFLAGS))
 CFLAGS    := $(patsubst -mfunction-return=%,,$(CFLAGS))
+CFLAGS    := $(patsubst -fstack-clash-protection,,$(CFLAGS))
+CFLAGS    := $(patsubst -fcf-protection,,$(CFLAGS))
 endif
 
 CXXFLAGS  := $(CFLAGS)
@@ -67,7 +69,7 @@ ifeq "$(ROOT)" ""
        --enable-threads=posix \
        --enable-__cxa_atexit \
        --enable-clocale=gnu \
-       --enable-languages=c,c++,go \
+       --enable-languages=c,c++ \
        --disable-bootstrap \
        --disable-nls
   EXTRA_MAKE =
@@ -149,6 +151,11 @@ endif
 endif
 endif
 
+ifeq "$(BUILD_ARCH)" "aarch64"
+       EXTRA_CONFIG += \
+               --enable-standard-branch-protection
+endif
+
 ifeq "$(BUILD_ARCH)" "armv7hl"
        EXTRA_CONFIG += \
                --with-float=hard
@@ -189,9 +196,9 @@ 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                 = 3818ad8600447f05349098232c2ddc78
-gmp-$(GMP_VER).tar.xz_MD5      = f58fa8001d60c4c77595fbbb62b63c1d
-mpfr-$(MPFR_VER).tar.xz_MD5    = 320fbc4463d4c8cb1e566929d8adc4f8
+$(DL_FILE)_MD5                 = e9fd9b1789155ad09bcf3ae747596b50
+gmp-$(GMP_VER).tar.xz_MD5      = a325e3f09e6d91e62101e59f9bda3ec1
+mpfr-$(MPFR_VER).tar.xz_MD5    = bdd3d5efba9c17da8d83a35ec552baef
 mpc-$(MPC_VER).tar.gz_MD5      = 4125404e41e482ec68282a2e687f6c73
 
 install : $(TARGET)
@@ -262,7 +269,7 @@ ifeq "$(PASS)" "L"
                $(EXTRA_ENV) \
                $(DIR_APP)/libstdc++-v3/configure \
                        $(EXTRA_CONFIG)
-       cd $(DIR_SRC)/gcc-build && make $(MAKETUNING) $(EXTRA_MAKE)
+       cd $(DIR_SRC)/gcc-build && make $(EXTRA_MAKE)
        cd $(DIR_SRC)/gcc-build && make $(EXTRA_INSTALL) install
 
 else
@@ -271,7 +278,7 @@ else
                $(EXTRA_ENV) \
                $(DIR_APP)/configure \
                        $(EXTRA_CONFIG)
-       cd $(DIR_SRC)/gcc-build && make $(MAKETUNING) $(EXTRA_MAKE)
+       cd $(DIR_SRC)/gcc-build && make $(EXTRA_MAKE)
        cd $(DIR_SRC)/gcc-build && make $(EXTRA_INSTALL) install
 endif