suricata: Link against libatomic on armv5tel

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

diff --git a/lfs/gcc b/lfs/gcc
index 6fdf2ea314e6913fa49cefc8a90e20dd68d24a9e..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,11 +24,11 @@
 
 include Config
 
-VER        = 7.3.0
+VER        = 10.2.0
 
-GMP_VER    = 6.1.2
-MPFR_VER   = 3.1.6
-MPC_VER    = 1.0.3
+GMP_VER    = 6.2.0
+MPFR_VER   = 4.1.0
+MPC_VER    = 1.1.0
 
 THISAPP    = gcc-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -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)
@@ -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,10 +196,10 @@ 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                 = be2da21680f27624f3a87055c4ba5af2
-gmp-$(GMP_VER).tar.xz_MD5      = f58fa8001d60c4c77595fbbb62b63c1d
-mpfr-$(MPFR_VER).tar.xz_MD5    = 51bfdbf81553966c8d43808122cc81b3
-mpc-$(MPC_VER).tar.gz_MD5      = d6a1d5f8ddea3abd2cc3e98f58352d26
+$(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)
 
@@ -224,8 +231,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @rm -rf $(DIR_APP) $(DIR_SRC)/gcc-build && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
        @mkdir $(DIR_SRC)/gcc-build
 
-       cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/gcc-7-glibc-2.28-ustat.patch
-
        cd $(DIR_APP) && sed -i 's/install_to_$$(INSTALL_DEST) //' libiberty/Makefile.in
        cd $(DIR_APP) && sed -i gcc/Makefile.in \
                -e 's@\./fixinc\.sh@-c true@' \