diff options
author | Ismael Luceno | 2022-05-19 00:17:29 +0200 |
---|---|---|
committer | Ismael Luceno | 2022-05-30 17:43:15 +0200 |
commit | 1186a61482bd37b8eede951e4edbb6301749ba99 (patch) | |
tree | 8e6ea7764150f82529011b7a738ddf36d552c459 /gnu | |
parent | 944944f260c3fcc5448f6a0f463bff9dd6f35bca (diff) |
gcc: Remove obsolete patches
Diffstat (limited to 'gnu')
-rw-r--r-- | gnu/gcc/0001-Do-not-attempt-to-use-mallinfo2.patch | 34 | ||||
-rw-r--r-- | gnu/gcc/0003-fix-header-generation-for-libgo.patch | 36 | ||||
-rw-r--r-- | gnu/gcc/HISTORY | 5 | ||||
-rwxr-xr-x | gnu/gcc/PRE_BUILD | 20 | ||||
-rw-r--r-- | gnu/gcc/ssp_nonshared.diff | 14 |
5 files changed, 6 insertions, 103 deletions
diff --git a/gnu/gcc/0001-Do-not-attempt-to-use-mallinfo2.patch b/gnu/gcc/0001-Do-not-attempt-to-use-mallinfo2.patch deleted file mode 100644 index 42f2100328..0000000000 --- a/gnu/gcc/0001-Do-not-attempt-to-use-mallinfo2.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 12ee9a33c0c5127451384fb1ee1c3c3314651384 Mon Sep 17 00:00:00 2001 -From: Florian Franzmann <Florian.Franzmann@bandrate.org> -Date: Fri, 30 Apr 2021 22:32:09 +0200 -Subject: [PATCH] Do not attempt to use mallinfo2 - ---- - gcc/configure | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/gcc/configure b/gcc/configure -index e8ecb3b02..a69d5a41b 100755 ---- a/gcc/configure -+++ b/gcc/configure -@@ -10363,7 +10363,7 @@ fi - for ac_func in times clock kill getrlimit setrlimit atoq \ - popen sysconf strsignal getrusage nl_langinfo \ - gettimeofday mbstowcs wcswidth mmap posix_fallocate setlocale \ -- clearerr_unlocked feof_unlocked ferror_unlocked fflush_unlocked fgetc_unlocked fgets_unlocked fileno_unlocked fprintf_unlocked fputc_unlocked fputs_unlocked fread_unlocked fwrite_unlocked getchar_unlocked getc_unlocked putchar_unlocked putc_unlocked madvise mallinfo mallinfo2 fstatat -+ clearerr_unlocked feof_unlocked ferror_unlocked fflush_unlocked fgetc_unlocked fgets_unlocked fileno_unlocked fprintf_unlocked fputc_unlocked fputs_unlocked fread_unlocked fwrite_unlocked getchar_unlocked getc_unlocked putchar_unlocked putc_unlocked madvise mallinfo fstatat - do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` - ac_fn_cxx_check_func "$LINENO" "$ac_func" "$as_ac_var" -@@ -11800,7 +11800,7 @@ fi - done - - --for ac_func in mallinfo mallinfo2 -+for ac_func in mallinfo - do - ac_tr_decl=`$as_echo "HAVE_DECL_$ac_func" | $as_tr_cpp` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $ac_func is declared" >&5 --- -2.31.1 - diff --git a/gnu/gcc/0003-fix-header-generation-for-libgo.patch b/gnu/gcc/0003-fix-header-generation-for-libgo.patch deleted file mode 100644 index bef60d048f..0000000000 --- a/gnu/gcc/0003-fix-header-generation-for-libgo.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 6bcb304485fca4e6149a1bbd8085da2d42042d37 Mon Sep 17 00:00:00 2001 -From: Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> -Date: Sun, 24 Feb 2013 12:00:25 +0100 -Subject: [PATCH 3/3] fix header generation for libgo - ---- - libgo/mksysinfo.sh | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/libgo/mksysinfo.sh b/libgo/mksysinfo.sh -index 315d60c..10c888c 100755 ---- a/libgo/mksysinfo.sh -+++ b/libgo/mksysinfo.sh -@@ -538,7 +538,7 @@ if test "$rusage" != ""; then - rusage=`echo $rusage | sed -e 's/^ *//'` - nrusage= - while test -n "$rusage"; do -- field=`echo $rusage | sed -e 's/^\([^;]*\);.*$/\1/'` -+ field=`echo $rusage | sed -e 's/^\([^;]*\);.*$/\1/' -e 's/struct \(.*\)/struct { \1; }/'` - rusage=`echo $rusage | sed -e 's/^[^;]*; *\(.*\)$/\1/'` - # Drop the leading ru_, capitalize the next character. - field=`echo $field | sed -e 's/^ru_//'` -@@ -550,7 +550,9 @@ if test "$rusage" != ""; then - r=`echo $r | sed -e s'/ _timespec$/ Timespec/'` - r=`echo $r | sed -e s'/ _timestruc_t$/ Timestruc/'` - field="$f$r" -- nrusage="$nrusage $field;" -+ if [ -n "$field" ]; then -+ nrusage="$nrusage $field;" -+ fi - done - echo "type Rusage struct {$nrusage }" >> ${OUT} - else --- -1.8.1.3 - diff --git a/gnu/gcc/HISTORY b/gnu/gcc/HISTORY index 8adcbdad9d..0dc4968d15 100644 --- a/gnu/gcc/HISTORY +++ b/gnu/gcc/HISTORY @@ -1,3 +1,8 @@ +2022-05-30 Ismael Luceno <ismael@sourcemage.org> + * 0003-fix-header-generation-for-libgo.patch, + 0001-Do-not-attempt-to-use-mallinfo2.patch, + ssp_nonshared.diff: removed, lo longer needed + 2022-05-27 Florian Franzmann <bwlf@bandrate.org> * PREPARE, UP_TRIGGERS: fix message colors * BUILD: set --enable-host-shared if jit has been selected diff --git a/gnu/gcc/PRE_BUILD b/gnu/gcc/PRE_BUILD index cc066c2547..d09ea99de0 100755 --- a/gnu/gcc/PRE_BUILD +++ b/gnu/gcc/PRE_BUILD @@ -39,22 +39,4 @@ mk_source_dir $SOURCE_DIRECTORY.bld && cd $SOURCE_DIRECTORY && sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in && -sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in && - -if list_find "$GCC_COMPILER" "go"; then - message "${MESSAGE_COLOR}Applying patch for Go header generation...${DEFAULT_COLOR}" && - patch -p1 < "$SPELL_DIRECTORY/0003-fix-header-generation-for-libgo.patch" -fi && - -case "$HOST" in -*-musl) - patch -fp1 -i "$SPELL_DIRECTORY/ssp_nonshared.diff" - ;; -esac && - -# work around wrong detection of mallinfo2(): -if is_version_less $(installed_version glibc) 2.33; then - patch -p1 < "$SPELL_DIRECTORY/0001-Do-not-attempt-to-use-mallinfo2.patch" -fi - -#grep -lR "struct ucontext\>" libgcc | xargs sed -i -e 's/struct ucontext\>/ucontext_t/' +sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in diff --git a/gnu/gcc/ssp_nonshared.diff b/gnu/gcc/ssp_nonshared.diff deleted file mode 100644 index 2d3e5866a8..0000000000 --- a/gnu/gcc/ssp_nonshared.diff +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/gcc/gcc.c b/gcc/gcc.c -index c48178f1aa3..e2fae4ef055 100644 ---- a/gcc/gcc.c -+++ b/gcc/gcc.c -@@ -863,7 +863,8 @@ proper position among the other output files. */ - #ifndef LINK_SSP_SPEC - #ifdef TARGET_LIBC_PROVIDES_SSP - #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \ -- "|fstack-protector-strong|fstack-protector-explicit:}" -+ "|fstack-protector-strong|fstack-protector-explicit" \ -+ ":-lssp_nonshared}" - #else - #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \ - "|fstack-protector-strong|fstack-protector-explicit" \ |