Iain Sandoe <i...@sandoe.co.uk> writes: >> On 15 Feb 2024, at 18:05, Richard Sandiford <richard.sandif...@arm.com> >> wrote: >> >> Iain Sandoe <iains....@gmail.com> writes: >>>> On 5 Feb 2024, at 14:56, Iain Sandoe <iains....@gmail.com> wrote: >>>> >>>> Tested on aarch64-linux,darwin and a cross from aarch64-darwin to linux, >>>> OK for trunk, or some alternative is needed? >>> >>> Hmm.. apparently, this fails the linaro pre-commit CI for g++ with: >>> error: invalid conversion from 'long int*' to 'long unsigned int*' >>> [-fpermissive] >>> >>> So, I guess some alternative is needed, advice welcome, >> >> The builtins are registered with: >> >> static void >> aarch64_init_rng_builtins (void) >> { >> tree unsigned_ptr_type = build_pointer_type (unsigned_intDI_type_node); >> ... >> >> Does it work if you change unsigned_intDI_type_node to >> get_typenode_from_name (UINT64_TYPE)? > > Yes, that works fine; tested on aarch64-linux and aarch64-darwin. > > revised, as below, > OK for trunk? > Iain > > > Subject: [PATCH] aarch64: Register rng builtins with uint64_t pointers. > > Currently, these are registered as unsigned_intDI_type_node which is not > necessarily the same type definition as uint64_t. On platforms where these > differ that causes fails in consuming the arm_acle.h header. > > gcc/ChangeLog: > > * config/aarch64/aarch64-builtins.cc (aarch64_init_rng_builtins): > Register these builtins with a pointer to uint64_t rather than unsigned > DI mode.
OK, thanks. Richard > --- > gcc/config/aarch64/aarch64-builtins.cc | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/gcc/config/aarch64/aarch64-builtins.cc > b/gcc/config/aarch64/aarch64-builtins.cc > index e211a7271ba..1330558f109 100644 > --- a/gcc/config/aarch64/aarch64-builtins.cc > +++ b/gcc/config/aarch64/aarch64-builtins.cc > @@ -1759,7 +1759,8 @@ aarch64_init_tme_builtins (void) > static void > aarch64_init_rng_builtins (void) > { > - tree unsigned_ptr_type = build_pointer_type (unsigned_intDI_type_node); > + tree unsigned_ptr_type > + = build_pointer_type (get_typenode_from_name (UINT64_TYPE)); > tree ftype > = build_function_type_list (integer_type_node, unsigned_ptr_type, NULL); > aarch64_builtin_decls[AARCH64_BUILTIN_RNG_RNDR]