diff options
| author | Al Viro | 2005-09-03 15:57:43 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2005-09-05 00:06:23 -0700 |
| commit | 30f7dabb083f8ff4ce541b5ac4e5d70cc173051a (patch) | |
| tree | d4d457762926f694e6d12db8ff781d04ca31172d | |
| parent | e32dacb9f481fd6decb41adb28e720c923d34f54 (diff) | |
[PATCH] uml: build cleanups
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@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | arch/um/Makefile-x86_64 | 2 | ||||
| -rw-r--r-- | arch/um/sys-i386/Makefile | 6 | ||||
| -rw-r--r-- | arch/um/sys-i386/stub_segv.c | 3 | ||||
| -rw-r--r-- | arch/um/sys-x86_64/Makefile | 6 | ||||
| -rw-r--r-- | arch/um/sys-x86_64/stub_segv.c | 3 |
5 files changed, 6 insertions, 14 deletions
diff --git a/arch/um/Makefile-x86_64 b/arch/um/Makefile-x86_64 index aa2f7174ebca..baddb5d64ca5 100644 --- a/arch/um/Makefile-x86_64 +++ b/arch/um/Makefile-x86_64 @@ -6,7 +6,7 @@ START := 0x60000000 #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 diff --git a/arch/um/sys-i386/Makefile b/arch/um/sys-i386/Makefile index cdf6b6d4a069..4ca2a229da49 100644 --- a/arch/um/sys-i386/Makefile +++ b/arch/um/sys-i386/Makefile @@ -16,11 +16,7 @@ semaphore.c-dir = kernel 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 diff --git a/arch/um/sys-i386/stub_segv.c b/arch/um/sys-i386/stub_segv.c index 68aeabe3a654..1e88b275edac 100644 --- a/arch/um/sys-i386/stub_segv.c +++ b/arch/um/sys-i386/stub_segv.c @@ -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" diff --git a/arch/um/sys-x86_64/Makefile b/arch/um/sys-x86_64/Makefile index 32bb7d8219fb..f0ab574d1e95 100644 --- a/arch/um/sys-x86_64/Makefile +++ b/arch/um/sys-x86_64/Makefile @@ -27,11 +27,7 @@ memcpy.S-dir = lib 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 diff --git a/arch/um/sys-x86_64/stub_segv.c b/arch/um/sys-x86_64/stub_segv.c index 161d1fe9c034..65a131b362b6 100644 --- a/arch/um/sys-x86_64/stub_segv.c +++ b/arch/um/sys-x86_64/stub_segv.c @@ -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" |