X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fgcc;h=a7ed450f0da74da56d6add068289bc5406dfe64d;hb=HEAD;hp=563e94c16bdce8d4098956f27c7997ce8d68e3a9;hpb=0b6ba4a0ca2e08cd9fc56e99e80d33a6fe88b395;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/gcc b/lfs/gcc
index 563e94c16b..93d25d26d1 100644
--- a/lfs/gcc
+++ b/lfs/gcc
@@ -24,11 +24,11 @@
 
 include Config
 
-VER        = 11.1.0
+VER        = 14.2.0
 
-GMP_VER    = 6.2.1
-MPFR_VER   = 4.1.0
-MPC_VER    = 1.2.1
+GMP_VER    = 6.3.0
+MPFR_VER   = 4.2.1
+MPC_VER    = 1.3.1
 
 THISAPP    = gcc-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -43,6 +43,7 @@ CFLAGS    := $(patsubst -mfloat-abi=%,,$(CFLAGS))
 CFLAGS    := $(filter-out -fexceptions,$(CFLAGS))
 
 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))
@@ -50,14 +51,6 @@ endif
 
 CXXFLAGS  := $(CFLAGS)
 
-ifeq "$(BUILD_ARCH)" "armv7hl"
-	FULL_BOOTSTRAP = 1
-endif
-
-ifeq "$(BUILD_ARCH)" "armv6l"
-	FULL_BOOTSTRAP = 1
-endif
-
 # Normal build or $(TOOLS_DIR) build.
 #
 ifeq "$(ROOT)" ""
@@ -74,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
@@ -121,18 +117,13 @@ ifeq "$(PASS)" "2"
 	--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
 else
   # PASS=L # libstdc++-v3
   TARGET = $(DIR_INFO)/$(THISAPP)-libstdc++
@@ -160,18 +151,6 @@ ifeq "$(BUILD_ARCH)" "aarch64"
 		--enable-standard-branch-protection
 endif
 
-ifeq "$(BUILD_ARCH)" "armv7hl"
-	EXTRA_CONFIG += \
-		--with-float=hard
-endif
-
-ifeq "$(BUILD_ARCH)" "armv6l"
-	EXTRA_CONFIG += \
-		--with-arch=armv6zk+fp \
-		--with-float=softfp
-#		--disable-sjlj-exceptions
-endif
-
 ifeq "$(BUILD_ARCH)" "riscv64"
 	EXTRA_CONFIG += \
 		--with-arch=rv64gc \
@@ -182,8 +161,7 @@ EXTRA_CONFIG += \
 	--disable-multilib \
 	--with-bugurl=https://bugzilla.ipfire.org \
 	--disable-libunwind-exceptions \
-	--enable-gnu-unique-object \
-	--without-zstd
+	--enable-gnu-unique-object
 
 export XCFLAGS = $(CFLAGS)
 export TCFLAGS = $(CFLAGS)
@@ -202,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			= 77f6252be0861ab918042acf42bc10ff
-gmp-$(GMP_VER).tar.xz_MD5	= 0b82665c4a92fd2ade7440c13fcaa42b
-mpfr-$(MPFR_VER).tar.xz_MD5	= bdd3d5efba9c17da8d83a35ec552baef
-mpc-$(MPC_VER).tar.gz_MD5	= 9f16c976c25bb0f76b50be749cd7a3a8
+$(DL_FILE)_BLAKE2 = 87baf2a06dfa75d8fb6cd62c747ef1f57d3b9bbbe33a360d9ed3de4b4dbeaa8d920504c67e409bd9863414202c14fd854b46108e984418171205119216d03d3b
+gmp-$(GMP_VER).tar.xz_BLAKE2	= a865129e2b3f634ec5bad7f97ed89532e43f5662ac47a7d8ab7f0df8c9f8d0886bd984651422e2573c2163bca69c0547c248147ec90880accbd53db97dc0ddee
+mpfr-$(MPFR_VER).tar.xz_BLAKE2	= ad69f53bc910294647523e7613b18a683f1d0f3dd994168ab2a46b66d0371ffa9b8e7cb59495f898470aea69d343e83fc722f11babe4af7b3a12665a1e65860c
+mpc-$(MPC_VER).tar.gz_BLAKE2	= 76434e6f8830af3571836d51576bfebbc9701e9bbb5c4686f134081cd96cd90ae02f7ff42bf9e3957c7a7ba92b6b2d9cdabe18f0269271147521cd7f6a2d551c
 
 install : $(TARGET)
 
@@ -213,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)) :
@@ -225,8 +203,8 @@ $(patsubst %,$(DIR_CHK)/%,$(objects)) :
 $(patsubst %,$(DIR_DL)/%,$(objects)) :
 	@$(LOAD)
 
-$(subst %,%_MD5,$(objects)) :
-	@$(MD5)
+$(subst %,%_BLAKE2,$(objects)) :
+	@$(B2SUM)
 
 ###############################################################################
 # Installation Details
@@ -235,10 +213,6 @@ $(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)
-
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/gcc/gcc.git-745dae5-remove_cyclades.patch
-
-
 	@mkdir $(DIR_SRC)/gcc-build
 
 	cd $(DIR_APP) && sed -i 's/install_to_$$(INSTALL_DEST) //' libiberty/Makefile.in
@@ -255,11 +229,6 @@ ifeq "$(TOOLCHAIN)" "1"
 	cd $(DIR_APP) && tar xfa $(DIR_DL)/mpc-$(MPC_VER).tar.gz
 	cd $(DIR_APP) && mv -v mpc-$(MPC_VER) mpc
 
-ifeq "$(PASS)" "2"
-	cd $(DIR_APP) && cat gcc/limitx.h gcc/glimits.h gcc/limity.h > \
-			`dirname $$($(TOOLS_DIR)/bin/$(CROSSTARGET)-gcc -print-libgcc-file-name)`/include-fixed/limits.h
-endif
-
 	for file in $$(find $(DIR_APP)/gcc/config -name linux64.h -o -name linux.h \
 			-o -name sysv4.h -o -name linux-eabi.h -o -name linux-elf.h -o -name aarch64-linux.h); do \
 		echo "Processing $${file}..."; \
@@ -279,9 +248,17 @@ ifeq "$(PASS)" "L"
 		$(EXTRA_ENV) \
 		$(DIR_APP)/libstdc++-v3/configure \
 			$(EXTRA_CONFIG)
+	cd $(DIR_SRC)/gcc-build && make $(EXTRA_MAKE) $(MAKETUNING)
+	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 && \
@@ -291,9 +268,14 @@ else
 	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"
+	# Fix limits.h
+	cd $(DIR_APP) && cat gcc/limitx.h gcc/glimits.h gcc/limity.h > \
+		`dirname $$($(TOOLS_DIR)/bin/$(CROSSTARGET)-gcc -print-libgcc-file-name)`/include/limits.h
+
 	ln -svf libgcc.a $$($(TOOLS_DIR)/bin/$(CROSSTARGET)-gcc -print-libgcc-file-name | sed 's/libgcc/&_eh/')
  endif