X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fgcc;h=77d1f264f245b178e9a2fce18ea4c260004d9a2f;hb=2ab923bb8ee35327065f4c724b5a10deee22b364;hp=9cc6ce3359ae4e6e5f48853f8ec4f8337d32f3c3;hpb=6c4cc7ea1bcb58c586ae64ae6f76720b6b89bda4;p=ipfire-2.x.git

diff --git a/lfs/gcc b/lfs/gcc
index 9cc6ce3359..77d1f264f2 100644
--- 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-2018  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,14 +24,14 @@
 
 include Config
 
-VER        = 6.3.0
+VER        = 7.3.0
 
-GMP_VER    = 5.0.5
-MPFR_VER   = 2.4.2
+GMP_VER    = 6.1.2
+MPFR_VER   = 3.1.6
 MPC_VER    = 1.0.3
 
 THISAPP    = gcc-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
@@ -40,6 +40,12 @@ 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 -mfunction-return=%,,$(CFLAGS))
+endif
+
 CXXFLAGS  := $(CFLAGS)
 
 ifeq "$(BUILD_ARCH)" "armv7hl"
@@ -174,18 +180,18 @@ 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
+$(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
 
 install : $(TARGET)
@@ -225,9 +231,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