Commit 5457dc9e authored by Laurent Vivier's avatar Laurent Vivier Committed by Riku Voipio
Browse files

linux-user: fix TARGET_NR_select 



TARGET_NR_select can have three different implementations:

  1- to always return -ENOSYS

     microblaze, ppc, ppc64

     -> TARGET_WANT_NI_OLD_SELECT

  2- to take parameters from a structure pointed by arg1
    (kernel sys_old_select)

     i386, arm, m68k

     -> TARGET_WANT_OLD_SYS_SELECT

  3- to take parameters from arg[1-5]
     (kernel sys_select)

     x86_64, alpha, s390x,
     cris, sparc, sparc64

Some (new) architectures don't define NR_select,

  4- but only NR__newselect with sys_select:

      mips, mips64, sh

  5- don't define NR__newselect, and use pselect6 syscall:

      aarch64, openrisc, tilegx, unicore32

Reported-by: default avatarTimothy Pearson <tpearson@raptorengineering.com>
Reported-by: default avatarAllan Wirth <awirth@akamai.com>
Suggested-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarLaurent Vivier <laurent@vivier.eu>
Signed-off-by: default avatarRiku Voipio <riku.voipio@linaro.org>
parent 45eafb4d

linux-user/arm/target_syscall.h

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ struct target_pt_regs { 
#define TARGET_MINSIGSTKSZ 2048

#define TARGET_MLOCKALL_MCL_CURRENT 1

#define TARGET_MLOCKALL_MCL_FUTURE  2

#define TARGET_WANT_OLD_SYS_SELECT



#define TARGET_FORCE_SHMLBA

linux-user/i386/target_syscall.h

+1 −0
Original line number Diff line number Diff line
@@ -153,5 +153,6 @@ struct target_vm86plus_struct { 
#define TARGET_MINSIGSTKSZ 2048

#define TARGET_MLOCKALL_MCL_CURRENT 1

#define TARGET_MLOCKALL_MCL_FUTURE  2

#define TARGET_WANT_OLD_SYS_SELECT



#endif /* I386_TARGET_SYSCALL_H */

linux-user/m68k/target_syscall.h

+2 −0
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ struct target_pt_regs { 
#define TARGET_MLOCKALL_MCL_CURRENT 1

#define TARGET_MLOCKALL_MCL_FUTURE  2



#define TARGET_WANT_OLD_SYS_SELECT



void do_m68k_simcall(CPUM68KState *, int);



#endif /* M68K_TARGET_SYSCALL_H */

linux-user/microblaze/target_syscall.h

+2 −0
Original line number Diff line number Diff line
@@ -53,4 +53,6 @@ struct target_pt_regs { 
#define TARGET_MLOCKALL_MCL_CURRENT 1

#define TARGET_MLOCKALL_MCL_FUTURE  2



#define TARGET_WANT_NI_OLD_SELECT



#endif

linux-user/openrisc/syscall_nr.h

+0 −2
Original line number Diff line number Diff line
@@ -459,8 +459,6 @@ 
#define TARGET_NR_getdents 1065

#define __ARCH_WANT_SYS_GETDENTS

#define TARGET_NR_futimesat 1066

#define TARGET_NR_select 1067

#define __ARCH_WANT_SYS_SELECT

#define TARGET_NR_poll 1068

#define TARGET_NR_epoll_wait 1069

#define TARGET_NR_ustat 1070