[OE-core] [master][krogoth][PATCH] gcc: backport gperf fixes
Khem Raj
raj.khem at gmail.com
Tue May 10 00:07:08 UTC 2016
> On May 9, 2016, at 2:14 PM, Dan McGregor <danismostlikely at gmail.com> wrote:
>
> From: Daniel McGregor <daniel.mcgregor at vecima.com>
>
> gperf was being used in a way that generated files don't conform to
> the language standard. Backport the fix from upstream.
>
> This is required to build these GCC versions when the host compiler
> is GCC 6.
>
this is ok for krogoth. Although for master most likely we will remove gcc 4.9
> Signed-off-by: Daniel McGregor <daniel.mcgregor at vecima.com>
> ---
> meta/recipes-devtools/gcc/gcc-4.9.inc | 1 +
> .../gcc/gcc-4.9/0075-remove-prototypes-cfns.patch | 153 +++++++++++++++++++++
> meta/recipes-devtools/gcc/gcc-5.3.inc | 1 +
> .../gcc/gcc-5.3/0059-remove-prototypes-cfns.patch | 153 +++++++++++++++++++++
> 4 files changed, 308 insertions(+)
> create mode 100644 meta/recipes-devtools/gcc/gcc-4.9/0075-remove-prototypes-cfns.patch
> create mode 100644 meta/recipes-devtools/gcc/gcc-5.3/0059-remove-prototypes-cfns.patch
>
> diff --git a/meta/recipes-devtools/gcc/gcc-4.9.inc b/meta/recipes-devtools/gcc/gcc-4.9.inc
> index 7e03f31..2be0599 100644
> --- a/meta/recipes-devtools/gcc/gcc-4.9.inc
> +++ b/meta/recipes-devtools/gcc/gcc-4.9.inc
> @@ -90,6 +90,7 @@ SRC_URI = "\
> file://0072-support-ffile-prefix-map.patch \
> 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-remove-prototypes-cfns.patch \
> "
> SRC_URI[md5sum] = "6f831b4d251872736e8e9cc09746f327"
> SRC_URI[sha256sum] = "2332b2a5a321b57508b9031354a8503af6fdfb868b8c1748d33028d100a8b67e"
> diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0075-remove-prototypes-cfns.patch b/meta/recipes-devtools/gcc/gcc-4.9/0075-remove-prototypes-cfns.patch
> new file mode 100644
> index 0000000..2954f2e
> --- /dev/null
> +++ b/meta/recipes-devtools/gcc/gcc-4.9/0075-remove-prototypes-cfns.patch
> @@ -0,0 +1,153 @@
> +Upstream-Status: backport
> +
> +From 8c3fa311caa86f61b4e28d1563d1110b44340fb2 Mon Sep 17 00:00:00 2001
> +From: edlinger <edlinger at 138bc75d-0d04-0410-961f-82ee72b054a4>
> +Date: Thu, 25 Feb 2016 15:36:41 +0000
> +Subject: [PATCH] 2016-02-25 Bernd Edlinger <bernd.edlinger at hotmail.de>
> +
> + Backported from mainline
> + 2016-02-19 Jakub Jelinek <jakub at redhat.com>
> + Bernd Edlinger <bernd.edlinger at hotmail.de>
> +
> + * 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.
> +
> +
> +---
> + gcc/cp/Make-lang.in | 2 +-
> + gcc/cp/cfns.gperf | 10 ++--------
> + gcc/cp/cfns.h | 41 ++++++++++++++---------------------------
> + gcc/cp/except.c | 3 ++-
> + 5 files changed, 31 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-gperf at 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
> +
> diff --git a/meta/recipes-devtools/gcc/gcc-5.3.inc b/meta/recipes-devtools/gcc/gcc-5.3.inc
> index 9808be1..3da7e54 100644
> --- a/meta/recipes-devtools/gcc/gcc-5.3.inc
> +++ b/meta/recipes-devtools/gcc/gcc-5.3.inc
> @@ -88,6 +88,7 @@ SRC_URI = "\
> file://0056-Enable-libc-provide-ssp-and-gcc_cv_target_dl_iterate.patch \
> file://0057-unwind-fix-for-musl.patch \
> file://0058-fdebug-prefix-map-support-to-remap-relative-path.patch \
> + file://0059-remove-prototypes-cfns.patch \
> "
>
> BACKPORTS = ""
> diff --git a/meta/recipes-devtools/gcc/gcc-5.3/0059-remove-prototypes-cfns.patch b/meta/recipes-devtools/gcc/gcc-5.3/0059-remove-prototypes-cfns.patch
> new file mode 100644
> index 0000000..2452b6f
> --- /dev/null
> +++ b/meta/recipes-devtools/gcc/gcc-5.3/0059-remove-prototypes-cfns.patch
> @@ -0,0 +1,153 @@
> +Upstream-Status: backport
> +
> +From 1e5f1089dec3af328fd03125d6778f666d0bd4e4 Mon Sep 17 00:00:00 2001
> +From: edlinger <edlinger at 138bc75d-0d04-0410-961f-82ee72b054a4>
> +Date: Thu, 25 Feb 2016 15:33:50 +0000
> +Subject: [PATCH] 2016-02-25 Bernd Edlinger <bernd.edlinger at hotmail.de>
> +
> + Backported from mainline
> + 2016-02-19 Jakub Jelinek <jakub at redhat.com>
> + Bernd Edlinger <bernd.edlinger at hotmail.de>
> +
> + * 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.
> +
> +
> +---
> + gcc/cp/Make-lang.in | 2 +-
> + gcc/cp/cfns.gperf | 10 ++--------
> + gcc/cp/cfns.h | 41 ++++++++++++++---------------------------
> + gcc/cp/except.c | 3 ++-
> + 5 files changed, 31 insertions(+), 37 deletions(-)
> +
> +diff --git a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in
> +index e98beb1..b09fb02 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 68acd3d..214ecf6 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-2015 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 1c6665d..596f413 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-gperf at gnu.org>."
> + #endif
> +
> +-#line 1 "cfns.gperf"
> ++#line 3 "cfns.gperf"
> +
> + /* Copyright (C) 2000-2015 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 3ff1ce6..2f2e396 100644
> +--- a/gcc/cp/except.c
> ++++ b/gcc/cp/except.c
> +@@ -1040,7 +1040,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 at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 204 bytes
Desc: Message signed with OpenPGP using GPGMail
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20160509/96ead578/attachment-0002.sig>
More information about the Openembedded-core
mailing list