Re: UML fails to build on arch i386

[Ritesh Raj Sarraf <rrs@researchut.com>]

[-- Attachment #1.1: Type: text/plain, Size: 1754 bytes --]

On Fri, 2018-06-15 at 08:43 +0200, Richard Weinberger wrote:
> Okay, as expected, the ptrace SYSEMU request code is now an enum.
> Changed by in glibc:
> commit c48831d0eebf876d986919baf2d9240a79192837
> Author: Dmitry V. Levin <ldv@altlinux.org>
> Date:   Wed Dec 27 00:54:38 2017 +0000
> 
>     linux/x86: sync sys/ptrace.h with Linux 4.14 [BZ #22433]
>     
>     Clone generic linux/sys/ptrace.h, add the following x86-specific
>     __ptrace_request constants: PTRACE_GET_THREAD_AREA,
>     PTRACE_SET_THREAD_AREA, PTRACE_ARCH_PRCTL, PTRACE_SYSEMU,
>     PTRACE_SYSEMU_SINGLESTEP, and PTRACE_SINGLEBLOCK.
>     
>     [BZ #22433]
>     * sysdeps/unix/sysv/linux/x86/sys/ptrace.h: New file.
> 
> Does this change make UML build on your host?
> 
> diff --git a/arch/x86/um/shared/sysdep/ptrace_32.h
> b/arch/x86/um/shared/sysdep/ptrace_32.h
> index b94a108de1dc..ae00d22bce02 100644
> --- a/arch/x86/um/shared/sysdep/ptrace_32.h
> +++ b/arch/x86/um/shared/sysdep/ptrace_32.h
> @@ -10,20 +10,10 @@
>  
>  static inline void update_debugregs(int seq) {}
>  
> -/* syscall emulation path in ptrace */
> -
> -#ifndef PTRACE_SYSEMU
> -#define PTRACE_SYSEMU 31
> -#endif
> -
>  void set_using_sysemu(int value);
>  int get_using_sysemu(void);
>  extern int sysemu_supported;
>  
> -#ifndef PTRACE_SYSEMU_SINGLESTEP
> -#define PTRACE_SYSEMU_SINGLESTEP 32
> -#endif
> -
>  #define UPT_SYSCALL_ARG1(r) UPT_BX(r)
>  #define UPT_SYSCALL_ARG2(r) UPT_CX(r)
>  #define UPT_SYSCALL_ARG3(r) UPT_DX(r)
> 

Thank you Richard.

That does fix the build. I built and verified it on i386 and amd64.

Thanks,
Ritesh

-- 
Ritesh Raj Sarraf
RESEARCHUT - http://www.researchut.com
"Necessity is the mother of invention."

[-- Attachment #1.2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[-- Attachment #2: Type: text/plain, Size: 152 bytes --]

_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um