Fix Compilation of GCC on Ubuntu 18.04
Apply the following patch: https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=ec1cc0263f156f70693a62cf17b254a0029f4852 Change-Id: I44fcdc23b037a53d8cf50ec09ba9f210a1e127c8
This commit is contained in:
Lionel Sambuc
parent
08cc81b380
commit
220dfc8a69
121
external/gpl3/gcc/patches/0004-fix-gcc-inlines.patch
vendored
Normal file
121
external/gpl3/gcc/patches/0004-fix-gcc-inlines.patch
vendored
Normal file
@ -0,0 +1,121 @@
|
|||||||
|
diff -rNU3 dist.orig/gcc/cp/cfns.gperf dist/gcc/cp/cfns.gperf
|
||||||
|
--- dist.orig/gcc/cp/cfns.gperf 2018-08-24 00:40:38.917847976 +0200
|
||||||
|
+++ dist/gcc/cp/cfns.gperf 2018-08-24 00:43:45.613142399 +0200
|
||||||
|
@@ -1,3 +1,5 @@
|
||||||
|
+%language=C++
|
||||||
|
+%define class-name libc_name
|
||||||
|
%{
|
||||||
|
/* Copyright (C) 2000-2013 Free Software Foundation, Inc.
|
||||||
|
|
||||||
|
@@ -16,14 +18,6 @@
|
||||||
|
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 -rNU3 dist.orig/gcc/cp/cfns.h dist/gcc/cp/cfns.h
|
||||||
|
--- dist.orig/gcc/cp/cfns.h 2018-08-24 00:40:38.913848077 +0200
|
||||||
|
+++ dist/gcc/cp/cfns.h 2018-08-24 00:49:31.228441865 +0200
|
||||||
|
@@ -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.3 */
|
||||||
|
+/* Command-line: gperf -o -C -E -k '1-6,$' -j1 -D -N libc_name_p -L C++ 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-2013 Free Software Foundation, Inc.
|
||||||
|
|
||||||
|
@@ -47,25 +47,18 @@
|
||||||
|
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 @@
|
||||||
|
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 -rNU3 dist.orig/gcc/cp/except.c dist/gcc/cp/except.c
|
||||||
|
--- dist.orig/gcc/cp/except.c 2018-08-24 00:40:38.917847976 +0200
|
||||||
|
+++ dist/gcc/cp/except.c 2018-08-24 00:49:19.820728889 +0200
|
||||||
|
@@ -1025,7 +1025,8 @@
|
||||||
|
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 -rNU3 dist.orig/gcc/cp/Make-lang.in dist/gcc/cp/Make-lang.in
|
||||||
|
--- dist.orig/gcc/cp/Make-lang.in 2018-08-24 00:40:38.913848077 +0200
|
||||||
|
+++ dist/gcc/cp/Make-lang.in 2018-08-24 00:41:40.240301781 +0200
|
||||||
|
@@ -117,7 +117,7 @@
|
||||||
|
# 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
|
||||||
|
|
||||||
|
#
|
||||||
Loading…
x
Reference in New Issue
Block a user