Re: C++11 code in the gcc 10 branch

[FX via Gcc]

> If Richard approves the second patch (and you’re stuck for time) - then send 
> me the patch(es) as attachments with the commit credits you want, and I can 
> apply them for you.

Both patches only needed on gcc-10, if you can commit that’s great, many thanks.

For credits in GCC I’m known as Francois-Xavier Coudert <fxcoud...@gcc.gnu.org>
(and for the record, I do have a copyright assignment in place)

Happy new year to all,
FX


commit 96a9d0950453ca571b3999c2f4d4168da9d770f0
Author: Francois-Xavier Coudert <fxcoud...@gmail.com>
Date:   2020-12-21 22:06:59 +0100

    Fix prototype for aarch64_get_extension_string_for_isa_flags
    
    Patch should be backported in gcc-10 branch

diff --git a/gcc/config/aarch64/driver-aarch64.c 
b/gcc/config/aarch64/driver-aarch64.c
index 8840a2d9486..d99834c9989 100644
--- a/gcc/config/aarch64/driver-aarch64.c
+++ b/gcc/config/aarch64/driver-aarch64.c
@@ -27,8 +27,7 @@
 #include "tm.h"
 
 /* Defined in common/config/aarch64/aarch64-common.c.  */
-std::string aarch64_get_extension_string_for_isa_flags (unsigned long,
-                                                       unsigned long);
+std::string aarch64_get_extension_string_for_isa_flags (uint64_t, uint64_t);
 
 struct aarch64_arch_extension
 {

commit 3f1b98679eecdaf81ba5702a8de65bcb6b4ab25f
Author: Francois-Xavier Coudert <fxcoud...@gmail.com>
Date:   2020-12-21 22:06:15 +0100

    Remove C++11 constructor
    
    Patch should be backported in gcc-10 branch

diff --git a/gcc/config/aarch64/aarch64-builtins.c 
b/gcc/config/aarch64/aarch64-builtins.c
index cba596765ac..184e9095d51 100644
--- a/gcc/config/aarch64/aarch64-builtins.c
+++ b/gcc/config/aarch64/aarch64-builtins.c
@@ -1225,8 +1225,9 @@ aarch64_init_memtag_builtins (void)
     = aarch64_general_add_builtin ("__builtin_aarch64_memtag_"#N, \
                                   T, AARCH64_MEMTAG_BUILTIN_##F); \
   aarch64_memtag_builtin_data[AARCH64_MEMTAG_BUILTIN_##F - \
-                             AARCH64_MEMTAG_BUILTIN_START - 1] = \
-                               {T, CODE_FOR_##I};
+                             AARCH64_MEMTAG_BUILTIN_START - 1].ftype = T; \
+  aarch64_memtag_builtin_data[AARCH64_MEMTAG_BUILTIN_##F - \
+                             AARCH64_MEMTAG_BUILTIN_START - 1].icode = 
CODE_FOR_##I;
 
   fntype = build_function_type_list (ptr_type_node, ptr_type_node,
                                     uint64_type_node, NULL);