libstatgrab: Update automake

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

diff --git a/lfs/gcc b/lfs/gcc
index 7cbc8e9e84e112063ebeab553220a3964a7a5371..bd254288d06b9b357e4d15879714232868aa959c 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        #
@@ -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)
@@ -171,6 +173,12 @@ ifeq "$(BUILD_ARCH)" "i586"
                --with-tune=generic
 endif
 
+ifeq "$(BUILD_ARCH)" "riscv64"
+       EXTRA_CONFIG += \
+               --with-arch=rv64gc \
+               --with-abi=lp64d
+endif
+
 EXTRA_CONFIG += \
        --disable-multilib \
        --with-bugurl=http://bugtracker.ipfire.org \