From 8903880f46a97e6b755fa98a4ae6c34483129078 Mon Sep 17 00:00:00 2001 From: "Earle F. Philhower, III" Date: Mon, 20 Jun 2022 17:43:37 -0700 Subject: [PATCH] Undo #30 Pull #30 seems to have broken builds inside the cross-compile docker image. Undo it for now to generate a 3.1.0 GCC with many minor fixes and optimizations. --- Makefile | 5 +---- patches/bin-002-fortify-source.patch | 19 ------------------- 2 files changed, 1 insertion(+), 23 deletions(-) delete mode 100644 patches/bin-002-fortify-source.patch diff --git a/Makefile b/Makefile index f5f527b..5cae772 100644 --- a/Makefile +++ b/Makefile @@ -381,10 +381,7 @@ clean: .cleaninst.LINUX.clean .cleaninst.LINUX32.clean .cleaninst.WIN32.clean .c gz) (cd $(REPODIR)/$(GCC_DIR); tar xfz ../$${archive});; \ bz2) (cd $(REPODIR)/$(GCC_DIR); tar xfj ../$${archive});; \ esac ; \ - (cd $(REPODIR)/$(GCC_DIR); rm -rf $${base}; ln -s $${name} $${base}) ; \ - case "$${base}" in \ - libelf) (cd $(REPODIR)/$(GCC_DIR)/$${base}; rm configure; autoreconf -i);;\ - esac ; \ + (cd $(REPODIR)/$(GCC_DIR); rm -rf $${base}; ln -s $${name} $${base}) \ done >> $(call log,$@) 2>&1 touch $@ diff --git a/patches/bin-002-fortify-source.patch b/patches/bin-002-fortify-source.patch deleted file mode 100644 index 80df2e1..0000000 --- a/patches/bin-002-fortify-source.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/gdb/common/common-defs.h b/gdb/common/common-defs.h -index 88b05ef723c..214bca1ee17 100644 ---- a/gdb/common/common-defs.h -+++ b/gdb/common/common-defs.h -@@ -66,9 +66,13 @@ - plus this seems like a reasonable safety measure. The check for - optimization is required because _FORTIFY_SOURCE only works when - optimization is enabled. If _FORTIFY_SOURCE is already defined, -- then we don't do anything. */ -+ then we don't do anything. Also, on MinGW, fortify requires -+ linking to -lssp, and to avoid the hassle of checking for -+ that and linking to it statically, we just don't define -+ _FORTIFY_SOURCE there. */ - --#if !defined _FORTIFY_SOURCE && defined __OPTIMIZE__ && __OPTIMIZE__ > 0 -+#if (!defined _FORTIFY_SOURCE && defined __OPTIMIZE__ && __OPTIMIZE__ > 0 \ -+ && !defined(__MINGW32__)) - #define _FORTIFY_SOURCE 2 - #endif