[PATCH 4/12] UML - build cleanups

[Jeff Dike]

From: Al Viro <viro@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>

Added missing include list to uml AFLAGS
Killed magic for stubs. [So] - it was needed only because of messed AFLAGS
Switched segv_stubs.c to kernel CFLAGS sans profile, instead of user ones
Killed STUBS_CFLAGS - it's not needed and the only remaining use had been
gratitious - it only polluted CFLAGS

Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Jeff Dike <jdike@xxxxxxxxxxx>


Index: test/arch/um/Makefile-i386
===================================================================
--- test.orig/arch/um/Makefile-i386	2005-09-01 16:03:16.000000000 -0400
+++ test/arch/um/Makefile-i386	2005-09-01 16:04:30.000000000 -0400
@@ -27,8 +27,7 @@
 endif
 endif
 
-CFLAGS += -U__$(SUBARCH)__ -U$(SUBARCH) $(STUB_CFLAGS) \
-	  -Iinclude/asm-i386/mach-default \
+CFLAGS += -U__$(SUBARCH)__ -U$(SUBARCH) -Iinclude/asm-i386/mach-default \
           $(if $(KBUILD_SRC),-Iinclude2/asm-i386/mach-default -I$(srctree)/include/asm-i386/mach-default)
 
 ifneq ($(CONFIG_GPROF),y)
Index: test/arch/um/Makefile-x86_64
===================================================================
--- test.orig/arch/um/Makefile-x86_64	2005-09-01 16:02:46.000000000 -0400
+++ test/arch/um/Makefile-x86_64	2005-09-01 16:04:30.000000000 -0400
@@ -6,7 +6,7 @@
 
 #We #undef __x86_64__ for kernelspace, not for userspace where
 #it's needed for headers to work!
-CFLAGS += -U__$(SUBARCH)__ -fno-builtin $(STUB_CFLAGS)
+CFLAGS += -U__$(SUBARCH)__ -fno-builtin
 USER_CFLAGS += -fno-builtin
 
 ELF_ARCH := i386:x86-64
Index: test/arch/um/sys-i386/Makefile
===================================================================
--- test.orig/arch/um/sys-i386/Makefile	2005-09-01 16:03:16.000000000 -0400
+++ test/arch/um/sys-i386/Makefile	2005-09-01 16:04:30.000000000 -0400
@@ -16,11 +16,7 @@
 highmem.c-dir = mm
 module.c-dir = kernel
 
-STUB_CFLAGS = -Wp,-MD,$(depfile) $(call unprofile,$(USER_CFLAGS))
-
-# _cflags works with kernel files, not with userspace ones, but c_flags does,
-# why ask why?
-$(obj)/stub_segv.o : c_flags = $(STUB_CFLAGS)
+$(obj)/stub_segv.o : _c_flags = $(call unprofile,$(CFLAGS))
 
 subdir- := util
 
Index: test/arch/um/sys-i386/stub_segv.c
===================================================================
--- test.orig/arch/um/sys-i386/stub_segv.c	2005-09-01 16:02:46.000000000 -0400
+++ test/arch/um/sys-i386/stub_segv.c	2005-09-01 16:04:30.000000000 -0400
@@ -3,8 +3,7 @@
  * Licensed under the GPL
  */
 
-#include <signal.h>
-#include <asm/sigcontext.h>
+#include <asm/signal.h>
 #include <asm/unistd.h>
 #include "uml-config.h"
 #include "sysdep/sigcontext.h"
Index: test/arch/um/sys-x86_64/Makefile
===================================================================
--- test.orig/arch/um/sys-x86_64/Makefile	2005-09-01 16:04:05.000000000 -0400
+++ test/arch/um/sys-x86_64/Makefile	2005-09-01 16:04:30.000000000 -0400
@@ -27,11 +27,7 @@
 thunk.S-dir = lib
 module.c-dir = kernel
 
-STUB_CFLAGS = -Wp,-MD,$(depfile) $(call unprofile,$(USER_CFLAGS))
-
-# _cflags works with kernel files, not with userspace ones, but c_flags does,
-# why ask why?
-$(obj)/stub_segv.o : c_flags = $(STUB_CFLAGS)
+$(obj)/stub_segv.o: _c_flags = $(call unprofile,$(CFLAGS))
 
 subdir- := util
 
Index: test/arch/um/sys-x86_64/stub_segv.c
===================================================================
--- test.orig/arch/um/sys-x86_64/stub_segv.c	2005-09-01 16:02:46.000000000 -0400
+++ test/arch/um/sys-x86_64/stub_segv.c	2005-09-01 16:04:30.000000000 -0400
@@ -3,9 +3,10 @@
  * Licensed under the GPL
  */
 
-#include <signal.h>
+#include <asm/signal.h>
 #include <linux/compiler.h>
 #include <asm/unistd.h>
+#include <asm/ucontext.h>
 #include "uml-config.h"
 #include "sysdep/sigcontext.h"
 #include "sysdep/faultinfo.h"

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/