Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6cbb369f authored by H. Peter Anvin's avatar H. Peter Anvin
Browse files

x32: Generate <asm/unistd_x32.h> 



Generate <asm/unistd_x32.h>; this exports x32 system call numbers to
user space.

[ v2: Enclose all arguments to syshdr in '' so empty arguments aren't
      dropped on the floor. ]

Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent 6630f11b

arch/x86/include/asm/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -25,3 +25,4 @@ header-y += vsyscall.h 


genhdr-y += unistd_32.h

genhdr-y += unistd_64.h

genhdr-y += unistd_x32.h

arch/x86/include/asm/unistd.h

+6 −1
Original line number Diff line number Diff line 
#ifndef _ASM_X86_UNISTD_H

#define _ASM_X86_UNISTD_H 1



/* x32 syscall flag bit */

#define __X32_SYSCALL_BIT	0x40000000



#ifdef __KERNEL__

# ifdef CONFIG_X86_32
@@ -52,8 +55,10 @@ 
#else

# ifdef __i386__

#  include <asm/unistd_32.h>

# else

# elif defined(__LP64__)

#  include <asm/unistd_64.h>

# else

#  include <asm/unistd_x32.h>

# endif

#endif

arch/x86/syscalls/Makefile

+10 −3
Original line number Diff line number Diff line
@@ -10,8 +10,10 @@ syshdr := $(srctree)/$(src)/syscallhdr.sh 
systbl := $(srctree)/$(src)/syscalltbl.sh



quiet_cmd_syshdr = SYSHDR  $@

      cmd_syshdr = $(CONFIG_SHELL) '$(syshdr)' $< $@ \

		   $(syshdr_abi_$(basetarget)) $(syshdr_pfx_$(basetarget))

      cmd_syshdr = $(CONFIG_SHELL) '$(syshdr)' '$<' '$@' \

		   '$(syshdr_abi_$(basetarget))' \

		   '$(syshdr_pfx_$(basetarget))' \

		   '$(syshdr_offset_$(basetarget))'

quiet_cmd_systbl = SYSTBL  $@

      cmd_systbl = $(CONFIG_SHELL) '$(systbl)' $< $@
@@ -24,6 +26,11 @@ syshdr_pfx_unistd_32_ia32 := ia32_ 
$(out)/unistd_32_ia32.h: $(syscall32) $(syshdr)

	$(call if_changed,syshdr)



syshdr_abi_unistd_x32 := common,x32

syshdr_offset_unistd_x32 := __X32_SYSCALL_BIT

$(out)/unistd_x32.h: $(syscall64) $(syshdr)

	$(call if_changed,syshdr)



syshdr_abi_unistd_64 := common,64

$(out)/unistd_64.h: $(syscall64) $(syshdr)

	$(call if_changed,syshdr)
@@ -33,7 +40,7 @@ $(out)/syscalls_32.h: $(syscall32) $(systbl) 
$(out)/syscalls_64.h: $(syscall64) $(systbl)

	$(call if_changed,systbl)



syshdr-y			+= unistd_32.h unistd_64.h

syshdr-y			+= unistd_32.h unistd_64.h unistd_x32.h

syshdr-y			+= syscalls_32.h

syshdr-$(CONFIG_X86_64)		+= unistd_32_ia32.h

syshdr-$(CONFIG_X86_64)		+= syscalls_64.h