From 554e10d151878c52d1bc94182d4b0010cffaa7f3 Mon Sep 17 00:00:00 2001 From: PulkoMandy Date: Sun, 28 May 2023 11:17:01 +0200 Subject: [PATCH] avr_gcc: update to gcc 13.1, remove obsolete patchfile --- ...gcc-8.3.0.recipe => avr_gcc-13.1.0.recipe} | 15 +- .../patches/avr_gcc-4.8.2_2014_03_20.patchset | 150 ------------------ 2 files changed, 8 insertions(+), 157 deletions(-) rename sys-devel/avr_gcc/{avr_gcc-8.3.0.recipe => avr_gcc-13.1.0.recipe} (86%) delete mode 100644 sys-devel/avr_gcc/patches/avr_gcc-4.8.2_2014_03_20.patchset diff --git a/sys-devel/avr_gcc/avr_gcc-8.3.0.recipe b/sys-devel/avr_gcc/avr_gcc-13.1.0.recipe similarity index 86% rename from sys-devel/avr_gcc/avr_gcc-8.3.0.recipe rename to sys-devel/avr_gcc/avr_gcc-13.1.0.recipe index d02a899e0..b7954443c 100644 --- a/sys-devel/avr_gcc/avr_gcc-8.3.0.recipe +++ b/sys-devel/avr_gcc/avr_gcc-13.1.0.recipe @@ -4,15 +4,15 @@ Compiler for Atmel AVR platform. " HOMEPAGE="https://gcc.gnu.org" -SOURCE_URI="http://ftpmirror.gnu.org/gcc/gcc-8.3.0/gcc-8.3.0.tar.xz" +SOURCE_URI="http://ftpmirror.gnu.org/gcc/gcc-$portVersion/gcc-$portVersion.tar.xz" SOURCE_DIR="gcc-$portVersion" -CHECKSUM_SHA256="64baadfe6cc0f4947a84cb12d7f0dfaf45bb58b7e92461639596c21e02d97d2c" -REVISION="2" +CHECKSUM_SHA256="61d684f0aa5e76ac6585ad8898a2427aade8979ed5e7f85492286c4dfc13ee86" +REVISION="1" LICENSE=" GNU GPL v2 GNU LGPL v2 " -COPYRIGHT="1988-2018 Free Software Foundation, Inc." +COPYRIGHT="1988-2023 Free Software Foundation, Inc." ARCHITECTURES="all !x86_gcc2 ?x86 ?arm" @@ -85,16 +85,17 @@ BUILD() # let's use a file and --include instead. echo '#define LIBRARY_PATH_ENV "AVR_LIBRARY_PATH"' > haiku_host.h - CXXFLAGS="-O2 -include $objectsDir/haiku_host.h" \ - CFLAGS="-O2 -U_FORTIFY_SOURCE" "$sourceDir/configure" \ + CXXFLAGS="-O2 -include $objectsDir/haiku_host.h -fPIC" \ + CFLAGS="-O2 -U_FORTIFY_SOURCE -fPIC" "$sourceDir/configure" \ --build=$effectiveTargetMachineTriple \ --prefix=$installDir --libexecdir=$installDir/lib --mandir=$manDir \ - --docdir=$docDir --disable-nls --disable-libssp --with-gnu-ld \ + --docdir=$docDir --disable-nls --with-gnu-ld \ --enable-languages=c,c++ --enable-lto --enable-frame-pointer \ --enable-multilib --disable-shared \ --with-native-system-header-dir=/include \ --with-pkgversion=$(echo $portVersion | cut -c 7-) --target=$targetArch + echo "configure done, start build" make $jobArgs all-gcc all-target-libgcc } diff --git a/sys-devel/avr_gcc/patches/avr_gcc-4.8.2_2014_03_20.patchset b/sys-devel/avr_gcc/patches/avr_gcc-4.8.2_2014_03_20.patchset deleted file mode 100644 index 4879cc629..000000000 --- a/sys-devel/avr_gcc/patches/avr_gcc-4.8.2_2014_03_20.patchset +++ /dev/null @@ -1,150 +0,0 @@ -From b8707d6c30c6c9c991e750e338108e82de0d6f0d Mon Sep 17 00:00:00 2001 -From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Mon, 18 Jun 2018 20:54:14 +1000 -Subject: Fix build with gcc7 - - -diff --git a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in -index dce523a..36a1a97 100644 ---- a/gcc/cp/Make-lang.in -+++ b/gcc/cp/Make-lang.in -@@ -115,7 +115,7 @@ else - # deleting the $(srcdir)/cp/cfns.h file. - $(srcdir)/cp/cfns.h: - endif -- gperf -o -C -E -k '1-6,$$' -j1 -D -N 'libc_name_p' -L ANSI-C \ -+ gperf -o -C -E -k '1-6,$$' -j1 -D -N 'libc_name_p' -L C++ \ - $(srcdir)/cp/cfns.gperf --output-file $(srcdir)/cp/cfns.h - - # -diff --git a/gcc/cp/cfns.gperf b/gcc/cp/cfns.gperf -index c4c4e2a..286d47e 100644 ---- a/gcc/cp/cfns.gperf -+++ b/gcc/cp/cfns.gperf -@@ -16,14 +16,6 @@ for more details. - You should have received a copy of the GNU General Public License - along with GCC; see the file COPYING3. If not see - . */ --#ifdef __GNUC__ --__inline --#endif --static unsigned int hash (const char *, unsigned int); --#ifdef __GNUC__ --__inline --#endif --const char * libc_name_p (const char *, unsigned int); - %} - %% - # The standard C library functions, for feeding to gperf; the result is used -diff --git a/gcc/cp/cfns.h b/gcc/cp/cfns.h -index 42dd3cf..6c79864 100644 ---- a/gcc/cp/cfns.h -+++ b/gcc/cp/cfns.h -@@ -1,5 +1,5 @@ --/* ANSI-C code produced by gperf version 3.0.3 */ --/* Command-line: gperf -o -C -E -k '1-6,$' -j1 -D -N libc_name_p -L ANSI-C cfns.gperf */ -+/* C++ code produced by gperf version 3.0.4 */ -+/* Command-line: gperf -o -C -E -k '1-6,$' -j1 -D -N libc_name_p -L C++ --output-file cfns.h cfns.gperf */ - - #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \ - && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \ -@@ -28,7 +28,7 @@ - #error "gperf generated tables don't work with this execution character set. Please report a bug to ." - #endif - --#line 1 "cfns.gperf" -+#line 3 "cfns.gperf" - - /* Copyright (C) 2000-2013 Free Software Foundation, Inc. - -@@ -47,25 +47,18 @@ for more details. - You should have received a copy of the GNU General Public License - along with GCC; see the file COPYING3. If not see - . */ --#ifdef __GNUC__ --__inline --#endif --static unsigned int hash (const char *, unsigned int); --#ifdef __GNUC__ --__inline --#endif --const char * libc_name_p (const char *, unsigned int); - /* maximum key range = 391, duplicates = 0 */ - --#ifdef __GNUC__ --__inline --#else --#ifdef __cplusplus --inline --#endif --#endif --static unsigned int --hash (register const char *str, register unsigned int len) -+class libc_name -+{ -+private: -+ static inline unsigned int hash (const char *str, unsigned int len); -+public: -+ static const char *libc_name_p (const char *str, unsigned int len); -+}; -+ -+inline unsigned int -+libc_name::hash (register const char *str, register unsigned int len) - { - static const unsigned short asso_values[] = - { -@@ -122,14 +115,8 @@ hash (register const char *str, register unsigned int len) - return hval + asso_values[(unsigned char)str[len - 1]]; - } - --#ifdef __GNUC__ --__inline --#ifdef __GNUC_STDC_INLINE__ --__attribute__ ((__gnu_inline__)) --#endif --#endif - const char * --libc_name_p (register const char *str, register unsigned int len) -+libc_name::libc_name_p (register const char *str, register unsigned int len) - { - enum - { -diff --git a/gcc/cp/except.c b/gcc/cp/except.c -index 216ec10..dc2adcc 100644 ---- a/gcc/cp/except.c -+++ b/gcc/cp/except.c -@@ -1022,7 +1022,8 @@ nothrow_libfn_p (const_tree fn) - unless the system headers are playing rename tricks, and if - they are, we don't want to be confused by them. */ - id = DECL_NAME (fn); -- return !!libc_name_p (IDENTIFIER_POINTER (id), IDENTIFIER_LENGTH (id)); -+ return !!libc_name::libc_name_p (IDENTIFIER_POINTER (id), -+ IDENTIFIER_LENGTH (id)); - } - - /* Returns nonzero if an exception of type FROM will be caught by a -diff --git a/gcc/doc/gcc.texi b/gcc/doc/gcc.texi -index 02b81cf..5166abf 100644 ---- a/gcc/doc/gcc.texi -+++ b/gcc/doc/gcc.texi -@@ -85,9 +85,15 @@ Published by: - @item GNU Press - @tab Website: www.gnupress.org - @item a division of the --@tab General: @tex press@@gnu.org @end tex -+@tab General: -+@tex -+press@@gnu.org -+@end tex - @item Free Software Foundation --@tab Orders: @tex sales@@gnu.org @end tex -+@tab Orders: -+@tex -+sales@@gnu.org -+@end tex - @item 51 Franklin Street, Fifth Floor - @tab Tel 617-542-5942 - @item Boston, MA 02110-1301 USA --- -2.16.4 -