[PATCH] riscv: Use __has_include__ to include <asm/syscalls.h> [BZ #24022]

[Mark Corbin]

On 03/01/2019 13:51, Florian Weimer wrote:
> * Mark Corbin:
>
>> On 21/12/2018 17:48, H.J. Lu wrote:
>>> ---
>>>  sysdeps/unix/sysv/linux/riscv/flush-icache.c | 4 ++++
>>>  1 file changed, 4 insertions(+)
>>>
>>> diff --git a/sysdeps/unix/sysv/linux/riscv/flush-icache.c b/sysdeps/unix/sysv/linux/riscv/flush-icache.c
>>> index d612ef4c6c..d0ecec5107 100644
>>> --- a/sysdeps/unix/sysv/linux/riscv/flush-icache.c
>>> +++ b/sysdeps/unix/sysv/linux/riscv/flush-icache.c
>>> @@ -21,7 +21,11 @@
>>>  #include <stdlib.h>
>>>  #include <atomic.h>
>>>  #include <sys/cachectl.h>
>>> +#if __has_include__ (<asm/syscalls.h>)
>>>  #include <asm/syscalls.h>
>>> +#else
>>> +#include <asm/unistd.h>
>>> +#endif
>>>  
>>>  typedef int (*func_type) (void *, void *, unsigned long int);
>>>  
>> Hello
>>
>> I was wondering whether it would be possible for somebody to backport
>> this fix (commit id 0b9c84906f653978fb8768c7ebd0ee14a47e662e) from
>> master to the release/2.28/master branch.
>>
>> The asm/syscalls.h file has been removed for RISC-V in the 4.20 kernel
>> and this is currently causing glibc build failures for the RISC-V
>> architecture under Buildroot (https://buildroot.org). I have a patch for
>> glibc in Buildroot, but it would be good to use the upstream release.
> I have now done so.
>
> Thanks,
> Florian

Thanks - appreciate it.

-- 
Mark Corbin
Embecosm Ltd.
https://www.embecosm.com