[packages/crossavr-gcc] - fix build using gcc 5 - rel 2

baggins baggins at pld-linux.org
Sat Mar 12 19:59:41 CET 2016


commit 51ae354df44c62d040d1135e2917c2004ce3d351
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Mar 12 19:59:09 2016 +0100

    - fix build using gcc 5
    - rel 2

 crossavr-gcc.spec         |  4 ++-
 gnu_inline-mismatch.patch | 69 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 72 insertions(+), 1 deletion(-)
---
diff --git a/crossavr-gcc.spec b/crossavr-gcc.spec
index 68a3aab..05f79eb 100644
--- a/crossavr-gcc.spec
+++ b/crossavr-gcc.spec
@@ -10,8 +10,9 @@ Summary(pt_BR.UTF-8):	Utilitários para desenvolvimento de binários da GNU - AV
 Summary(tr.UTF-8):	GNU geliştirme araçları - AVR gcc
 Name:		crossavr-gcc
 Version:	4.7.3
-Release:	1
+Release:	2
 Epoch:		1
+Patch0:		gnu_inline-mismatch.patch
 # Patches 1xx are taken form Atmel official AVR8-GNU toolchain version 3.4.2
 # http://distribute.atmel.no/tools/opensource/Atmel-AVR-Toolchain-3.4.2/avr/avr-patches.tar.gz
 Patch100:	300-gcc-xmega-support.patch
@@ -86,6 +87,7 @@ Ten pakiet dodaje obsługę C++ do kompilatora gcc dla AVR.
 %prep
 %setup -q -n gcc-%{version}
 cd gcc/config/%{target} && %undos -f c,h && cd -
+%patch0 -p1
 %patch100 -p0
 #patch101 -p0
 %patch102 -p0
diff --git a/gnu_inline-mismatch.patch b/gnu_inline-mismatch.patch
new file mode 100644
index 0000000..e47a171
--- /dev/null
+++ b/gnu_inline-mismatch.patch
@@ -0,0 +1,69 @@
+From: Mike Frysinger <vapier at gentoo dot org>
+To: gcc-patches at gcc dot gnu dot org
+Subject: [PATCH] cfns: fix mismatch in gnu_inline attributes
+Date: Thu,  6 Aug 2015 23:47:06 -0400
+Message-Id: <1438919226-30427-1-git-send-email-vapier at gentoo.org>
+
+Since the 3.0.3 release of gperf (made in May 2007), the generated func
+has had the gnu_inline attribute applied to it.  The gcc source however
+has not been updated to include that which has lead to a mismatch.
+
+In practice, this hasn't been an issue for two reasons:
+(1) Before gcc-5, the default standard was (gnu) C89, and gcc does not
+warn or throw an error in this mode.
+(2) Starting with gcc-4.8, the compiler driver used to build gcc was
+changed to C++, and g++ does not warn or throw an error in this mode.
+
+This error does show up though when using gcc-5 to build gcc-4.7 or
+older as then the default is (gnu) C11 and the C compiler driver is
+used.  That failure looks like:
+In file included from .../gcc-4.7.4/gcc/cp/except.c:990: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
+
+Whether the compiler should always emit this error regardless of the
+active standard or compiler driver is debatable (I think it should be
+consistent -- either always do it or never do it).
+
+2015-08-06  Mike Frysinger  <vapier at gentoo.org>
+
+	* cfns.gperf [__GNUC__, __GNUC_STDC_INLINE__]: Apply the
+	__gnu_inline__ attribute.
+	* cfns.h: Regenerated.
+---
+ gcc/cp/cfns.gperf | 3 +++
+ gcc/cp/cfns.h     | 3 +++
+ 2 files changed, 6 insertions(+)
+
+diff --git a/gcc/cp/cfns.gperf b/gcc/cp/cfns.gperf
+index 68acd3d..953262f 100644
+--- a/gcc/cp/cfns.gperf
++++ b/gcc/cp/cfns.gperf
+@@ -22,6 +22,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);
+ %}
+diff --git a/gcc/cp/cfns.h b/gcc/cp/cfns.h
+index 1c6665d..6d00c0e 100644
+--- a/gcc/cp/cfns.h
++++ b/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 */
+-- 
+2.4.4
+
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/crossavr-gcc.git/commitdiff/51ae354df44c62d040d1135e2917c2004ce3d351



More information about the pld-cvs-commit mailing list