asm-offsets.h is generated in the source tree

asm-offsets.h is generated in the source tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 288 bytes --]

The latest Linus-git tree generates asm-offsets.h in the source tree even
if you use O=... I don't know how to fix this, but it means that the
source tree cannot be read only.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

Re: asm-offsets.h is generated in the source tree

[Sam Ravnborg]

On Sun, Sep 11, 2005 at 01:20:33AM +1000, Stephen Rothwell wrote:
> The latest Linus-git tree generates asm-offsets.h in the source tree even
> if you use O=... I don't know how to fix this, but it means that the
> source tree cannot be read only.
My bad. I checked it compiled, not where it saved the file.
I will have a fix tonight.

	Sam

Re: asm-offsets.h is generated in the source tree

[Al Viro]

On Sat, Sep 10, 2005 at 06:19:17PM +0200, Sam Ravnborg wrote:
> On Sun, Sep 11, 2005 at 01:20:33AM +1000, Stephen Rothwell wrote:
> > The latest Linus-git tree generates asm-offsets.h in the source tree even
> > if you use O=... I don't know how to fix this, but it means that the
> > source tree cannot be read only.
> My bad. I checked it compiled, not where it saved the file.
> I will have a fix tonight.

BTW, early build stages on uml with O= are still broken, even with that
patch.  The following fixes them, but first chunk is a bad kludge.

What happens:
	a) silentconfig expects to have include/linux in build tree already
created.  Normally that happens earlier, but only by accident.  We need to
force that somehow and the way I'd done it is almost certainly wrong - it
should be in top-level makefile, to start with.  Suggestions?
	b) kernel-offsets.h needs symlinks already in place.  prepare1 does
everything we need, so that dependency is probably the right thing (the second
chunk).

diff -urN RC13-git10-base/arch/um/Makefile current/arch/um/Makefile
--- RC13-git10-base/arch/um/Makefile	2005-09-10 19:28:53.000000000 -0400
+++ current/arch/um/Makefile	2005-09-10 18:34:51.000000000 -0400
@@ -213,6 +213,8 @@
          echo "#endif" )
 endef
 
+include/linux/autoconf.h : include/linux/version.h
+
 $(ARCH_DIR)/include/uml-config.h : include/linux/autoconf.h
 	$(call filechk,umlconfig)
 
@@ -227,9 +229,8 @@
 $(ARCH_DIR)/kernel-offsets.s: $(ARCH_DIR)/sys-$(SUBARCH)/kernel-offsets.c \
 				   $(ARCH_SYMLINKS) \
 				   $(SYS_DIR)/sc.h \
-				   include/asm include/linux/version.h \
-				   include/config/MARKER \
-				   $(ARCH_DIR)/include/user_constants.h
+				   $(ARCH_DIR)/include/user_constants.h \
+				   prepare1
 	$(CC) $(CFLAGS) $(NOSTDINC_FLAGS) $(CPPFLAGS) -S -o $@ $<
 
 $(ARCH_DIR)/kernel-offsets.h: $(ARCH_DIR)/kernel-offsets.s

Re: asm-offsets.h is generated in the source tree

[Sam Ravnborg]

> 
> BTW, early build stages on uml with O= are still broken, even with that
> patch.  The following fixes them, but first chunk is a bad kludge.
> 
> What happens:
> 	a) silentconfig expects to have include/linux in build tree already
> created.  Normally that happens earlier, but only by accident.  We need to
> force that somehow and the way I'd done it is almost certainly wrong - it
> should be in top-level makefile, to start with.  Suggestions?

We could stick a `mkdir -p include/linux` command just before executing
$(Q)$(MAKE) $(build)=scripts/kconfig silentoldconfig

It should do the trick - no?

> 	b) kernel-offsets.h needs symlinks already in place.  prepare1 does
> everything we need, so that dependency is probably the right thing (the second
> chunk).

I will try to take a closer look at this tonight.
As always my head starts spinning when I look at the arch/um/Makefile
but I will see what I can do.
If I can simplify it and introduce full dependency checks it would be
really nice. 
It may add a Kbuild file to arch/um with the rules
for generating the header files.

	Sam

Re: asm-offsets.h is generated in the source tree

[Al Viro]

On Sun, Sep 11, 2005 at 10:31:53AM +0200, Sam Ravnborg wrote:
> > 
> > BTW, early build stages on uml with O= are still broken, even with that
> > patch.  The following fixes them, but first chunk is a bad kludge.
> > 
> > What happens:
> > 	a) silentconfig expects to have include/linux in build tree already
> > created.  Normally that happens earlier, but only by accident.  We need to
> > force that somehow and the way I'd done it is almost certainly wrong - it
> > should be in top-level makefile, to start with.  Suggestions?
> 
> We could stick a `mkdir -p include/linux` command just before executing
> $(Q)$(MAKE) $(build)=scripts/kconfig silentoldconfig
> 
> It should do the trick - no?

AFAICS that would do it and it would make sense - silentoldconfig really
relies on it being there, so it's either a dependency or just forcing it
to be there.  Either would do and it certainly belongs to top-level Makefile.
 
> > 	b) kernel-offsets.h needs symlinks already in place.  prepare1 does
> > everything we need, so that dependency is probably the right thing (the second
> > chunk).
> 
> I will try to take a closer look at this tonight.
> As always my head starts spinning when I look at the arch/um/Makefile
> but I will see what I can do.
> If I can simplify it and introduce full dependency checks it would be
> really nice. 
> It may add a Kbuild file to arch/um with the rules
> for generating the header files.

No need.  We really need only two generated files - constants from
UML host userland and constants from UML kernel itself.  That's it.

And these are needed since we have two parts of UML code - built with
kernel and userland headers resp. (basically, normal kernel code and
glue to UML host userland).  Since headers really do not mix, we have
to use extracted constants in pretty much the same way we have to
do that for assembler bits.  So there you go...

NOTE: patch below is untested.  It builds and should be OK, AFAICS, but
it really needs testing.  It eliminates all mess with mk_... and reduces
everything to two generated headers.  Saner wrt dependencies, at that...

diff -urN RC13-git10-foo/arch/um/Makefile current/arch/um/Makefile
--- RC13-git10-foo/arch/um/Makefile	2005-09-11 11:31:35.000000000 -0400
+++ current/arch/um/Makefile	2005-09-11 11:34:27.000000000 -0400
@@ -28,8 +28,6 @@
 ARCH_SYMLINKS = include/asm-um/arch $(ARCH_DIR)/include/sysdep $(ARCH_DIR)/os \
 	$(SYMLINK_HEADERS) $(ARCH_DIR)/include/uml-config.h
 
-GEN_HEADERS += $(ARCH_DIR)/include/task.h $(ARCH_DIR)/include/kern_constants.h
-
 um-modes-$(CONFIG_MODE_TT) += tt
 um-modes-$(CONFIG_MODE_SKAS) += skas
 
@@ -83,10 +81,6 @@
 
 SIZE = (($(CONFIG_NEST_LEVEL) + $(CONFIG_KERNEL_HALF_GIGS)) * 0x20000000)
 
-ifeq ($(CONFIG_MODE_SKAS), y)
-$(SYS_HEADERS) : $(ARCH_DIR)/include/skas_ptregs.h
-endif
-
 .PHONY: linux
 
 all: linux
@@ -107,7 +101,8 @@
 $(shell cd $(ARCH_DIR) && ln -sf Kconfig.$(SUBARCH) Kconfig.arch)
 endif
 
-prepare: $(ARCH_SYMLINKS) $(SYS_HEADERS) $(GEN_HEADERS)
+prepare1: $(ARCH_SYMLINKS) $(ARCH_DIR)/include/user_constants.h
+prepare: $(ARCH_DIR)/include/kern_constants.h
 
 LINK-$(CONFIG_LD_SCRIPT_STATIC) += -static
 LINK-$(CONFIG_LD_SCRIPT_DYN) += -Wl,-rpath,/lib
@@ -142,15 +137,13 @@
 #When cleaning we don't include .config, so we don't include
 #TT or skas makefiles and don't clean skas_ptregs.h.
 CLEAN_FILES += linux x.i gmon.out $(ARCH_DIR)/include/uml-config.h \
-	$(GEN_HEADERS) $(ARCH_DIR)/include/skas_ptregs.h \
-	$(ARCH_DIR)/include/user_constants.h $(ARCH_DIR)/Kconfig.arch
+	$(ARCH_DIR)/include/user_constants.h \
+	$(ARCH_DIR)/include/kern_constants.h $(ARCH_DIR)/Kconfig.arch
 
 MRPROPER_FILES += $(SYMLINK_HEADERS) $(ARCH_SYMLINKS) \
 	$(addprefix $(ARCH_DIR)/kernel/,$(KERN_SYMLINKS)) $(ARCH_DIR)/os
 
 archclean:
-	$(Q)$(MAKE) $(clean)=$(ARCH_DIR)/util
-	$(Q)$(MAKE) $(clean)=$(ARCH_DIR)/os-$(OS)/util
 	@find . \( -name '*.bb' -o -name '*.bbg' -o -name '*.da' \
 		-o -name '*.gcov' \) -type f -print | xargs rm -f
 
@@ -198,8 +191,6 @@
 
 define filechk_gen-asm-offsets
         (set -e; \
-         echo "#ifndef __ASM_OFFSETS_H__"; \
-         echo "#define __ASM_OFFSETS_H__"; \
          echo "/*"; \
          echo " * DO NOT MODIFY."; \
          echo " *"; \
@@ -208,8 +199,7 @@
          echo " */"; \
          echo ""; \
          sed -ne "/^->/{s:^->\([^ ]*\) [\$$#]*\([^ ]*\) \(.*\):#define \1 \2 /* \3 */:; s:->::; p;}"; \
-         echo ""; \
-         echo "#endif" )
+         echo ""; )
 endef
 
 include/linux/autoconf.h : include/linux/version.h
@@ -220,49 +210,18 @@
 $(ARCH_DIR)/user-offsets.s: $(ARCH_DIR)/sys-$(SUBARCH)/user-offsets.c
 	$(CC) $(USER_CFLAGS) -S -o $@ $<
 
-$(ARCH_DIR)/user-offsets.h: $(ARCH_DIR)/user-offsets.s
+$(ARCH_DIR)/include/user_constants.h: $(ARCH_DIR)/user-offsets.s
 	$(call filechk,gen-asm-offsets)
 
-CLEAN_FILES += $(ARCH_DIR)/user-offsets.s  $(ARCH_DIR)/user-offsets.h
+CLEAN_FILES += $(ARCH_DIR)/user-offsets.s
 
 $(ARCH_DIR)/kernel-offsets.s: $(ARCH_DIR)/sys-$(SUBARCH)/kernel-offsets.c \
-				   $(ARCH_SYMLINKS) \
-				   $(SYS_DIR)/sc.h \
-				   $(ARCH_DIR)/include/user_constants.h \
 				   prepare1
 	$(CC) $(CFLAGS) $(NOSTDINC_FLAGS) $(CPPFLAGS) -S -o $@ $<
 
-$(ARCH_DIR)/kernel-offsets.h: $(ARCH_DIR)/kernel-offsets.s
+$(ARCH_DIR)/include/kern_constants.h: $(ARCH_DIR)/kernel-offsets.s
 	$(call filechk,gen-asm-offsets)
 
-CLEAN_FILES += $(ARCH_DIR)/kernel-offsets.s  $(ARCH_DIR)/kernel-offsets.h
-
-$(ARCH_DIR)/include/task.h: $(ARCH_DIR)/util/mk_task
-	$(call filechk,gen_header)
-
-$(ARCH_DIR)/include/user_constants.h: $(ARCH_DIR)/os-$(OS)/util/mk_user_constants
-	$(call filechk,gen_header)
-
-$(ARCH_DIR)/include/kern_constants.h: $(ARCH_DIR)/util/mk_constants
-	$(call filechk,gen_header)
-
-$(ARCH_DIR)/include/skas_ptregs.h: $(ARCH_DIR)/kernel/skas/util/mk_ptregs
-	$(call filechk,gen_header)
-
-$(ARCH_DIR)/os-$(OS)/util/mk_user_constants: $(ARCH_DIR)/os-$(OS)/util FORCE ;
-
-$(ARCH_DIR)/util/mk_task $(ARCH_DIR)/util/mk_constants: $(ARCH_DIR)/include/user_constants.h $(ARCH_DIR)/util \
-	FORCE ;
-
-$(ARCH_DIR)/kernel/skas/util/mk_ptregs: $(ARCH_DIR)/kernel/skas/util FORCE ;
-
-$(ARCH_DIR)/util: scripts_basic $(SYS_DIR)/sc.h $(ARCH_DIR)/kernel-offsets.h FORCE
-	$(Q)$(MAKE) $(build)=$@
-
-$(ARCH_DIR)/kernel/skas/util: scripts_basic $(ARCH_DIR)/user-offsets.h FORCE
-	$(Q)$(MAKE) $(build)=$@
-
-$(ARCH_DIR)/os-$(OS)/util: scripts_basic $(ARCH_DIR)/user-offsets.h FORCE
-	$(Q)$(MAKE) $(build)=$@
+CLEAN_FILES += $(ARCH_DIR)/kernel-offsets.s
 
 export SUBARCH USER_CFLAGS OS
diff -urN RC13-git10-foo/arch/um/Makefile-i386 current/arch/um/Makefile-i386
--- RC13-git10-foo/arch/um/Makefile-i386	2005-09-05 08:35:08.000000000 -0400
+++ current/arch/um/Makefile-i386	2005-09-11 10:44:24.000000000 -0400
@@ -32,25 +32,3 @@
 ifneq ($(CONFIG_GPROF),y)
 ARCH_CFLAGS += -DUM_FASTCALL
 endif
-
-SYS_UTIL_DIR	:= $(ARCH_DIR)/sys-i386/util
-SYS_HEADERS	:= $(SYS_DIR)/sc.h $(SYS_DIR)/thread.h
-
-prepare: $(SYS_HEADERS)
-
-$(SYS_DIR)/sc.h: $(SYS_UTIL_DIR)/mk_sc
-	$(call filechk,gen_header)
-
-$(SYS_DIR)/thread.h: $(SYS_UTIL_DIR)/mk_thread 
-	$(call filechk,gen_header)
-
-$(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_DIR)/kernel-offsets.h FORCE
-	$(Q)$(MAKE) $(build)=$(SYS_UTIL_DIR) $@
-
-$(SYS_UTIL_DIR): scripts_basic include/asm FORCE
-	$(Q)$(MAKE) $(build)=$(SYS_UTIL_DIR)
-
-CLEAN_FILES += $(SYS_HEADERS)
diff -urN RC13-git10-foo/arch/um/Makefile-skas current/arch/um/Makefile-skas
--- RC13-git10-foo/arch/um/Makefile-skas	2005-06-17 15:48:29.000000000 -0400
+++ current/arch/um/Makefile-skas	2005-09-11 10:14:06.000000000 -0400
@@ -10,5 +10,3 @@
 CFLAGS-$(CONFIG_GPROF) += $(GPROF_OPT)
 LINK-$(CONFIG_GCOV) += $(GCOV_OPT)
 LINK-$(CONFIG_GPROF) += $(GPROF_OPT)
-
-GEN_HEADERS += $(ARCH_DIR)/include/skas_ptregs.h
diff -urN RC13-git10-foo/arch/um/Makefile-x86_64 current/arch/um/Makefile-x86_64
--- RC13-git10-foo/arch/um/Makefile-x86_64	2005-09-05 08:35:08.000000000 -0400
+++ current/arch/um/Makefile-x86_64	2005-09-11 10:46:08.000000000 -0400
@@ -12,24 +12,3 @@
 
 ELF_ARCH := i386:x86-64
 ELF_FORMAT := elf64-x86-64
-
-SYS_UTIL_DIR := $(ARCH_DIR)/sys-x86_64/util
-SYS_DIR := $(ARCH_DIR)/include/sysdep-x86_64
-
-SYS_HEADERS = $(SYS_DIR)/sc.h $(SYS_DIR)/thread.h
-
-prepare: $(SYS_HEADERS)
-
-$(SYS_DIR)/sc.h: $(SYS_UTIL_DIR)/mk_sc
-	$(call filechk,gen_header)
-
-$(SYS_DIR)/thread.h: $(SYS_UTIL_DIR)/mk_thread
-	$(call filechk,gen_header)
-
-$(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 $(GEN_HEADERS) $(ARCH_DIR)/kernel-offsets.h FORCE
-	$(Q)$(MAKE) $(build)=$(SYS_UTIL_DIR) $@
-
-CLEAN_FILES += $(SYS_HEADERS)
diff -urN RC13-git10-foo/arch/um/include/common-offsets.h current/arch/um/include/common-offsets.h
--- RC13-git10-foo/arch/um/include/common-offsets.h	2005-09-06 17:28:07.000000000 -0400
+++ current/arch/um/include/common-offsets.h	2005-09-11 11:13:13.000000000 -0400
@@ -1,7 +1,7 @@
 /* for use by sys-$SUBARCH/kernel-offsets.c */
 
-OFFSET(TASK_REGS, task_struct, thread.regs);
-OFFSET(TASK_PID, task_struct, pid);
+OFFSET(HOST_TASK_REGS, task_struct, thread.regs);
+OFFSET(HOST_TASK_PID, task_struct, pid);
 DEFINE(UM_KERN_PAGE_SIZE, PAGE_SIZE);
 DEFINE(UM_NSEC_PER_SEC, NSEC_PER_SEC);
 DEFINE_STR(UM_KERN_EMERG, KERN_EMERG);
diff -urN RC13-git10-foo/arch/um/include/skas_ptregs.h current/arch/um/include/skas_ptregs.h
--- RC13-git10-foo/arch/um/include/skas_ptregs.h	1969-12-31 19:00:00.000000000 -0500
+++ current/arch/um/include/skas_ptregs.h	2005-09-11 10:01:53.000000000 -0400
@@ -0,0 +1,6 @@
+#ifndef __SKAS_PT_REGS_
+#define __SKAS_PT_REGS_
+
+#include <user_constants.h>
+
+#endif
diff -urN RC13-git10-foo/arch/um/include/sysdep-i386/sc.h current/arch/um/include/sysdep-i386/sc.h
--- RC13-git10-foo/arch/um/include/sysdep-i386/sc.h	1969-12-31 19:00:00.000000000 -0500
+++ current/arch/um/include/sysdep-i386/sc.h	2005-09-11 11:29:42.000000000 -0400
@@ -0,0 +1,44 @@
+#ifndef __SYSDEP_I386_SC_H
+#define __SYSDEP_I386_SC_H
+
+#include <user_constants.h>
+
+#define SC_OFFSET(sc, field) \
+	*((unsigned long *) &(((char *) (sc))[HOST_##field]))
+#define SC_FP_OFFSET(sc, field) \
+	*((unsigned long *) &(((char *) (SC_FPSTATE(sc)))[HOST_##field]))
+#define SC_FP_OFFSET_PTR(sc, field, type) \
+	((type *) &(((char *) (SC_FPSTATE(sc)))[HOST_##field]))
+
+#define SC_IP(sc) SC_OFFSET(sc, SC_IP)
+#define SC_SP(sc) SC_OFFSET(sc, SC_SP)
+#define SC_FS(sc) SC_OFFSET(sc, SC_FS)
+#define SC_GS(sc) SC_OFFSET(sc, SC_GS)
+#define SC_DS(sc) SC_OFFSET(sc, SC_DS)
+#define SC_ES(sc) SC_OFFSET(sc, SC_ES)
+#define SC_SS(sc) SC_OFFSET(sc, SC_SS)
+#define SC_CS(sc) SC_OFFSET(sc, SC_CS)
+#define SC_EFLAGS(sc) SC_OFFSET(sc, SC_EFLAGS)
+#define SC_EAX(sc) SC_OFFSET(sc, SC_EAX)
+#define SC_EBX(sc) SC_OFFSET(sc, SC_EBX)
+#define SC_ECX(sc) SC_OFFSET(sc, SC_ECX)
+#define SC_EDX(sc) SC_OFFSET(sc, SC_EDX)
+#define SC_EDI(sc) SC_OFFSET(sc, SC_EDI)
+#define SC_ESI(sc) SC_OFFSET(sc, SC_ESI)
+#define SC_EBP(sc) SC_OFFSET(sc, SC_EBP)
+#define SC_TRAPNO(sc) SC_OFFSET(sc, SC_TRAPNO)
+#define SC_ERR(sc) SC_OFFSET(sc, SC_ERR)
+#define SC_CR2(sc) SC_OFFSET(sc, SC_CR2)
+#define SC_FPSTATE(sc) SC_OFFSET(sc, SC_FPSTATE)
+#define SC_SIGMASK(sc) SC_OFFSET(sc, SC_SIGMASK)
+#define SC_FP_CW(sc) SC_FP_OFFSET(sc, SC_FP_CW)
+#define SC_FP_SW(sc) SC_FP_OFFSET(sc, SC_FP_SW)
+#define SC_FP_TAG(sc) SC_FP_OFFSET(sc, SC_FP_TAG)
+#define SC_FP_IPOFF(sc) SC_FP_OFFSET(sc, SC_FP_IPOFF)
+#define SC_FP_CSSEL(sc) SC_FP_OFFSET(sc, SC_FP_CSSEL)
+#define SC_FP_DATAOFF(sc) SC_FP_OFFSET(sc, SC_FP_DATAOFF)
+#define SC_FP_DATASEL(sc) SC_FP_OFFSET(sc, SC_FP_DATASEL)
+#define SC_FP_ST(sc) SC_FP_OFFSET_PTR(sc, SC_FP_ST, struct _fpstate)
+#define SC_FXSR_ENV(sc) SC_FP_OFFSET_PTR(sc, SC_FXSR_ENV, void)
+
+#endif
diff -urN RC13-git10-foo/arch/um/include/sysdep-i386/thread.h current/arch/um/include/sysdep-i386/thread.h
--- RC13-git10-foo/arch/um/include/sysdep-i386/thread.h	1969-12-31 19:00:00.000000000 -0500
+++ current/arch/um/include/sysdep-i386/thread.h	2005-09-11 11:26:06.000000000 -0400
@@ -0,0 +1,11 @@
+#ifndef __UM_THREAD_H
+#define __UM_THREAD_H
+
+#include <kern_constants.h>
+
+#define TASK_DEBUGREGS(task) ((unsigned long *) &(((char *) (task))[HOST_TASK_DEBUGREGS]))
+#ifdef CONFIG_MODE_TT
+#define TASK_EXTERN_PID(task) *((int *) &(((char *) (task))[HOST_TASK_EXTERN_PID]))
+#endif
+
+#endif
diff -urN RC13-git10-foo/arch/um/include/sysdep-x86_64/sc.h current/arch/um/include/sysdep-x86_64/sc.h
--- RC13-git10-foo/arch/um/include/sysdep-x86_64/sc.h	1969-12-31 19:00:00.000000000 -0500
+++ current/arch/um/include/sysdep-x86_64/sc.h	2005-09-11 09:52:14.000000000 -0400
@@ -0,0 +1,45 @@
+#ifndef __SYSDEP_X86_64_SC_H
+#define __SYSDEP_X86_64_SC_H
+
+/* Copyright (C) 2003 - 2004 PathScale, Inc
+ * Released under the GPL
+ */
+
+#include <user_constants.h>
+
+#define SC_OFFSET(sc, field) \
+	 *((unsigned long *) &(((char *) (sc))[HOST_##field]))
+
+#define SC_RBX(sc) SC_OFFSET(sc, SC_RBX)
+#define SC_RCX(sc) SC_OFFSET(sc, SC_RCX)
+#define SC_RDX(sc) SC_OFFSET(sc, SC_RDX)
+#define SC_RSI(sc) SC_OFFSET(sc, SC_RSI)
+#define SC_RDI(sc) SC_OFFSET(sc, SC_RDI)
+#define SC_RBP(sc) SC_OFFSET(sc, SC_RBP)
+#define SC_RAX(sc) SC_OFFSET(sc, SC_RAX)
+#define SC_R8(sc) SC_OFFSET(sc, SC_R8)
+#define SC_R9(sc) SC_OFFSET(sc, SC_R9)
+#define SC_R10(sc) SC_OFFSET(sc, SC_R10)
+#define SC_R11(sc) SC_OFFSET(sc, SC_R11)
+#define SC_R12(sc) SC_OFFSET(sc, SC_R12)
+#define SC_R13(sc) SC_OFFSET(sc, SC_R13)
+#define SC_R14(sc) SC_OFFSET(sc, SC_R14)
+#define SC_R15(sc) SC_OFFSET(sc, SC_R15)
+#define SC_IP(sc) SC_OFFSET(sc, SC_IP)
+#define SC_SP(sc) SC_OFFSET(sc, SC_SP)
+#define SC_CR2(sc) SC_OFFSET(sc, SC_CR2)
+#define SC_ERR(sc) SC_OFFSET(sc, SC_ERR)
+#define SC_TRAPNO(sc) SC_OFFSET(sc, SC_TRAPNO)
+#define SC_CS(sc) SC_OFFSET(sc, SC_CS)
+#define SC_FS(sc) SC_OFFSET(sc, SC_FS)
+#define SC_GS(sc) SC_OFFSET(sc, SC_GS)
+#define SC_EFLAGS(sc) SC_OFFSET(sc, SC_EFLAGS)
+#define SC_SIGMASK(sc) SC_OFFSET(sc, SC_SIGMASK)
+#if 0
+#define SC_ORIG_RAX(sc) SC_OFFSET(sc, SC_ORIG_RAX)
+#define SC_DS(sc) SC_OFFSET(sc, SC_DS)
+#define SC_ES(sc) SC_OFFSET(sc, SC_ES)
+#define SC_SS(sc) SC_OFFSET(sc, SC_SS)
+#endif
+
+#endif
diff -urN RC13-git10-foo/arch/um/include/sysdep-x86_64/thread.h current/arch/um/include/sysdep-x86_64/thread.h
--- RC13-git10-foo/arch/um/include/sysdep-x86_64/thread.h	1969-12-31 19:00:00.000000000 -0500
+++ current/arch/um/include/sysdep-x86_64/thread.h	2005-09-11 10:42:55.000000000 -0400
@@ -0,0 +1,10 @@
+#ifndef __UM_THREAD_H
+#define __UM_THREAD_H
+
+#include <kern_constants.h>
+
+#ifdef CONFIG_MODE_TT
+#define TASK_EXTERN_PID(task) *((int *) &(((char *) (task))[HOST_TASK_EXTERN_PID]))
+#endif
+
+#endif
diff -urN RC13-git10-foo/arch/um/include/task.h current/arch/um/include/task.h
--- RC13-git10-foo/arch/um/include/task.h	1969-12-31 19:00:00.000000000 -0500
+++ current/arch/um/include/task.h	2005-09-11 11:24:24.000000000 -0400
@@ -0,0 +1,9 @@
+#ifndef __TASK_H
+#define __TASK_H
+
+#include <kern_constants.h>
+
+#define TASK_REGS(task) ((union uml_pt_regs *) &(((char *) (task))[HOST_TASK_REGS]))
+#define TASK_PID(task) *((int *) &(((char *) (task))[HOST_TASK_PID]))
+
+#endif
diff -urN RC13-git10-foo/arch/um/kernel/skas/Makefile current/arch/um/kernel/skas/Makefile
--- RC13-git10-foo/arch/um/kernel/skas/Makefile	2005-09-05 07:05:14.000000000 -0400
+++ current/arch/um/kernel/skas/Makefile	2005-09-11 10:13:33.000000000 -0400
@@ -6,8 +6,6 @@
 obj-y := clone.o exec_kern.o mem.o mem_user.o mmu.o process.o process_kern.o \
 	syscall.o tlb.o trap_user.o uaccess.o
 
-subdir- := util
-
 USER_OBJS := process.o clone.o
 
 include arch/um/scripts/Makefile.rules
diff -urN RC13-git10-foo/arch/um/kernel/skas/util/Makefile current/arch/um/kernel/skas/util/Makefile
--- RC13-git10-foo/arch/um/kernel/skas/util/Makefile	2005-06-17 15:48:29.000000000 -0400
+++ current/arch/um/kernel/skas/util/Makefile	1969-12-31 19:00:00.000000000 -0500
@@ -1,5 +0,0 @@
-hostprogs-y		:= mk_ptregs
-always			:= $(hostprogs-y)
-
-mk_ptregs-objs := mk_ptregs-$(SUBARCH).o
-HOSTCFLAGS_mk_ptregs-$(SUBARCH).o := -I$(objtree)/arch/um
diff -urN RC13-git10-foo/arch/um/kernel/skas/util/mk_ptregs-i386.c current/arch/um/kernel/skas/util/mk_ptregs-i386.c
--- RC13-git10-foo/arch/um/kernel/skas/util/mk_ptregs-i386.c	2005-06-17 15:48:29.000000000 -0400
+++ current/arch/um/kernel/skas/util/mk_ptregs-i386.c	1969-12-31 19:00:00.000000000 -0500
@@ -1,49 +0,0 @@
-#include <stdio.h>
-#include <user-offsets.h>
-
-#define SHOW(name) printf("#define %s %d\n", #name, name)
-
-int main(int argc, char **argv)
-{
-	printf("/* Automatically generated by "
-	       "arch/um/kernel/skas/util/mk_ptregs */\n");
-	printf("\n");
-	printf("#ifndef __SKAS_PT_REGS_\n");
-	printf("#define __SKAS_PT_REGS_\n");
-	printf("\n");
-	SHOW(HOST_FRAME_SIZE);
-	SHOW(HOST_FP_SIZE);
-	SHOW(HOST_XFP_SIZE);
-
-	SHOW(HOST_IP);
-	SHOW(HOST_SP);
-	SHOW(HOST_EFLAGS);
-	SHOW(HOST_EAX);
-	SHOW(HOST_EBX);
-	SHOW(HOST_ECX);
-	SHOW(HOST_EDX);
-	SHOW(HOST_ESI);
-	SHOW(HOST_EDI);
-	SHOW(HOST_EBP);
-	SHOW(HOST_CS);
-	SHOW(HOST_SS);
-	SHOW(HOST_DS);
-	SHOW(HOST_FS);
-	SHOW(HOST_ES);
-	SHOW(HOST_GS);
-
-	printf("\n");
-	printf("#endif\n");
-	return(0);
-}
-
-/*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * Emacs will notice this stuff at the end of the file and automatically
- * adjust the settings for this buffer only.  This must remain at the end
- * of the file.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-file-style: "linux"
- * End:
- */
diff -urN RC13-git10-foo/arch/um/kernel/skas/util/mk_ptregs-x86_64.c current/arch/um/kernel/skas/util/mk_ptregs-x86_64.c
--- RC13-git10-foo/arch/um/kernel/skas/util/mk_ptregs-x86_64.c	2005-06-17 15:48:29.000000000 -0400
+++ current/arch/um/kernel/skas/util/mk_ptregs-x86_64.c	1969-12-31 19:00:00.000000000 -0500
@@ -1,66 +0,0 @@
-/*
- * Copyright 2003 PathScale, Inc.
- *
- * Licensed under the GPL
- */
-
-#include <stdio.h>
-#include <user-offsets.h>
-
-#define SHOW(name) \
-	printf("#define %s (%d / sizeof(unsigned long))\n", #name, name)
-
-int main(int argc, char **argv)
-{
-	printf("/* Automatically generated by "
-	       "arch/um/kernel/skas/util/mk_ptregs */\n");
-	printf("\n");
-	printf("#ifndef __SKAS_PT_REGS_\n");
-	printf("#define __SKAS_PT_REGS_\n");
-	SHOW(HOST_FRAME_SIZE);
-	SHOW(HOST_RBX);
-	SHOW(HOST_RCX);
-	SHOW(HOST_RDI);
-	SHOW(HOST_RSI);
-	SHOW(HOST_RDX);
-	SHOW(HOST_RBP);
-	SHOW(HOST_RAX);
-	SHOW(HOST_R8);
-	SHOW(HOST_R9);
-	SHOW(HOST_R10);
-	SHOW(HOST_R11);
-	SHOW(HOST_R12);
-	SHOW(HOST_R13);
-	SHOW(HOST_R14);
-	SHOW(HOST_R15);
-	SHOW(HOST_ORIG_RAX);
-	SHOW(HOST_CS);
-	SHOW(HOST_SS);
-	SHOW(HOST_EFLAGS);
-#if 0
-	SHOW(HOST_FS);
-	SHOW(HOST_GS);
-	SHOW(HOST_DS);
-	SHOW(HOST_ES);
-#endif
-
-	SHOW(HOST_IP);
-	SHOW(HOST_SP);
-	printf("#define HOST_FP_SIZE 0\n");
-	printf("#define HOST_XFP_SIZE 0\n");
-	printf("\n");
-	printf("\n");
-	printf("#endif\n");
-	return(0);
-}
-
-/*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * Emacs will notice this stuff at the end of the file and automatically
- * adjust the settings for this buffer only.  This must remain at the end
- * of the file.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-file-style: "linux"
- * End:
- */
diff -urN RC13-git10-foo/arch/um/os-Linux/elf_aux.c current/arch/um/os-Linux/elf_aux.c
--- RC13-git10-foo/arch/um/os-Linux/elf_aux.c	2005-09-06 17:28:07.000000000 -0400
+++ current/arch/um/os-Linux/elf_aux.c	2005-09-11 11:26:28.000000000 -0400
@@ -12,7 +12,7 @@
 #include "init.h"
 #include "elf_user.h"
 #include "mem_user.h"
-#include <kernel-offsets.h>
+#include <kern_constants.h>
 
 #if HOST_ELF_CLASS == ELFCLASS32
 typedef Elf32_auxv_t elf_auxv_t;
diff -urN RC13-git10-foo/arch/um/os-Linux/util/Makefile current/arch/um/os-Linux/util/Makefile
--- RC13-git10-foo/arch/um/os-Linux/util/Makefile	2005-06-17 15:48:29.000000000 -0400
+++ current/arch/um/os-Linux/util/Makefile	1969-12-31 19:00:00.000000000 -0500
@@ -1,4 +0,0 @@
-hostprogs-y		:= mk_user_constants
-always			:= $(hostprogs-y)
-
-HOSTCFLAGS_mk_user_constants.o := -I$(objtree)/arch/um
diff -urN RC13-git10-foo/arch/um/os-Linux/util/mk_user_constants.c current/arch/um/os-Linux/util/mk_user_constants.c
--- RC13-git10-foo/arch/um/os-Linux/util/mk_user_constants.c	2005-06-17 15:48:29.000000000 -0400
+++ current/arch/um/os-Linux/util/mk_user_constants.c	1969-12-31 19:00:00.000000000 -0500
@@ -1,23 +0,0 @@
-#include <stdio.h>
-#include <user-offsets.h>
-
-int main(int argc, char **argv)
-{
-  printf("/*\n");
-  printf(" * Generated by mk_user_constants\n");
-  printf(" */\n");
-  printf("\n");
-  printf("#ifndef __UM_USER_CONSTANTS_H\n");
-  printf("#define __UM_USER_CONSTANTS_H\n");
-  printf("\n");
-  /* I'd like to use FRAME_SIZE from ptrace.h here, but that's wrong on
-   * x86_64 (216 vs 168 bytes).  user_regs_struct is the correct size on
-   * both x86_64 and i386.
-   */
-  printf("#define UM_FRAME_SIZE %d\n", __UM_FRAME_SIZE);
-
-  printf("\n");
-  printf("#endif\n");
-
-  return(0);
-}
diff -urN RC13-git10-foo/arch/um/sys-i386/Makefile current/arch/um/sys-i386/Makefile
--- RC13-git10-foo/arch/um/sys-i386/Makefile	2005-09-05 07:05:14.000000000 -0400
+++ current/arch/um/sys-i386/Makefile	2005-09-11 10:41:15.000000000 -0400
@@ -18,6 +18,4 @@
 
 $(obj)/stub_segv.o : _c_flags = $(call unprofile,$(CFLAGS))
 
-subdir- := util
-
 include arch/um/scripts/Makefile.unmap
diff -urN RC13-git10-foo/arch/um/sys-i386/kernel-offsets.c current/arch/um/sys-i386/kernel-offsets.c
--- RC13-git10-foo/arch/um/sys-i386/kernel-offsets.c	2005-09-06 17:28:07.000000000 -0400
+++ current/arch/um/sys-i386/kernel-offsets.c	2005-09-11 10:37:56.000000000 -0400
@@ -18,9 +18,9 @@
 
 void foo(void)
 {
-	OFFSET(TASK_DEBUGREGS, task_struct, thread.arch.debugregs);
+	OFFSET(HOST_TASK_DEBUGREGS, task_struct, thread.arch.debugregs);
 #ifdef CONFIG_MODE_TT
-	OFFSET(TASK_EXTERN_PID, task_struct, thread.mode.tt.extern_pid);
+	OFFSET(HOST_TASK_EXTERN_PID, task_struct, thread.mode.tt.extern_pid);
 #endif
 #include <common-offsets.h>
 }
diff -urN RC13-git10-foo/arch/um/sys-i386/user-offsets.c current/arch/um/sys-i386/user-offsets.c
--- RC13-git10-foo/arch/um/sys-i386/user-offsets.c	2005-06-17 15:48:29.000000000 -0400
+++ current/arch/um/sys-i386/user-offsets.c	2005-09-11 10:55:01.000000000 -0400
@@ -7,63 +7,64 @@
 #define DEFINE(sym, val) \
         asm volatile("\n->" #sym " %0 " #val : : "i" (val))
 
+#define DEFINE_LONGS(sym, val) \
+        asm volatile("\n->" #sym " %0 " #val : : "i" (val/sizeof(unsigned long)))
+
 #define OFFSET(sym, str, mem) \
 	DEFINE(sym, offsetof(struct str, mem));
 
 void foo(void)
 {
-	OFFSET(SC_IP, sigcontext, eip);
-	OFFSET(SC_SP, sigcontext, esp);
-	OFFSET(SC_FS, sigcontext, fs);
-	OFFSET(SC_GS, sigcontext, gs);
-	OFFSET(SC_DS, sigcontext, ds);
-	OFFSET(SC_ES, sigcontext, es);
-	OFFSET(SC_SS, sigcontext, ss);
-	OFFSET(SC_CS, sigcontext, cs);
-	OFFSET(SC_EFLAGS, sigcontext, eflags);
-	OFFSET(SC_EAX, sigcontext, eax);
-	OFFSET(SC_EBX, sigcontext, ebx);
-	OFFSET(SC_ECX, sigcontext, ecx);
-	OFFSET(SC_EDX, sigcontext, edx);
-	OFFSET(SC_EDI, sigcontext, edi);
-	OFFSET(SC_ESI, sigcontext, esi);
-	OFFSET(SC_EBP, sigcontext, ebp);
-	OFFSET(SC_TRAPNO, sigcontext, trapno);
-	OFFSET(SC_ERR, sigcontext, err);
-	OFFSET(SC_CR2, sigcontext, cr2);
-	OFFSET(SC_FPSTATE, sigcontext, fpstate);
-	OFFSET(SC_SIGMASK, sigcontext, oldmask);
-	OFFSET(SC_FP_CW, _fpstate, cw);
-	OFFSET(SC_FP_SW, _fpstate, sw);
-	OFFSET(SC_FP_TAG, _fpstate, tag);
-	OFFSET(SC_FP_IPOFF, _fpstate, ipoff);
-	OFFSET(SC_FP_CSSEL, _fpstate, cssel);
-	OFFSET(SC_FP_DATAOFF, _fpstate, dataoff);
-	OFFSET(SC_FP_DATASEL, _fpstate, datasel);
-	OFFSET(SC_FP_ST, _fpstate, _st);
-	OFFSET(SC_FXSR_ENV, _fpstate, _fxsr_env);
+	OFFSET(HOST_SC_IP, sigcontext, eip);
+	OFFSET(HOST_SC_SP, sigcontext, esp);
+	OFFSET(HOST_SC_FS, sigcontext, fs);
+	OFFSET(HOST_SC_GS, sigcontext, gs);
+	OFFSET(HOST_SC_DS, sigcontext, ds);
+	OFFSET(HOST_SC_ES, sigcontext, es);
+	OFFSET(HOST_SC_SS, sigcontext, ss);
+	OFFSET(HOST_SC_CS, sigcontext, cs);
+	OFFSET(HOST_SC_EFLAGS, sigcontext, eflags);
+	OFFSET(HOST_SC_EAX, sigcontext, eax);
+	OFFSET(HOST_SC_EBX, sigcontext, ebx);
+	OFFSET(HOST_SC_ECX, sigcontext, ecx);
+	OFFSET(HOST_SC_EDX, sigcontext, edx);
+	OFFSET(HOST_SC_EDI, sigcontext, edi);
+	OFFSET(HOST_SC_ESI, sigcontext, esi);
+	OFFSET(HOST_SC_EBP, sigcontext, ebp);
+	OFFSET(HOST_SC_TRAPNO, sigcontext, trapno);
+	OFFSET(HOST_SC_ERR, sigcontext, err);
+	OFFSET(HOST_SC_CR2, sigcontext, cr2);
+	OFFSET(HOST_SC_FPSTATE, sigcontext, fpstate);
+	OFFSET(HOST_SC_SIGMASK, sigcontext, oldmask);
+	OFFSET(HOST_SC_FP_CW, _fpstate, cw);
+	OFFSET(HOST_SC_FP_SW, _fpstate, sw);
+	OFFSET(HOST_SC_FP_TAG, _fpstate, tag);
+	OFFSET(HOST_SC_FP_IPOFF, _fpstate, ipoff);
+	OFFSET(HOST_SC_FP_CSSEL, _fpstate, cssel);
+	OFFSET(HOST_SC_FP_DATAOFF, _fpstate, dataoff);
+	OFFSET(HOST_SC_FP_DATASEL, _fpstate, datasel);
+	OFFSET(HOST_SC_FP_ST, _fpstate, _st);
+	OFFSET(HOST_SC_FXSR_ENV, _fpstate, _fxsr_env);
 
-	DEFINE(HOST_FRAME_SIZE, FRAME_SIZE);
-	DEFINE(HOST_FP_SIZE,
-		sizeof(struct user_i387_struct) / sizeof(unsigned long));
-	DEFINE(HOST_XFP_SIZE,
-	       sizeof(struct user_fxsr_struct) / sizeof(unsigned long));
+	DEFINE_LONGS(HOST_FRAME_SIZE, FRAME_SIZE);
+	DEFINE_LONGS(HOST_FP_SIZE, sizeof(struct user_i387_struct));
+	DEFINE_LONGS(HOST_XFP_SIZE, sizeof(struct user_fxsr_struct));
 
-	DEFINE(HOST_IP, EIP);
-	DEFINE(HOST_SP, UESP);
-	DEFINE(HOST_EFLAGS, EFL);
-	DEFINE(HOST_EAX, EAX);
-	DEFINE(HOST_EBX, EBX);
-	DEFINE(HOST_ECX, ECX);
-	DEFINE(HOST_EDX, EDX);
-	DEFINE(HOST_ESI, ESI);
-	DEFINE(HOST_EDI, EDI);
-	DEFINE(HOST_EBP, EBP);
-	DEFINE(HOST_CS, CS);
-	DEFINE(HOST_SS, SS);
-	DEFINE(HOST_DS, DS);
-	DEFINE(HOST_FS, FS);
-	DEFINE(HOST_ES, ES);
-	DEFINE(HOST_GS, GS);
-	DEFINE(__UM_FRAME_SIZE, sizeof(struct user_regs_struct));
+	DEFINE_LONGS(HOST_IP, EIP);
+	DEFINE_LONGS(HOST_SP, UESP);
+	DEFINE_LONGS(HOST_EFLAGS, EFL);
+	DEFINE_LONGS(HOST_EAX, EAX);
+	DEFINE_LONGS(HOST_EBX, EBX);
+	DEFINE_LONGS(HOST_ECX, ECX);
+	DEFINE_LONGS(HOST_EDX, EDX);
+	DEFINE_LONGS(HOST_ESI, ESI);
+	DEFINE_LONGS(HOST_EDI, EDI);
+	DEFINE_LONGS(HOST_EBP, EBP);
+	DEFINE_LONGS(HOST_CS, CS);
+	DEFINE_LONGS(HOST_SS, SS);
+	DEFINE_LONGS(HOST_DS, DS);
+	DEFINE_LONGS(HOST_FS, FS);
+	DEFINE_LONGS(HOST_ES, ES);
+	DEFINE_LONGS(HOST_GS, GS);
+	DEFINE(UM_FRAME_SIZE, sizeof(struct user_regs_struct));
 }
diff -urN RC13-git10-foo/arch/um/sys-i386/util/Makefile current/arch/um/sys-i386/util/Makefile
--- RC13-git10-foo/arch/um/sys-i386/util/Makefile	2005-06-17 15:48:29.000000000 -0400
+++ current/arch/um/sys-i386/util/Makefile	1969-12-31 19:00:00.000000000 -0500
@@ -1,5 +0,0 @@
-hostprogs-y	:= mk_sc mk_thread
-always		:= $(hostprogs-y)
-
-HOSTCFLAGS_mk_sc.o := -I$(objtree)/arch/um
-HOSTCFLAGS_mk_thread.o := -I$(objtree)/arch/um
diff -urN RC13-git10-foo/arch/um/sys-i386/util/mk_sc.c current/arch/um/sys-i386/util/mk_sc.c
--- RC13-git10-foo/arch/um/sys-i386/util/mk_sc.c	2005-06-17 15:48:29.000000000 -0400
+++ current/arch/um/sys-i386/util/mk_sc.c	1969-12-31 19:00:00.000000000 -0500
@@ -1,51 +0,0 @@
-#include <stdio.h>
-#include <user-offsets.h>
-
-#define SC_OFFSET(name, field) \
-  printf("#define " #name "(sc) *((unsigned long *) &(((char *) (sc))[%d]))\n",\
-	 name)
-
-#define SC_FP_OFFSET(name, field) \
-  printf("#define " #name \
-	 "(sc) *((unsigned long *) &(((char *) (SC_FPSTATE(sc)))[%d]))\n",\
-	 name)
-
-#define SC_FP_OFFSET_PTR(name, field, type) \
-  printf("#define " #name \
-	 "(sc) ((" type " *) &(((char *) (SC_FPSTATE(sc)))[%d]))\n",\
-	 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");
-  return(0);
-}
diff -urN RC13-git10-foo/arch/um/sys-i386/util/mk_thread.c current/arch/um/sys-i386/util/mk_thread.c
--- RC13-git10-foo/arch/um/sys-i386/util/mk_thread.c	2005-06-17 15:48:29.000000000 -0400
+++ current/arch/um/sys-i386/util/mk_thread.c	1969-12-31 19:00:00.000000000 -0500
@@ -1,22 +0,0 @@
-#include <stdio.h>
-#include <kernel-offsets.h>
-
-int main(int argc, char **argv)
-{
-  printf("/*\n");
-  printf(" * Generated by mk_thread\n");
-  printf(" */\n");
-  printf("\n");
-  printf("#ifndef __UM_THREAD_H\n");
-  printf("#define __UM_THREAD_H\n");
-  printf("\n");
-  printf("#define TASK_DEBUGREGS(task) ((unsigned long *) "
-	 "&(((char *) (task))[%d]))\n", TASK_DEBUGREGS);
-#ifdef TASK_EXTERN_PID
-  printf("#define TASK_EXTERN_PID(task) *((int *) &(((char *) (task))[%d]))\n",
-	 TASK_EXTERN_PID);
-#endif
-  printf("\n");
-  printf("#endif\n");
-  return(0);
-}
diff -urN RC13-git10-foo/arch/um/sys-x86_64/Makefile current/arch/um/sys-x86_64/Makefile
--- RC13-git10-foo/arch/um/sys-x86_64/Makefile	2005-09-05 07:05:14.000000000 -0400
+++ current/arch/um/sys-x86_64/Makefile	2005-09-11 10:41:27.000000000 -0400
@@ -29,6 +29,4 @@
 
 $(obj)/stub_segv.o: _c_flags = $(call unprofile,$(CFLAGS))
 
-subdir- := util
-
 include arch/um/scripts/Makefile.unmap
diff -urN RC13-git10-foo/arch/um/sys-x86_64/kernel-offsets.c current/arch/um/sys-x86_64/kernel-offsets.c
--- RC13-git10-foo/arch/um/sys-x86_64/kernel-offsets.c	2005-09-06 17:28:07.000000000 -0400
+++ current/arch/um/sys-x86_64/kernel-offsets.c	2005-09-11 10:37:54.000000000 -0400
@@ -19,7 +19,7 @@
 void foo(void)
 {
 #ifdef CONFIG_MODE_TT
-	OFFSET(TASK_EXTERN_PID, task_struct, thread.mode.tt.extern_pid);
+	OFFSET(HOST_TASK_EXTERN_PID, task_struct, thread.mode.tt.extern_pid);
 #endif
 #include <common-offsets.h>
 }
diff -urN RC13-git10-foo/arch/um/sys-x86_64/user-offsets.c current/arch/um/sys-x86_64/user-offsets.c
--- RC13-git10-foo/arch/um/sys-x86_64/user-offsets.c	2005-06-17 15:48:29.000000000 -0400
+++ current/arch/um/sys-x86_64/user-offsets.c	2005-09-11 10:54:44.000000000 -0400
@@ -16,71 +16,76 @@
 #define DEFINE(sym, val) \
         asm volatile("\n->" #sym " %0 " #val : : "i" (val))
 
+#define DEFINE_LONGS(sym, val) \
+        asm volatile("\n->" #sym " %0 " #val : : "i" (val/sizeof(unsigned long)))
+
 #define OFFSET(sym, str, mem) \
 	DEFINE(sym, offsetof(struct str, mem));
 
 void foo(void)
 {
-	OFFSET(SC_RBX, sigcontext, rbx);
-	OFFSET(SC_RCX, sigcontext, rcx);
-	OFFSET(SC_RDX, sigcontext, rdx);
-	OFFSET(SC_RSI, sigcontext, rsi);
-	OFFSET(SC_RDI, sigcontext, rdi);
-	OFFSET(SC_RBP, sigcontext, rbp);
-	OFFSET(SC_RAX, sigcontext, rax);
-	OFFSET(SC_R8, sigcontext, r8);
-	OFFSET(SC_R9, sigcontext, r9);
-	OFFSET(SC_R10, sigcontext, r10);
-	OFFSET(SC_R11, sigcontext, r11);
-	OFFSET(SC_R12, sigcontext, r12);
-	OFFSET(SC_R13, sigcontext, r13);
-	OFFSET(SC_R14, sigcontext, r14);
-	OFFSET(SC_R15, sigcontext, r15);
-	OFFSET(SC_IP, sigcontext, rip);
-	OFFSET(SC_SP, sigcontext, rsp);
-	OFFSET(SC_CR2, sigcontext, cr2);
-	OFFSET(SC_ERR, sigcontext, err);
-	OFFSET(SC_TRAPNO, sigcontext, trapno);
-	OFFSET(SC_CS, sigcontext, cs);
-	OFFSET(SC_FS, sigcontext, fs);
-	OFFSET(SC_GS, sigcontext, gs);
-	OFFSET(SC_EFLAGS, sigcontext, eflags);
-	OFFSET(SC_SIGMASK, sigcontext, oldmask);
+	OFFSET(HOST_SC_RBX, sigcontext, rbx);
+	OFFSET(HOST_SC_RCX, sigcontext, rcx);
+	OFFSET(HOST_SC_RDX, sigcontext, rdx);
+	OFFSET(HOST_SC_RSI, sigcontext, rsi);
+	OFFSET(HOST_SC_RDI, sigcontext, rdi);
+	OFFSET(HOST_SC_RBP, sigcontext, rbp);
+	OFFSET(HOST_SC_RAX, sigcontext, rax);
+	OFFSET(HOST_SC_R8, sigcontext, r8);
+	OFFSET(HOST_SC_R9, sigcontext, r9);
+	OFFSET(HOST_SC_R10, sigcontext, r10);
+	OFFSET(HOST_SC_R11, sigcontext, r11);
+	OFFSET(HOST_SC_R12, sigcontext, r12);
+	OFFSET(HOST_SC_R13, sigcontext, r13);
+	OFFSET(HOST_SC_R14, sigcontext, r14);
+	OFFSET(HOST_SC_R15, sigcontext, r15);
+	OFFSET(HOST_SC_IP, sigcontext, rip);
+	OFFSET(HOST_SC_SP, sigcontext, rsp);
+	OFFSET(HOST_SC_CR2, sigcontext, cr2);
+	OFFSET(HOST_SC_ERR, sigcontext, err);
+	OFFSET(HOST_SC_TRAPNO, sigcontext, trapno);
+	OFFSET(HOST_SC_CS, sigcontext, cs);
+	OFFSET(HOST_SC_FS, sigcontext, fs);
+	OFFSET(HOST_SC_GS, sigcontext, gs);
+	OFFSET(HOST_SC_EFLAGS, sigcontext, eflags);
+	OFFSET(HOST_SC_SIGMASK, sigcontext, oldmask);
 #if 0
-	OFFSET(SC_ORIG_RAX, sigcontext, orig_rax);
-	OFFSET(SC_DS, sigcontext, ds);
-	OFFSET(SC_ES, sigcontext, es);
-	OFFSET(SC_SS, sigcontext, ss);
+	OFFSET(HOST_SC_ORIG_RAX, sigcontext, orig_rax);
+	OFFSET(HOST_SC_DS, sigcontext, ds);
+	OFFSET(HOST_SC_ES, sigcontext, es);
+	OFFSET(HOST_SC_SS, sigcontext, ss);
 #endif
 
-	DEFINE(HOST_FRAME_SIZE, FRAME_SIZE);
-	DEFINE(HOST_RBX, RBX);
-	DEFINE(HOST_RCX, RCX);
-	DEFINE(HOST_RDI, RDI);
-	DEFINE(HOST_RSI, RSI);
-	DEFINE(HOST_RDX, RDX);
-	DEFINE(HOST_RBP, RBP);
-	DEFINE(HOST_RAX, RAX);
-	DEFINE(HOST_R8, R8);
-	DEFINE(HOST_R9, R9);
-	DEFINE(HOST_R10, R10);
-	DEFINE(HOST_R11, R11);
-	DEFINE(HOST_R12, R12);
-	DEFINE(HOST_R13, R13);
-	DEFINE(HOST_R14, R14);
-	DEFINE(HOST_R15, R15);
-	DEFINE(HOST_ORIG_RAX, ORIG_RAX);
-	DEFINE(HOST_CS, CS);
-	DEFINE(HOST_SS, SS);
-	DEFINE(HOST_EFLAGS, EFLAGS);
+	DEFINE_LONGS(HOST_FRAME_SIZE, FRAME_SIZE);
+	DEFINE(HOST_FP_SIZE, 0);
+	DEFINE(HOST_XFP_SIZE, 0);
+	DEFINE_LONGS(HOST_RBX, RBX);
+	DEFINE_LONGS(HOST_RCX, RCX);
+	DEFINE_LONGS(HOST_RDI, RDI);
+	DEFINE_LONGS(HOST_RSI, RSI);
+	DEFINE_LONGS(HOST_RDX, RDX);
+	DEFINE_LONGS(HOST_RBP, RBP);
+	DEFINE_LONGS(HOST_RAX, RAX);
+	DEFINE_LONGS(HOST_R8, R8);
+	DEFINE_LONGS(HOST_R9, R9);
+	DEFINE_LONGS(HOST_R10, R10);
+	DEFINE_LONGS(HOST_R11, R11);
+	DEFINE_LONGS(HOST_R12, R12);
+	DEFINE_LONGS(HOST_R13, R13);
+	DEFINE_LONGS(HOST_R14, R14);
+	DEFINE_LONGS(HOST_R15, R15);
+	DEFINE_LONGS(HOST_ORIG_RAX, ORIG_RAX);
+	DEFINE_LONGS(HOST_CS, CS);
+	DEFINE_LONGS(HOST_SS, SS);
+	DEFINE_LONGS(HOST_EFLAGS, EFLAGS);
 #if 0
-	DEFINE(HOST_FS, FS);
-	DEFINE(HOST_GS, GS);
-	DEFINE(HOST_DS, DS);
-	DEFINE(HOST_ES, ES);
+	DEFINE_LONGS(HOST_FS, FS);
+	DEFINE_LONGS(HOST_GS, GS);
+	DEFINE_LONGS(HOST_DS, DS);
+	DEFINE_LONGS(HOST_ES, ES);
 #endif
 
-	DEFINE(HOST_IP, RIP);
-	DEFINE(HOST_SP, RSP);
-	DEFINE(__UM_FRAME_SIZE, sizeof(struct user_regs_struct));
+	DEFINE_LONGS(HOST_IP, RIP);
+	DEFINE_LONGS(HOST_SP, RSP);
+	DEFINE(UM_FRAME_SIZE, sizeof(struct user_regs_struct));
 }
diff -urN RC13-git10-foo/arch/um/sys-x86_64/util/Makefile current/arch/um/sys-x86_64/util/Makefile
--- RC13-git10-foo/arch/um/sys-x86_64/util/Makefile	2005-06-17 15:48:29.000000000 -0400
+++ current/arch/um/sys-x86_64/util/Makefile	1969-12-31 19:00:00.000000000 -0500
@@ -1,8 +0,0 @@
-# Copyright 2003 - 2004 Pathscale, Inc
-# Released under the GPL
-
-hostprogs-y	:= mk_sc mk_thread
-always		:= $(hostprogs-y)
-
-HOSTCFLAGS_mk_sc.o := -I$(objtree)/arch/um
-HOSTCFLAGS_mk_thread.o := -I$(objtree)/arch/um
diff -urN RC13-git10-foo/arch/um/sys-x86_64/util/mk_sc.c current/arch/um/sys-x86_64/util/mk_sc.c
--- RC13-git10-foo/arch/um/sys-x86_64/util/mk_sc.c	2005-06-17 15:48:29.000000000 -0400
+++ current/arch/um/sys-x86_64/util/mk_sc.c	1969-12-31 19:00:00.000000000 -0500
@@ -1,47 +0,0 @@
-/* Copyright (C) 2003 - 2004 PathScale, Inc
- * Released under the GPL
- */
-
-#include <stdio.h>
-#include <user-offsets.h>
-
-#define SC_OFFSET(name) \
-  printf("#define " #name \
-	 "(sc) *((unsigned long *) &(((char *) (sc))[%d]))\n",\
-	 name)
-
-int main(int argc, char **argv)
-{
-  SC_OFFSET(SC_RBX);
-  SC_OFFSET(SC_RCX);
-  SC_OFFSET(SC_RDX);
-  SC_OFFSET(SC_RSI);
-  SC_OFFSET(SC_RDI);
-  SC_OFFSET(SC_RBP);
-  SC_OFFSET(SC_RAX);
-  SC_OFFSET(SC_R8);
-  SC_OFFSET(SC_R9);
-  SC_OFFSET(SC_R10);
-  SC_OFFSET(SC_R11);
-  SC_OFFSET(SC_R12);
-  SC_OFFSET(SC_R13);
-  SC_OFFSET(SC_R14);
-  SC_OFFSET(SC_R15);
-  SC_OFFSET(SC_IP);
-  SC_OFFSET(SC_SP);
-  SC_OFFSET(SC_CR2);
-  SC_OFFSET(SC_ERR);
-  SC_OFFSET(SC_TRAPNO);
-  SC_OFFSET(SC_CS);
-  SC_OFFSET(SC_FS);
-  SC_OFFSET(SC_GS);
-  SC_OFFSET(SC_EFLAGS);
-  SC_OFFSET(SC_SIGMASK);
-#if 0
-  SC_OFFSET(SC_ORIG_RAX);
-  SC_OFFSET(SC_DS);
-  SC_OFFSET(SC_ES);
-  SC_OFFSET(SC_SS);
-#endif
-  return(0);
-}
diff -urN RC13-git10-foo/arch/um/sys-x86_64/util/mk_thread.c current/arch/um/sys-x86_64/util/mk_thread.c
--- RC13-git10-foo/arch/um/sys-x86_64/util/mk_thread.c	2005-06-17 15:48:29.000000000 -0400
+++ current/arch/um/sys-x86_64/util/mk_thread.c	1969-12-31 19:00:00.000000000 -0500
@@ -1,20 +0,0 @@
-#include <stdio.h>
-#include <kernel-offsets.h>
-
-int main(int argc, char **argv)
-{
-  printf("/*\n");
-  printf(" * Generated by mk_thread\n");
-  printf(" */\n");
-  printf("\n");
-  printf("#ifndef __UM_THREAD_H\n");
-  printf("#define __UM_THREAD_H\n");
-  printf("\n");
-#ifdef TASK_EXTERN_PID
-  printf("#define TASK_EXTERN_PID(task) *((int *) &(((char *) (task))[%d]))\n",
-	 TASK_EXTERN_PID);
-#endif
-  printf("\n");
-  printf("#endif\n");
-  return(0);
-}
diff -urN RC13-git10-foo/arch/um/util/Makefile current/arch/um/util/Makefile
--- RC13-git10-foo/arch/um/util/Makefile	2005-06-17 15:48:29.000000000 -0400
+++ current/arch/um/util/Makefile	1969-12-31 19:00:00.000000000 -0500
@@ -1,5 +0,0 @@
-hostprogs-y		:= mk_task mk_constants
-always			:= $(hostprogs-y)
-
-HOSTCFLAGS_mk_task.o := -I$(objtree)/arch/um
-HOSTCFLAGS_mk_constants.o := -I$(objtree)/arch/um
diff -urN RC13-git10-foo/arch/um/util/mk_constants.c current/arch/um/util/mk_constants.c
--- RC13-git10-foo/arch/um/util/mk_constants.c	2005-06-17 15:48:29.000000000 -0400
+++ current/arch/um/util/mk_constants.c	1969-12-31 19:00:00.000000000 -0500
@@ -1,32 +0,0 @@
-#include <stdio.h>
-#include <kernel-offsets.h>
-
-#define SHOW_INT(sym) printf("#define %s %d\n", #sym, sym)
-#define SHOW_STR(sym) printf("#define %s %s\n", #sym, sym)
-
-int main(int argc, char **argv)
-{
-  printf("/*\n");
-  printf(" * Generated by mk_constants\n");
-  printf(" */\n");
-  printf("\n");
-  printf("#ifndef __UM_CONSTANTS_H\n");
-  printf("#define __UM_CONSTANTS_H\n");
-  printf("\n");
-
-  SHOW_INT(UM_KERN_PAGE_SIZE);
-
-  SHOW_STR(UM_KERN_EMERG);
-  SHOW_STR(UM_KERN_ALERT);
-  SHOW_STR(UM_KERN_CRIT);
-  SHOW_STR(UM_KERN_ERR);
-  SHOW_STR(UM_KERN_WARNING);
-  SHOW_STR(UM_KERN_NOTICE);
-  SHOW_STR(UM_KERN_INFO);
-  SHOW_STR(UM_KERN_DEBUG);
-
-  SHOW_INT(UM_NSEC_PER_SEC);
-  printf("\n");
-  printf("#endif\n");
-  return(0);
-}
diff -urN RC13-git10-foo/arch/um/util/mk_task.c current/arch/um/util/mk_task.c
--- RC13-git10-foo/arch/um/util/mk_task.c	2005-06-17 15:48:29.000000000 -0400
+++ current/arch/um/util/mk_task.c	1969-12-31 19:00:00.000000000 -0500
@@ -1,30 +0,0 @@
-#include <stdio.h>
-#include <kernel-offsets.h>
-
-void print_ptr(char *name, char *type, int offset)
-{
-  printf("#define %s(task) ((%s *) &(((char *) (task))[%d]))\n", name, type,
-	 offset);
-}
-
-void print(char *name, char *type, int offset)
-{
-  printf("#define %s(task) *((%s *) &(((char *) (task))[%d]))\n", name, type,
-	 offset);
-}
-
-int main(int argc, char **argv)
-{
-  printf("/*\n");
-  printf(" * Generated by mk_task\n");
-  printf(" */\n");
-  printf("\n");
-  printf("#ifndef __TASK_H\n");
-  printf("#define __TASK_H\n");
-  printf("\n");
-  print_ptr("TASK_REGS", "union uml_pt_regs", TASK_REGS);
-  print("TASK_PID", "int", TASK_PID);
-  printf("\n");
-  printf("#endif\n");
-  return(0);
-}

Re: asm-offsets.h is generated in the source tree

[Sam Ravnborg]

> > > What happens:
> > > 	a) silentconfig expects to have include/linux in build tree already
> > > created.  Normally that happens earlier, but only by accident.  We need to
> > > force that somehow and the way I'd done it is almost certainly wrong - it
> > > should be in top-level makefile, to start with.  Suggestions?
> > 
> > We could stick a `mkdir -p include/linux` command just before executing
> > $(Q)$(MAKE) $(build)=scripts/kconfig silentoldconfig
> > 
> > It should do the trick - no?
> 
> AFAICS that would do it and it would make sense - silentoldconfig really
> relies on it being there, so it's either a dependency or just forcing it
> to be there.  Either would do and it certainly belongs to top-level Makefile.
I will include this in next patch series. This is a fix so it should be
ok for post monday.

> > > 	b) kernel-offsets.h needs symlinks already in place.  prepare1 does
> > > everything we need, so that dependency is probably the right thing (the second
> > > chunk).
> > 
> > I will try to take a closer look at this tonight.
What I have done in my tree is to set up following dependency tree in
the top-lvel Makefile:

prepare
  +-prepare0
     +-archprepare
        +-prepare1
           +-prepare2
              +-prepare3


prepare0 needs archprepare, but archprepare may need prepare1.
So this should be OK on all architectures.
And you can go back relying solely on prepare in um Makefile.


> > As always my head starts spinning when I look at the arch/um/Makefile
> > but I will see what I can do.
> > If I can simplify it and introduce full dependency checks it would be
> > really nice. 
...
> No need.  We really need only two generated files - constants from
> UML host userland and constants from UML kernel itself.  That's it.
> 
> And these are needed since we have two parts of UML code - built with
> kernel and userland headers resp. (basically, normal kernel code and
> glue to UML host userland).  Since headers really do not mix, we have
> to use extracted constants in pretty much the same way we have to
> do that for assembler bits.  So there you go...
It certainly look much much better than anything I could come up with.
You should persuade Jeff and Paolo to test and include this.

A few notes..
  
>  define filechk_gen-asm-offsets
>          (set -e; \
> -         echo "#ifndef __ASM_OFFSETS_H__"; \
> -         echo "#define __ASM_OFFSETS_H__"; \
>           echo "/*"; \
>           echo " * DO NOT MODIFY."; \
>           echo " *"; \
> @@ -208,8 +199,7 @@
>           echo " */"; \
>           echo ""; \
>           sed -ne "/^->/{s:^->\([^ ]*\) [\$$#]*\([^ ]*\) \(.*\):#define \1 \2 /* \3 */:; s:->::; p;}"; \
> -         echo ""; \
> -         echo "#endif" )
> +         echo ""; )
>  endef
>  
>  include/linux/autoconf.h : include/linux/version.h
> @@ -220,49 +210,18 @@
>  $(ARCH_DIR)/user-offsets.s: $(ARCH_DIR)/sys-$(SUBARCH)/user-offsets.c
>  	$(CC) $(USER_CFLAGS) -S -o $@ $<

This part could be moved to a Kbuild file so we have access to
full kbuild functionality - and thus anebling full dependency check
on user-offset.c
  
> -$(ARCH_DIR)/user-offsets.h: $(ARCH_DIR)/user-offsets.s
> +$(ARCH_DIR)/include/user_constants.h: $(ARCH_DIR)/user-offsets.s
>  	$(call filechk,gen-asm-offsets)
filechk is only relevant if there is a risk that user_constants.h is
rebuild but there is no changes in output file. We do this for version.h
but I do not see any big need for it here.
  
> -$(ARCH_DIR)/kernel-offsets.h: $(ARCH_DIR)/kernel-offsets.s
> +$(ARCH_DIR)/include/kern_constants.h: $(ARCH_DIR)/kernel-offsets.s
>  	$(call filechk,gen-asm-offsets)

Same comment as above.

	Sam

Re: asm-offsets.h is generated in the source tree

[Al Viro]

On Sun, Sep 11, 2005 at 07:04:25PM +0200, Sam Ravnborg wrote:
> prepare
>   +-prepare0
>      +-archprepare
>         +-prepare1
>            +-prepare2
>               +-prepare3
> 
> 
> prepare0 needs archprepare, but archprepare may need prepare1.
> So this should be OK on all architectures.
> And you can go back relying solely on prepare in um Makefile.

OK...  Once that goes in, I'm doing s/prepare1/archprepare/ in there.
Note that kern-offsets.c expects to find user_constants.h and symlinks
already in place - it assumes that all kernel headers are usable.
kern_constants.h is used only by userland glue, task.h and thread.h and
these, in turn, are used only by userland glue.

So ordering constraints are
	symlinks and user_constants.h are needed to get kernel headers usable
	kern_constants.h needs kernel headers
	kernel code needs kernel headers
	parts of userland glue need kern_constants.h

FWIW, we could rename user-offsets.c to asm-offsets.c and let the regular
mechanism take care of them (renaming user_constants.h at the same time,
obviously).  Critical part here is "kernel-offsets.c expects kernel headers
usable", everything else could be trivially dealt with...
 
Note that kern_constants.h must *NOT* go into include/asm-um - we need it
in userland glue which doesn't get include/ in its search path.  So reducing
the number of symlinks won't be trivial.  We could, in principle, move
kern_constants.h to e.g. include/asm-um/user/, include that in userland
glue search path and try to fight the rest, but that won't be fun.

One particulary nasty bit: we have both per-subarch headers in asm-um _and_
headers in there that do something and proceed to include corresponding
header from asm-<subarch>.  Currently we do that with
	include/asm-um/arch ----> include/asm-<subarch>
	include/asm-um/foo.h ---> include/asm-um/foo-<subarch>.h for
the first kind and
	#include <asm/arch/foo.h> in foo.h for the second one.

We also have arch/um/include/sysdep -> sysdep-<subarch>, but that's easier
to deal with...

Any ideas?

> > -$(ARCH_DIR)/kernel-offsets.h: $(ARCH_DIR)/kernel-offsets.s
> > +$(ARCH_DIR)/include/kern_constants.h: $(ARCH_DIR)/kernel-offsets.s
> >  	$(call filechk,gen-asm-offsets)
> 
> Same comment as above.

kernel-offsets.c might actually pick a stray dependency on version.h.
user-offsets.c comment applies, indeed.

Re: asm-offsets.h is generated in the source tree

[Sam Ravnborg]

 
> OK...  Once that goes in, I'm doing s/prepare1/archprepare/ in there.
> Note that kern-offsets.c expects to find user_constants.h and symlinks
> already in place - it assumes that all kernel headers are usable.
> kern_constants.h is used only by userland glue, task.h and thread.h and
> these, in turn, are used only by userland glue.

Sent to Linus, assume it will be merged soon.

> 
> So ordering constraints are
> 	symlinks and user_constants.h are needed to get kernel headers usable
> 	kern_constants.h needs kernel headers
> 	kernel code needs kernel headers
> 	parts of userland glue need kern_constants.h
> 
> FWIW, we could rename user-offsets.c to asm-offsets.c and let the regular
> mechanism take care of them (renaming user_constants.h at the same time,
> obviously).  Critical part here is "kernel-offsets.c expects kernel headers
> usable", everything else could be trivially dealt with...

No. For once the flags to gcc differs for userland and kernelland.
Of the two candidates only kern_constants.h could be dealt with by
the generic support.

> Note that kern_constants.h must *NOT* go into include/asm-um - we need it
> in userland glue which doesn't get include/ in its search path.
And this killed the idea of using the generic support - not a big deal
anyway.


> So reducing
> the number of symlinks won't be trivial.  We could, in principle, move
> kern_constants.h to e.g. include/asm-um/user/, include that in userland
> glue search path and try to fight the rest, but that won't be fun.
> 
> One particulary nasty bit: we have both per-subarch headers in asm-um _and_
> headers in there that do something and proceed to include corresponding
> header from asm-<subarch>.  Currently we do that with
> 	include/asm-um/arch ----> include/asm-<subarch>
This just shows how horribly broken the symlink scheme is in the first
place.

If the kernel had used a scheme like the following everything could be
solved by a few -I statements:

include/i386/asm/<what we have in include/asm-i386 today>
include/ia64/asm/<what we have in include/asm-ia64 today>
etc.

Then to use ia64 we would just use:
-Iinclude/ia64

And in um land we could do exactly the same with no ugly symlinks.

> 	include/asm-um/foo.h ---> include/asm-um/foo-<subarch>.h for
> the first kind and
> 	#include <asm/arch/foo.h> in foo.h for the second one.
> 
> We also have arch/um/include/sysdep -> sysdep-<subarch>, but that's easier
> to deal with...
Here we should do like this:
arch/um/include/<subarch>/sysdep/<files from sysdep-<subarch>>
Again no ugly symlinks needed.

Another benefir that is often overlooked.
With kbuild checking the compileflags everything 'just works' when we
change sub-arch. No need to make clean etc.


I know this is a lot of renaming and I have not seen a really good
argument to convince Linus to rename include/asm-<arch>.
But for um I see no big dela doing the renaming, especially since most
of currect code should work out-of-the-box even with the changes
introduced.

	Sam

Re: asm-offsets.h is generated in the source tree

[Al Viro]

On Mon, Sep 12, 2005 at 12:03:28AM +0200, Sam Ravnborg wrote:
> If the kernel had used a scheme like the following everything could be
> solved by a few -I statements:
> 
> include/i386/asm/<what we have in include/asm-i386 today>
> include/ia64/asm/<what we have in include/asm-ia64 today>
> etc.
> 
> Then to use ia64 we would just use:
> -Iinclude/ia64

Doesn't solve the problem.  We have header pulled from include/linux/*
by asm/foo.h.  It contains generic UML stuff _and_ include of regular
asm/foo.h _of_ _the_ _subarch_.  Not a UML stuff that varies depending
on the subarch; we want whatever normal i386, amd64, etc. kernel would
get upon include of asm/foo.h.

See what I mean?  _IF_ we just wanted subarch foo.h, your scheme would
work.  If we wanted subarch-dependent header that would be pulled by
foo.h - ditto (sysdep/blah.h from foo.h).  But we can't do that when
we want #include <asm/foo.h> (from arch-independent code) pull some
UML stuff *and* asm/foo.h of subarch.

That's the problem.  Everything else is reasonably easy to deal with.
That one is not.  And yes, I know about #include_next.  I'd rather
stick to C, though, TYVM...

Re: asm-offsets.h is generated in the source tree

[Sam Ravnborg]

Hi Al. 
 
> See what I mean?  _IF_ we just wanted subarch foo.h, your scheme would
> work.  If we wanted subarch-dependent header that would be pulled by
> foo.h - ditto (sysdep/blah.h from foo.h).  But we can't do that when
> we want #include <asm/foo.h> (from arch-independent code) pull some
> UML stuff *and* asm/foo.h of subarch.
> 
> That's the problem.  Everything else is reasonably easy to deal with.
> That one is not.  And yes, I know about #include_next.  I'd rather
> stick to C, though, TYVM...
> 
I got the picture. And you are right that there is no way to sort this
out with a clever directory structure and a few -I options.
The only two solutions I see you already pointed out:

o Use symlinks
  - With all their horror they do the job.
  - The need special care with make O=
  - We fail to detect when the point somewhere else, so make mrproper
    is needed.
  - They confuse people
    
o include_next
  - gcc extension
  - Give us correct dependencies
  - Signal that something fishy is going on

o Use some magic define trick like:
  - #include "ARCHDIR##foo.h"
  - I cannot recall correct syntax but something like this is doable

Of the three possibilities the include_next is the better chocie. Why?
Because we leave it to the build system to figure out what .h file to
include, and thus letting the build system having full knowledge we make
sure to recompile whatever is needed when we change subarch.
Without the asm symlink in the kernel it would just work in many cases
when you changed architecture.

So to repaet. symlinks are evil when used to in sources.

	Sam

Re: asm-offsets.h is generated in the source tree

[Al Viro]

On Mon, Sep 12, 2005 at 09:15:25PM +0200, Sam Ravnborg wrote:
> o Use symlinks
>   - With all their horror they do the job.
>   - The need special care with make O=
>   - We fail to detect when the point somewhere else, so make mrproper
>     is needed.
>   - They confuse people
>     
> o include_next
>   - gcc extension
>   - Give us correct dependencies
>   - Signal that something fishy is going on
> 
> o Use some magic define trick like:
>   - #include "ARCHDIR##foo.h"
>   - I cannot recall correct syntax but something like this is doable

* Provide a function that would
	take target of form <directory>/.<link>
	create a symlink at <directory>/<link> to argument of function,
doing obvious changes for O=
	touch the target

That would turn e.g. arm/Makefile rule into

include/asm-arm/.arch: $(wildcard include/config/arch/*.h) include/config/MARKER
	$(call symlink, arch-$(incdir-y))

with all the guts handled by the function in question.  For O= build you'd
get
	include/asm-arm created if needed
	include/asm-arm/arch -> $(srctree)/include/asm-arm/arch-....
and for normal one
	include/asm-arm/arch -> arch-....
In either case include/asm-arm/.arch is touched and depends on the right
config options.  Same for include/asm-sh/cpu and include/asm-sh/mach,
etc.

The only case not handled by that scheme is when we create a symlink and
then create files in its target.  Which, AFAICS, is the case only for
include/asm - UML used to need that for arch/um/include/sysdep, but doesn't
anymore (as the matter of fact, arch/um/include2/ is gone in my tree).

The reason why include_next blows is very simple: OK, so make can figure
out what we mean.  But make is not the only thing that has to understand
which file is refered to - people writing and reviewing code need the same
and having to figure out what exactly do we have in search path is asking
for trouble.  With symlinks (or bindings, etc.) you have #include argument
that doesn't need that sort of lookups - <asm/arch/foo.h> is visibly
different from <asm/foo.h> and one can immediately see what it's about.

IOW, playing tricks with search paths becomes wrong as soon as it becomes
something you have to keep in mind while reading kernel code itself.

Re: asm-offsets.h is generated in the source tree

[Kyle Moffett]

On Mon, Sep 12, 2005 at 09:15:25PM +0200, Sam Ravnborg wrote:
> o Use some magic define trick like:
>   - #include "ARCHDIR##foo.h"
>   - I cannot recall correct syntax but something like this is doable

The syntax for that is one of the following:

# define STR(x) #x
# define XSTR(x) STR(x)

# define SOME_ARCH_DIR foo/bar
# define STRING_INCLUDE(path) XSTR(SOME_ARCH_DIR/path)
# define ANGLE_INCLUDE(path) <SOME_ARCH_DIR/path>

Then:
# include STRING_INCLUDE(baz.h)    ==>    # include "foo/bar/baz.h"
# include ANGLE_INCLUDE(baz.h)     ==>    # include <foo/bar/baz.h>

I'm not sure what GCC version these were first supported in, but I
would try to stay away from them as a matter of principle.  They're
ugly and quite hard to read/understand.  If there were no other way,
I might use those, but since there probably is...  I dunno about
you, but those are some really icky constructions.

Cheers,
Kyle Moffett

--
Premature optimization is the root of all evil in programming
   -- C.A.R. Hoare

Re: asm-offsets.h is generated in the source tree

[Keith Owens]

On Tue, 13 Sep 2005 02:48:43 -0400, 
Kyle Moffett <mrmacman_g4@mac.com> wrote:
>On Mon, Sep 12, 2005 at 09:15:25PM +0200, Sam Ravnborg wrote:
>> o Use some magic define trick like:
>>   - #include "ARCHDIR##foo.h"
>>   - I cannot recall correct syntax but something like this is doable
>
>The syntax for that is one of the following:
>
># define STR(x) #x
># define XSTR(x) STR(x)

Already exists, see include/linux/stringify.h

Re: asm-offsets.h is generated in the source tree

[Kyle Moffett]

On Sep 13, 2005, at 02:53:33, Keith Owens wrote:
> On Tue, 13 Sep 2005 02:48:43 -0400,
> Kyle Moffett <mrmacman_g4@mac.com> wrote:
>
>> On Mon, Sep 12, 2005 at 09:15:25PM +0200, Sam Ravnborg wrote:
>>
>>> o Use some magic define trick like:
>>>   - #include "ARCHDIR##foo.h"
>>>   - I cannot recall correct syntax but something like this is doable
>>>
>>
>> The syntax for that is one of the following:
>>
>> # define STR(x) #x
>> # define XSTR(x) STR(x)
>>
>
> Already exists, see include/linux/stringify.h

Well, yes, but I was illustrating the complete generic technique.  If
you put all the defines in appropriate other headers, then all you need
are the #include ANGLE_INCLUDE(baz.h) and #include QUOTE_INCLUDE(baz.h)
lines :-D.


Cheers,
Kyle Moffett

--
Somone asked me why I work on this free (http://www.fsf.org/philosophy/)
software stuff and not get a real job. Charles Shultz had the best  
answer:

"Why do musicians compose symphonies and poets write poems? They do  
it because
life wouldn't have any meaning for them if they didn't. That's why I  
draw
cartoons. It's my life."
   -- Charles Shultz

Re: asm-offsets.h is generated in the source tree

[Al Viro]

On Tue, Sep 13, 2005 at 07:30:28AM +0100, Al Viro wrote:
> * Provide a function that would
> 	take target of form <directory>/.<link>
> 	create a symlink at <directory>/<link> to argument of function,
> doing obvious changes for O=
> 	touch the target

ifneq ($(KBUILD_SRC),)
define symlink
        $(Q)mkdir -p $(dir $@)
        $(Q)ln -sn $(srctree)/$(dir $@)/$1 $(dir $@)$(patsubst .%,%,$(notdir $@))
        $(Q)touch $@
endef
else
define symlink
        $(Q)ln -sn $1 $(dir $@)$(patsubst .%,%,$(notdir $@))
        $(Q)touch $@
endef
endif

would do it, AFAICS.  Objections?

Re: asm-offsets.h is generated in the source tree

[Al Viro]

On Mon, Sep 12, 2005 at 09:15:25PM +0200, Sam Ravnborg wrote:
> Because we leave it to the build system to figure out what .h file to
> include, and thus letting the build system having full knowledge we make
> sure to recompile whatever is needed when we change subarch.
> Without the asm symlink in the kernel it would just work in many cases
> when you changed architecture.

Correct cross-toolchain would be picked by some miracle, presumably?
Both for include/asm and for include/asm-um/arch...  And after that
we win a stunning fraction of percent - some of the generated files
do _not_ depend on any target .o, so we will avoid rebuilding them.

Note that in cases when rebuild involving symlink change _is_ possible
(e.g. arm or sh subarch) we already get the right thing - change it in
.config and symlinks will be flipped.

Re: asm-offsets.h is generated in the source tree

[Sam Ravnborg]

On Sun, Sep 11, 2005 at 01:20:33AM +1000, Stephen Rothwell wrote:
> The latest Linus-git tree generates asm-offsets.h in the source tree even
> if you use O=... I don't know how to fix this, but it means that the
> source tree cannot be read only.

Fixed - patch appended.
[I also made an unrelated space fix in the same patch]

	Sam

kbuild: fix generic asm-offsets.h support

iThis fixes a bug where the generated asm-offsets.h file was saved in
the source tree even with make O=.
Thanks to Stephen Rothwell <sfr@canb.auug.org.au> for the report.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

---
commit 8d36a62364b6b04dc7b0e9fe09f6968f4e5a1f0a
tree 10d5400d627236f7308f13238fa6559ccd9d79d1
parent 0a504f259c90fb41d3495d490fc9dbe2530c8749
author Sam Ravnborg <sam@mars.ravnborg.org> Sat, 10 Sep 2005 21:05:36 +0200
committer Sam Ravnborg <sam@mars.ravnborg.org> Sat, 10 Sep 2005 21:05:36 +0200

 Kbuild   |    5 +++--
 Makefile |    2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Kbuild b/Kbuild
--- a/Kbuild
+++ b/Kbuild
@@ -4,7 +4,7 @@
 # 1) Generate asm-offsets.h
 
 #####
-# 1) Generate asm-offsets.h 
+# 1) Generate asm-offsets.h
 #
 
 offsets-file := include/asm-$(ARCH)/asm-offsets.h
@@ -22,6 +22,7 @@ sed-$(CONFIG_MIPS) := "/^@@@/s///p"
 
 quiet_cmd_offsets = GEN     $@
 define cmd_offsets
+	mkdir -p $(dir $@); \
 	cat $< | \
 	(set -e; \
 	 echo "#ifndef __ASM_OFFSETS_H__"; \
@@ -43,6 +44,6 @@ arch/$(ARCH)/kernel/asm-offsets.s: arch/
 	$(Q)mkdir -p $(dir $@)
 	$(call if_changed_dep,cc_s_c)
 
-$(srctree)/$(offsets-file): arch/$(ARCH)/kernel/asm-offsets.s Kbuild
+$(obj)/$(offsets-file): arch/$(ARCH)/kernel/asm-offsets.s Kbuild
 	$(call cmd,offsets)
 
diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -814,7 +814,7 @@ ifneq ($(KBUILD_MODULES),)
 endif
 
 prepare0: prepare prepare1 FORCE
-	$(Q)$(MAKE) $(build)=$(srctree)
+	$(Q)$(MAKE) $(build)=.
 
 # All the preparing..
 prepare-all: prepare0