From 96ff82e9ecee602d09390a9a911d2371228a6cad Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Tue, 17 Jan 2017 00:07:56 -0800 Subject: Linaro's 4.9 requires ISL 0.14 or older Signed-off-by: Alexey Neyman diff --git a/config/companion_libs/isl.in b/config/companion_libs/isl.in index f1af3a0..66db376 100644 --- a/config/companion_libs/isl.in +++ b/config/companion_libs/isl.in @@ -35,9 +35,12 @@ config ISL_V_0_16_1 depends on CC_GCC_5_or_later select ISL_V_0_16_or_later +# Linaro version of 4.9 does not support ISL 0.15, but most recent +# mainline 4.9 release (4.9.4) does. config ISL_V_0_15 bool prompt "0.15" + depends on CC_GCC_4_9_or_later && !CC_GCC_V_linaro_4_9 select ISL_V_0_15_or_later config ISL_V_0_14 -- cgit v0.10.2-6-g49f6 From 725fcbe1a7578ac331950b9e047d4098fb7bce49 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Tue, 17 Jan 2017 00:08:38 -0800 Subject: Linaro 4.9 does not have a fix for build with GCC5/6. .. and 4.8 needs it, too. Signed-off-by: Alexey Neyman diff --git a/patches/gcc/linaro-4.8-2015.06/132-build_gcc-5_with_gcc-6.patch b/patches/gcc/linaro-4.8-2015.06/132-build_gcc-5_with_gcc-6.patch new file mode 100644 index 0000000..ac1d846 --- /dev/null +++ b/patches/gcc/linaro-4.8-2015.06/132-build_gcc-5_with_gcc-6.patch @@ -0,0 +1,138 @@ +From 1e5f1089dec3af328fd03125d6778f666d0bd4e4 Mon Sep 17 00:00:00 2001 +From: edlinger +Date: Thu, 25 Feb 2016 15:33:50 +0000 +Subject: [PATCH 1/1] 2016-02-25 Bernd Edlinger + + Backported from mainline + 2016-02-19 Jakub Jelinek + Bernd Edlinger + + * 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. + + +git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-5-branch@233720 138bc75d-0d04-0410-961f-82ee72b054a4 +diff -urpN a/gcc/cp/cfns.gperf b/gcc/cp/cfns.gperf +--- a/gcc/cp/cfns.gperf 2013-01-10 12:38:27.000000000 -0800 ++++ b/gcc/cp/cfns.gperf 2016-12-05 13:55:20.331616274 -0800 +@@ -1,3 +1,5 @@ ++%language=C++ ++%define class-name libc_name + %{ + /* Copyright (C) 2000-2013 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 + . */ +-#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 -urpN a/gcc/cp/cfns.h b/gcc/cp/cfns.h +--- a/gcc/cp/cfns.h 2013-01-10 12:38:27.000000000 -0800 ++++ b/gcc/cp/cfns.h 2016-12-05 13:55:20.331616274 -0800 +@@ -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 ." + #endif + +-#line 1 "cfns.gperf" ++#line 3 "cfns.gperf" + + /* Copyright (C) 2000-2013 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 + . */ +-#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 + 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 -urpN a/gcc/cp/except.c b/gcc/cp/except.c +--- a/gcc/cp/except.c 2013-10-25 06:49:48.000000000 -0700 ++++ b/gcc/cp/except.c 2016-12-05 13:55:20.331616274 -0800 +@@ -1025,7 +1025,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 +diff -urpN a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in +--- a/gcc/cp/Make-lang.in 2013-01-10 12:38:27.000000000 -0800 ++++ b/gcc/cp/Make-lang.in 2016-12-05 13:55:20.331616274 -0800 +@@ -115,7 +115,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/patches/gcc/linaro-4.9-2016.02/132-build_gcc-5_with_gcc-6.patch b/patches/gcc/linaro-4.9-2016.02/132-build_gcc-5_with_gcc-6.patch new file mode 100644 index 0000000..9a6a39e --- /dev/null +++ b/patches/gcc/linaro-4.9-2016.02/132-build_gcc-5_with_gcc-6.patch @@ -0,0 +1,121 @@ +diff -urpN gcc-linaro-4.9-2016.02.orig/gcc/cp/cfns.gperf gcc-linaro-4.9-2016.02/gcc/cp/cfns.gperf +--- gcc-linaro-4.9-2016.02.orig/gcc/cp/cfns.gperf 2016-03-28 16:19:20.000000000 -0700 ++++ gcc-linaro-4.9-2016.02/gcc/cp/cfns.gperf 2017-01-16 22:13:18.071864436 -0800 +@@ -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 + . */ +-#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 -urpN gcc-linaro-4.9-2016.02.orig/gcc/cp/cfns.h gcc-linaro-4.9-2016.02/gcc/cp/cfns.h +--- gcc-linaro-4.9-2016.02.orig/gcc/cp/cfns.h 2016-03-28 16:19:20.000000000 -0700 ++++ gcc-linaro-4.9-2016.02/gcc/cp/cfns.h 2017-01-16 22:13:18.071864436 -0800 +@@ -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 ." + #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 + . */ +-#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 + 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 -urpN gcc-linaro-4.9-2016.02.orig/gcc/cp/except.c gcc-linaro-4.9-2016.02/gcc/cp/except.c +--- gcc-linaro-4.9-2016.02.orig/gcc/cp/except.c 2016-03-28 16:19:20.000000000 -0700 ++++ gcc-linaro-4.9-2016.02/gcc/cp/except.c 2017-01-16 22:13:18.071864436 -0800 +@@ -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 +diff -urpN gcc-linaro-4.9-2016.02.orig/gcc/cp/Make-lang.in gcc-linaro-4.9-2016.02/gcc/cp/Make-lang.in +--- gcc-linaro-4.9-2016.02.orig/gcc/cp/Make-lang.in 2016-03-28 16:19:20.000000000 -0700 ++++ gcc-linaro-4.9-2016.02/gcc/cp/Make-lang.in 2017-01-16 22:13:18.071864436 -0800 +@@ -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 + + # -- cgit v0.10.2-6-g49f6