Added into gerrit:
https://review.linaro.org/11998
On 15 May 2016 at 18:28, Khem Raj raj.khem@gmail.com wrote:
Backport OE-core fix
Signed-off-by: Khem Raj raj.khem@gmail.com
.../recipes-devtools/gcc/gcc-linaro-5.2.inc | 1 + .../0060-remove-prototypes-cfns.patch | 153 +++++++++++++++++++++ 2 files changed, 154 insertions(+) create mode 100644 meta-linaro-toolchain/recipes-devtools/gcc/gcc-linaro-5.2/0060-remove-prototypes-cfns.patch
diff --git a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-linaro-5.2.inc b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-linaro-5.2.inc index ca44d66..f928e77 100644 --- a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-linaro-5.2.inc +++ b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-linaro-5.2.inc @@ -108,6 +108,7 @@ SRC_URI = "https://releases.linaro.org/components/toolchain/gcc-linaro/%24%7BBASEPV%7D file://0041-handle-target-sysroot-multilib.patch \ file://0042-cxxflags-for-build.patch \ file://PR67954.patch \
file://0060-remove-prototypes-cfns.patch \ "# file://0038-fix-g++-sysroot.patch diff --git a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-linaro-5.2/0060-remove-prototypes-cfns.patch b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-linaro-5.2/0060-remove-prototypes-cfns.patch new file mode 100644 index 0000000..2452b6f --- /dev/null +++ b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-linaro-5.2/0060-remove-prototypes-cfns.patch @@ -0,0 +1,153 @@ +Upstream-Status: backport
+From 1e5f1089dec3af328fd03125d6778f666d0bd4e4 Mon Sep 17 00:00:00 2001 +From: edlinger edlinger@138bc75d-0d04-0410-961f-82ee72b054a4 +Date: Thu, 25 Feb 2016 15:33:50 +0000 +Subject: [PATCH] 2016-02-25 Bernd Edlinger bernd.edlinger@hotmail.de
Backported from mainline2016-02-19 Jakub Jelinek <jakub@redhat.com>Bernd Edlinger <bernd.edlinger@hotmail.de>* Make-lang.in: Invoke gperf with -L C++.* cfns.gperf: Remove prototypes for hash and libc_name_pinlines.* 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@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 ifthey 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