(cross/freemint-gcc) Fix build by adding the same patches as freemint-mintlib

3 files changed, 55 insertions, 13 deletions

diff --git a/cross/freemint-gcc/distinfo b/cross/freemint-gcc/distinfo
index feb80fbade8..d74c25724fc 100644
--- a/cross/freemint-gcc/distinfo
+++ b/cross/freemint-gcc/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2016/12/21 13:34:16 joerg Exp $
+$NetBSD: distinfo,v 1.5 2020/08/07 14:09:01 mef Exp $
 
 SHA1 (gcc-4.6.4-mint-20130415.patch.bz2) = bd2e88f2b862cc404f47144fb67375b1fe17291b
 RMD160 (gcc-4.6.4-mint-20130415.patch.bz2) = d3cafafb1caa1a1eb915c5f15f4063d6a70ac4ee
@@ -8,17 +8,7 @@ SHA1 (gcc-4.6.4.tar.bz2) = 63933a8a5cf725626585dbba993c8b0f6db1335d
 RMD160 (gcc-4.6.4.tar.bz2) = 6a58b053812cf75622bc4579e020cd9471f46916
 SHA512 (gcc-4.6.4.tar.bz2) = b5a5395782e0b9e61cda052f6e00c8575d1aa0b7e8db9e34c06e4e45f12ff37b436018536b7fa69a04a4235b5b368895652e3ed8fab2fe11763f9782ed9161dc
 Size (gcc-4.6.4.tar.bz2) = 72006076 bytes
-SHA1 (mintlib-CVS-20130415.tar.gz) = 7c6fe3e1e837b7e3e12bb8af4bdcb7b31234b557
-RMD160 (mintlib-CVS-20130415.tar.gz) = 873b551a70ba3500601d7c674735088fa6edbf8f
-SHA512 (mintlib-CVS-20130415.tar.gz) = c013ba69ce2c74fcb5ebec3b27d3dfe7e0d5f38abc3251166f420112c8f9f1a8ac8fb0b1f0ece45485d41db3fbb47efa76602011e73463fa025bfdde70546f7a
-Size (mintlib-CVS-20130415.tar.gz) = 1881345 bytes
-SHA1 (pml-2.03-mint-20110207.patch.bz2) = 45c39230860fa2300cdaa342dec6e9ff99376186
-RMD160 (pml-2.03-mint-20110207.patch.bz2) = 314666dfc9e34865ab322d48385ddd9e8b87ad37
-SHA512 (pml-2.03-mint-20110207.patch.bz2) = a8ba59c2854e5ffe936f49f0c4eb5d88d34b86e85ed4f46a28a3e1e96c1c0b03a60528b70c0de73f81c17b6d16df205e296b19bae7a711e846fc46c5b088eedf
-Size (pml-2.03-mint-20110207.patch.bz2) = 11230 bytes
-SHA1 (pml-2.03.tar.bz2) = 07b5c70a704b06e24d6a64e8b5333d98804aa178
-RMD160 (pml-2.03.tar.bz2) = 60a31723cb5078a2f889757e6a02b873b444ddb7
-SHA512 (pml-2.03.tar.bz2) = cdd58b71425d2d0194608625a5a21f9c0a69265261d39b248ac9fb87e9d16735ec8cf3006eb8f4da78e89be59ecfd082afe1e4d57e19dc0fb6b32943fa58bc04
-Size (pml-2.03.tar.bz2) = 52753 bytes
+SHA1 (patch-gcc-4.6.4_gcc_cp_cfns.gperf) = da2735f36dc5a2ab19f92cb13f505cea11442fca
+SHA1 (patch-gcc-4.6.4_gcc_cp_cfns.h) = 2a9e8f53bd63c98efa0cda782dacb78b00beb2bc
 SHA1 (patch-gcc-4.6.4_gcc_doc_gcc.texi) = b11ef8d6ad28139623800ddcc5aa67bc45289b07
 SHA1 (patch-gcc-4.6.4_libiberty_Makefile.in) = 52bec2f3a21e1ff8f8614e43cbc541d585624dda
diff --git a/cross/freemint-gcc/patches/patch-gcc-4.6.4_gcc_cp_cfns.gperf b/cross/freemint-gcc/patches/patch-gcc-4.6.4_gcc_cp_cfns.gperf
new file mode 100644
index 00000000000..f26aacb3d3c
--- /dev/null
+++ b/cross/freemint-gcc/patches/patch-gcc-4.6.4_gcc_cp_cfns.gperf
@@ -0,0 +1,22 @@
+$NetBSD: patch-gcc-4.6.4_gcc_cp_cfns.gperf,v 1.1 2020/08/07 14:09:01 mef Exp $
+
+In file included from ../../gcc-4.6.4/gcc/cp/except.c:912:0:
+cfns.gperf: At top level:
+cfns.gperf:101:1: error: 'gnu_inline' attribute present on 'libc_name_p'
+cfns.gperf:26:14: error: but not here
+
+Found patch in Dragonfly DPorts 
+
+
+--- gcc-4.6.4/gcc/cp/cfns.gperf.orig	2020-08-04 21:52:40.968415964 +0000
++++ gcc-4.6.4/gcc/cp/cfns.gperf
+@@ -18,6 +18,9 @@ along with GCC; see the file COPYING3.  
+ <http://www.gnu.org/licenses/>.  */
+ #ifdef __GNUC__
+ __inline
++#ifdef __GNUC_STDC_INLINE__
++__attribute__ ((__gnu_inline__))
++#endif
+ #endif
+ static unsigned int hash (const char *, unsigned int);
+ #ifdef __GNUC__
diff --git a/cross/freemint-gcc/patches/patch-gcc-4.6.4_gcc_cp_cfns.h b/cross/freemint-gcc/patches/patch-gcc-4.6.4_gcc_cp_cfns.h
new file mode 100644
index 00000000000..900edda285c
--- /dev/null
+++ b/cross/freemint-gcc/patches/patch-gcc-4.6.4_gcc_cp_cfns.h
@@ -0,0 +1,30 @@
+$NetBSD: patch-gcc-4.6.4_gcc_cp_cfns.h,v 1.1 2020/08/07 14:09:01 mef Exp $
+
+In file included from ../../gcc-4.6.4/gcc/cp/except.c:912:0:
+cfns.gperf: At top level:
+cfns.gperf:101:1: error: 'gnu_inline' attribute present on 'libc_name_p'
+cfns.gperf:26:14: error: but not here
+
+Found patch in Dragonfly DPorts 
+
+--- gcc/cp/cfns.h.orig	2009-04-21 19:03:23 UTC
++++ gcc-4.6.4/gcc/cp/cfns.h
+@@ -53,6 +53,9 @@ __inline
+ static unsigned int hash (const char *, unsigned int);
+ #ifdef __GNUC__
+ __inline
++#ifdef __GNUC_STDC_INLINE__
++__attribute__ ((__gnu_inline__))
++#endif
+ #endif
+ const char * libc_name_p (const char *, unsigned int);
+ /* maximum key range = 391, duplicates = 0 */
+@@ -96,7 +99,7 @@ hash (register const char *str, register
+       400, 400, 400, 400, 400, 400, 400, 400, 400, 400,
+       400, 400, 400, 400, 400, 400, 400
+     };
+-  register int hval = len;
++  register int hval = (int) len;
+ 
+   switch (hval)
+     {