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

Commit 6bae32d3 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] uml: cross-build support: mk_sc 



Ditto for mk_sc

Signed-off-by: default avatarAl Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: default avatarJeff Dike <jdike@addtoit.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 1cd3bc1c

arch/um/Makefile-i386

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ $(SYS_DIR)/sc.h: $(SYS_UTIL_DIR)/mk_sc 
$(SYS_DIR)/thread.h: $(SYS_UTIL_DIR)/mk_thread 

	$(call filechk,gen_header)



$(SYS_UTIL_DIR)/mk_sc: scripts_basic FORCE

$(SYS_UTIL_DIR)/mk_sc: scripts_basic $(ARCH_DIR)/user-offsets.h FORCE

	$(Q)$(MAKE) $(build)=$(SYS_UTIL_DIR) $@



$(SYS_UTIL_DIR)/mk_thread: scripts_basic $(ARCH_SYMLINKS) $(GEN_HEADERS) FORCE

arch/um/Makefile-x86_64

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ $(SYS_DIR)/sc.h: $(SYS_UTIL_DIR)/mk_sc 
$(SYS_DIR)/thread.h: $(SYS_UTIL_DIR)/mk_thread

	$(call filechk,gen_header)



$(SYS_UTIL_DIR)/mk_sc: scripts_basic FORCE

$(SYS_UTIL_DIR)/mk_sc: scripts_basic $(ARCH_DIR)/user-offsets.h FORCE

	$(Q)$(MAKE) $(build)=$(SYS_UTIL_DIR) $@



$(SYS_UTIL_DIR)/mk_thread: scripts_basic $(ARCH_SYMLINKS) $(GEN_HEADERS) FORCE

arch/um/sys-i386/util/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -6,3 +6,4 @@ mk_thread-objs := mk_thread_kern.o mk_thread_user.o 


HOSTCFLAGS_mk_thread_kern.o	:= $(CFLAGS) $(CPPFLAGS)

HOSTCFLAGS_mk_thread_user.o	:= $(USER_CFLAGS)

HOSTCFLAGS_mk_sc.o := -I$(objtree)/arch/um

arch/um/sys-i386/util/mk_sc.c

+37 −38
Original line number Diff line number Diff line 
#include <stdio.h>

#include <signal.h>

#include <linux/stddef.h>

#include <user-offsets.h>



#define SC_OFFSET(name, field) \

  printf("#define " name "(sc) *((unsigned long *) &(((char *) (sc))[%d]))\n",\

	 offsetof(struct sigcontext, field))

  printf("#define " #name "(sc) *((unsigned long *) &(((char *) (sc))[%d]))\n",\

	 name)



#define SC_FP_OFFSET(name, field) \

  printf("#define " name \

  printf("#define " #name \

	 "(sc) *((unsigned long *) &(((char *) (SC_FPSTATE(sc)))[%d]))\n",\

	 offsetof(struct _fpstate, field))

	 name)



#define SC_FP_OFFSET_PTR(name, field, type) \

  printf("#define " name \

  printf("#define " #name \

	 "(sc) ((" type " *) &(((char *) (SC_FPSTATE(sc)))[%d]))\n",\

	 offsetof(struct _fpstate, field))

	 name)



int main(int argc, char **argv)

{

  SC_OFFSET("SC_IP", eip);

  SC_OFFSET("SC_SP", esp);

  SC_OFFSET("SC_FS", fs);

  SC_OFFSET("SC_GS", gs);

  SC_OFFSET("SC_DS", ds);

  SC_OFFSET("SC_ES", es);

  SC_OFFSET("SC_SS", ss);

  SC_OFFSET("SC_CS", cs);

  SC_OFFSET("SC_EFLAGS", eflags);

  SC_OFFSET("SC_EAX", eax);

  SC_OFFSET("SC_EBX", ebx);

  SC_OFFSET("SC_ECX", ecx);

  SC_OFFSET("SC_EDX", edx);

  SC_OFFSET("SC_EDI", edi);

  SC_OFFSET("SC_ESI", esi);

  SC_OFFSET("SC_EBP", ebp);

  SC_OFFSET("SC_TRAPNO", trapno);

  SC_OFFSET("SC_ERR", err);

  SC_OFFSET("SC_CR2", cr2);

  SC_OFFSET("SC_FPSTATE", fpstate);

  SC_OFFSET("SC_SIGMASK", oldmask);

  SC_FP_OFFSET("SC_FP_CW", cw);

  SC_FP_OFFSET("SC_FP_SW", sw);

  SC_FP_OFFSET("SC_FP_TAG", tag);

  SC_FP_OFFSET("SC_FP_IPOFF", ipoff);

  SC_FP_OFFSET("SC_FP_CSSEL", cssel);

  SC_FP_OFFSET("SC_FP_DATAOFF", dataoff);

  SC_FP_OFFSET("SC_FP_DATASEL", datasel);

  SC_FP_OFFSET_PTR("SC_FP_ST", _st, "struct _fpstate");

  SC_FP_OFFSET_PTR("SC_FXSR_ENV", _fxsr_env, "void");

  SC_OFFSET(SC_IP, eip);

  SC_OFFSET(SC_SP, esp);

  SC_OFFSET(SC_FS, fs);

  SC_OFFSET(SC_GS, gs);

  SC_OFFSET(SC_DS, ds);

  SC_OFFSET(SC_ES, es);

  SC_OFFSET(SC_SS, ss);

  SC_OFFSET(SC_CS, cs);

  SC_OFFSET(SC_EFLAGS, eflags);

  SC_OFFSET(SC_EAX, eax);

  SC_OFFSET(SC_EBX, ebx);

  SC_OFFSET(SC_ECX, ecx);

  SC_OFFSET(SC_EDX, edx);

  SC_OFFSET(SC_EDI, edi);

  SC_OFFSET(SC_ESI, esi);

  SC_OFFSET(SC_EBP, ebp);

  SC_OFFSET(SC_TRAPNO, trapno);

  SC_OFFSET(SC_ERR, err);

  SC_OFFSET(SC_CR2, cr2);

  SC_OFFSET(SC_FPSTATE, fpstate);

  SC_OFFSET(SC_SIGMASK, oldmask);

  SC_FP_OFFSET(SC_FP_CW, cw);

  SC_FP_OFFSET(SC_FP_SW, sw);

  SC_FP_OFFSET(SC_FP_TAG, tag);

  SC_FP_OFFSET(SC_FP_IPOFF, ipoff);

  SC_FP_OFFSET(SC_FP_CSSEL, cssel);

  SC_FP_OFFSET(SC_FP_DATAOFF, dataoff);

  SC_FP_OFFSET(SC_FP_DATASEL, datasel);

  SC_FP_OFFSET_PTR(SC_FP_ST, _st, "struct _fpstate");

  SC_FP_OFFSET_PTR(SC_FXSR_ENV, _fxsr_env, "void");

  return(0);

}

arch/um/sys-x86_64/util/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -8,3 +8,4 @@ mk_thread-objs := mk_thread_kern.o mk_thread_user.o 


HOSTCFLAGS_mk_thread_kern.o	:= $(CFLAGS) $(CPPFLAGS)

HOSTCFLAGS_mk_thread_user.o	:= $(USER_CFLAGS)

HOSTCFLAGS_mk_sc.o := -I$(objtree)/arch/um