]> git.ipfire.org Git - ipfire-2.x.git/blobdiff - lfs/gcc
projects / ipfire-2.x.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
suricata: Change midstream policy to "pass-flow"
[ipfire-2.x.git] / lfs / gcc
diff --git a/lfs/gcc b/lfs/gcc
index 6fdf2ea314e6913fa49cefc8a90e20dd68d24a9e..5183903c7e5dfcfb6ddbf78a75a851053b06e045 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-2022  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,38 +24,33 @@
 
 include Config
 
-VER        = 7.3.0
+VER        = 13.2.0
 
-GMP_VER    = 6.1.2
-MPFR_VER   = 3.1.6
-MPC_VER    = 1.0.3
+GMP_VER    = 6.2.1
+MPFR_VER   = 4.2.0
+MPC_VER    = 1.3.1
 
 THISAPP    = gcc-$(VER)
 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))
 
-ifeq "$(PASS)" "1"
 CFLAGS    := $(patsubst -mindirect-branch=%,,$(CFLAGS))
+CFLAGS    := $(patsubst -mbranch-protection=%,,$(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"
-       FULL_BOOTSTRAP = 1
-endif
-
 # Normal build or $(TOOLS_DIR) build.
 #
 ifeq "$(ROOT)" ""
@@ -72,6 +67,9 @@ ifeq "$(ROOT)" ""
        --disable-nls
   EXTRA_MAKE =
   EXTRA_INSTALL =
+ifeq "$(PASS)" "A"
+  TARGET = $(DIR_INFO)/$(THISAPP)-libatomic
+endif
 else
 ifeq "$(PASS)" "1"
   TARGET = $(DIR_INFO)/$(THISAPP)-tools1
@@ -81,8 +79,10 @@ ifeq "$(PASS)" "1"
        --with-sysroot=$(ROOT) \
        --with-local-prefix=$(TOOLS_DIR) \
        --with-native-system-header-dir=$(TOOLS_DIR)/include \
+       --with-glibc-version=2.11 \
        --disable-nls \
        --disable-shared \
+       --disable-multilib \
        --disable-decimal-float \
        --disable-threads \
        --disable-libatomic \
@@ -101,8 +101,8 @@ ifeq "$(PASS)" "1"
        --without-ppl \
        --without-cloog \
        --enable-languages=c,c++
-  EXTRA_MAKE = 
-  EXTRA_INSTALL = 
+  EXTRA_MAKE =
+  EXTRA_INSTALL =
 else
 ifeq "$(PASS)" "2"
   TARGET = $(DIR_INFO)/$(THISAPP)-tools2
@@ -113,20 +113,17 @@ ifeq "$(PASS)" "2"
        RANLIB="$(CROSSTARGET)-ranlib"
   EXTRA_CONFIG = \
        --build=$(BUILDTARGET) \
+       --host=$(BUILDTARGET) \
        --prefix=$(TOOLS_DIR) \
        --with-local-prefix=$(TOOLS_DIR) \
        --with-native-system-header-dir=$(TOOLS_DIR)/include \
+       --disable-bootstrap \
        --enable-languages=c,c++ \
        --disable-libstdcxx-pch \
+       --disable-multilib \
        --disable-libgomp
-  EXTRA_MAKE = 
-  EXTRA_INSTALL = 
-
-  ifeq "$(FULL_BOOTSTRAP)" "1"
-       EXTRA_CONFIG += --enable-bootstrap
-  else
-       EXTRA_CONFIG += --disable-bootstrap
-  endif
+  EXTRA_MAKE =
+  EXTRA_INSTALL =
 else
   # PASS=L # libstdc++-v3
   TARGET = $(DIR_INFO)/$(THISAPP)-libstdc++
@@ -143,32 +140,26 @@ else
        --disable-libstdcxx-threads \
        --disable-libstdcxx-pch \
        --with-gxx-include-dir=$(TOOLS_DIR)/$(CROSSTARGET)/include/c++/$(VER)
-  EXTRA_MAKE = 
-  EXTRA_INSTALL = 
-endif
+  EXTRA_MAKE =
+  EXTRA_INSTALL =
 endif
 endif
-
-ifeq "$(BUILD_ARCH)" "armv7hl"
-       EXTRA_CONFIG += \
-               --with-float=hard
 endif
 
-ifeq "$(BUILD_ARCH)" "armv5tel"
+ifeq "$(BUILD_ARCH)" "aarch64"
        EXTRA_CONFIG += \
-               --with-float=soft \
-               --disable-sjlj-exceptions
+               --enable-standard-branch-protection
 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 += \
        --disable-multilib \
-       --with-bugurl=http://bugtracker.ipfire.org \
+       --with-bugurl=https://bugzilla.ipfire.org \
        --disable-libunwind-exceptions \
        --enable-gnu-unique-object
 
@@ -189,10 +180,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)_BLAKE2 = 0034b29d3d6cc05821f0c4253ce077805943aff7b370729dd203bda57d89c107edd657eeddc2fb1e69ea15c7b0323b961f46516c7f4af89a3ccf7fea84701be2
+gmp-$(GMP_VER).tar.xz_BLAKE2   = c0d85f175392a50cfa01bc6b0a312b235946ad8b4f6f84f6dabd33d7a6f2cc75c9b0e1e33057be07750bfa0145b7c4cf3b6188a5be6ca9d7271ec2276c84ebcb
+mpfr-$(MPFR_VER).tar.xz_BLAKE2 = dd88ae3a6a910ad8faeb791b49c3b1085de5d0d4c49c637c124bf4d9bc79fb621d0d1d69e07d0642b9b678f6d355a5830d083dfd189e1e91d0e04c970c10bd64
+mpc-$(MPC_VER).tar.gz_BLAKE2   = 76434e6f8830af3571836d51576bfebbc9701e9bbb5c4686f134081cd96cd90ae02f7ff42bf9e3957c7a7ba92b6b2d9cdabe18f0269271147521cd7f6a2d551c
 
 install : $(TARGET)
 
@@ -200,10 +191,10 @@ check : $(patsubst %,$(DIR_CHK)/%,$(objects))
 
 download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
-md5 : $(subst %,%_MD5,$(objects))
+b2 : $(subst %,%_BLAKE2,$(objects))
 
 ###############################################################################
-# Downloading, checking, md5sum
+# Downloading, checking, b2sum
 ###############################################################################
 
 $(patsubst %,$(DIR_CHK)/%,$(objects)) :
@@ -212,8 +203,8 @@ $(patsubst %,$(DIR_CHK)/%,$(objects)) :
 $(patsubst %,$(DIR_DL)/%,$(objects)) :
        @$(LOAD)
 
-$(subst %,%_MD5,$(objects)) :
-       @$(MD5)
+$(subst %,%_BLAKE2,$(objects)) :
+       @$(B2SUM)
 
 ###############################################################################
 # Installation Details
@@ -222,9 +213,9 @@ $(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)
-       @mkdir $(DIR_SRC)/gcc-build
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/gcc/gcc-13.1.0-riscv_use_log2_from_cheader_without_namespace.patch
 
-       cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/gcc-7-glibc-2.28-ustat.patch
+       @mkdir $(DIR_SRC)/gcc-build
 
        cd $(DIR_APP) && sed -i 's/install_to_$$(INSTALL_DEST) //' libiberty/Makefile.in
        cd $(DIR_APP) && sed -i gcc/Makefile.in \
@@ -266,16 +257,25 @@ ifeq "$(PASS)" "L"
                        $(EXTRA_CONFIG)
        cd $(DIR_SRC)/gcc-build && make $(EXTRA_MAKE)
        cd $(DIR_SRC)/gcc-build && make $(EXTRA_INSTALL) install
-
+else
+ifeq "$(PASS)" "A"
+       # libatomic pass
+       cd $(DIR_SRC)/gcc-build && \
+               $(EXTRA_ENV) \
+               $(DIR_APP)/libatomic/configure \
+                       $(EXTRA_CONFIG)
+       cd $(DIR_SRC)/gcc-build && make $(EXTRA_MAKE)
+       cd $(DIR_SRC)/gcc-build && make $(EXTRA_INSTALL) install
 else
        # The actual build.
        cd $(DIR_SRC)/gcc-build && \
                $(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
+endif
 
 ifeq "$(TOOLCHAIN)" "1"
  ifeq "$(PASS)" "1"
IPFire 2.x development tree