On Thu, 12 May 2016 07:38:00 -0700 Khem Raj <raj.k...@gmail.com> wrote:
> On Thu, May 12, 2016 at 6:12 AM, Ioan-Adrian Ratiu <adrian.ra...@ni.com> > wrote: > > Building gcc-cross 4.9.3 with gcc 6 fails with the following error: > > > > error: 'const char* libc_name_p(const char*, unsigned int)' redeclared > > inline with 'gnu_inline' attribute > > > > This is a backport of the upstream fix. > > I have seen couple of such patches being proposed. I was of the > opinion to drop 4.9 from master however if we still want to > refresh it the I would propose that we change the SRC_URI to point to > latest on gcc-4_9-branch and remove any backports > we have done since 4.9.3 release. It can also be merged into krogoth. > Then we can latest decide if we want to keep 4.9 in > 2.2 release or not. Would you be able to test such a patch Actually I'm all for dropping gcc 4 from master. It's about time IMO. I need this patch to fix the build in krogoth and was just waiting for feedback on master before I sent this patch there. I'll resend for krogoth directly then :) Thank you, Ioan > > > > > Signed-off-by: Ioan-Adrian Ratiu <adrian.ra...@ni.com> > > --- > > meta/recipes-devtools/gcc/gcc-4.9.inc | 1 + > > .../gcc/gcc-4.9/0076-Fix-build-with-gcc-6.patch | 151 > > +++++++++++++++++++++ > > 2 files changed, 152 insertions(+) > > create mode 100644 > > meta/recipes-devtools/gcc/gcc-4.9/0076-Fix-build-with-gcc-6.patch > > > > diff --git a/meta/recipes-devtools/gcc/gcc-4.9.inc > > b/meta/recipes-devtools/gcc/gcc-4.9.inc > > index 208e092..0cd9826 100644 > > --- a/meta/recipes-devtools/gcc/gcc-4.9.inc > > +++ b/meta/recipes-devtools/gcc/gcc-4.9.inc > > @@ -91,6 +91,7 @@ SRC_URI = "\ > > file://0073-Reuse-fdebug-prefix-map-to-replace-ffile-prefix-map.patch \ > > file://0074-fdebug-prefix-map-support-to-remap-relative-path.patch \ > > file://0075-libgcc-use-ldflags.patch \ > > + file://0076-Fix-build-with-gcc-6.patch \ > > " > > SRC_URI[md5sum] = "6f831b4d251872736e8e9cc09746f327" > > SRC_URI[sha256sum] = > > "2332b2a5a321b57508b9031354a8503af6fdfb868b8c1748d33028d100a8b67e" > > diff --git > > a/meta/recipes-devtools/gcc/gcc-4.9/0076-Fix-build-with-gcc-6.patch > > b/meta/recipes-devtools/gcc/gcc-4.9/0076-Fix-build-with-gcc-6.patch > > new file mode 100644 > > index 0000000..f865d4f > > --- /dev/null > > +++ b/meta/recipes-devtools/gcc/gcc-4.9/0076-Fix-build-with-gcc-6.patch > > @@ -0,0 +1,151 @@ > > +From efdf2b53b907c96ad3f00275588eb311335d0c91 Mon Sep 17 00:00:00 2001 > > +From: Ioan-Adrian Ratiu <adrian.ra...@ni.com> > > +Date: Thu, 12 May 2016 15:24:25 +0300 > > +Subject: [PATCH] Fix build with gcc 6 > > + > > + * Make-lang.in: Invoke gperf with -L C++. > > + * cfns.gperf: Remove prototypes for hash and libc_name_p > > + inlines. > > + * cfns.h: Regenerated. > > + * except.c (nothrow_libfn_p): Adjust. > > + > > +svn rev: r233572 > > + > > +Upstream-status: Backport [gcc 4.9] > > + > > +Signed-off-by: Ioan-Adrian Ratiu <adrian.ra...@ni.com> > > +--- > > + gcc/cp/Make-lang.in | 2 +- > > + gcc/cp/cfns.gperf | 10 ++-------- > > + gcc/cp/cfns.h | 41 ++++++++++++++--------------------------- > > + gcc/cp/except.c | 3 ++- > > + 4 files changed, 19 insertions(+), 37 deletions(-) > > + > > +diff --git a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in > > +index bd1c1d7..a0ea0d4 100644 > > +--- a/gcc/cp/Make-lang.in > > ++++ b/gcc/cp/Make-lang.in > > +@@ -111,7 +111,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 05ca753..d9b16b8 100644 > > +--- a/gcc/cp/cfns.gperf > > ++++ b/gcc/cp/cfns.gperf > > +@@ -1,3 +1,5 @@ > > ++%language=C++ > > ++%define class-name libc_name > > + %{ > > + /* Copyright (C) 2000-2014 Free Software Foundation, Inc. > > + > > +@@ -16,14 +18,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 > > + <http://www.gnu.org/licenses/>. */ > > +-#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 c845ddf..65801d1 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 <bug-gnu-gp...@gnu.org>." > > + #endif > > + > > +-#line 1 "cfns.gperf" > > ++#line 3 "cfns.gperf" > > + > > + /* Copyright (C) 2000-2014 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 > > + <http://www.gnu.org/licenses/>. */ > > +-#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 221971a..32340f5 100644 > > +--- a/gcc/cp/except.c > > ++++ b/gcc/cp/except.c > > +@@ -1030,7 +1030,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 > > +-- > > +2.8.2 > > + > > -- > > 2.8.2 > > > > -- > > _______________________________________________ > > Openembedded-core mailing list > > Openembedded-core@lists.openembedded.org > > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core