lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] uml: build cleanups

Browse Source 
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>
This commit is contained in:
Al Viro
2005-09-03 15:57:43 -07:00
committed by Linus Torvalds
parent e32dacb9f4
commit 30f7dabb08
5 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/um/Makefile-x86_64
View File

@@ -6,7 +6,7 @@ START := 0x60000000
#We #undef __x86_64__ for kernelspace, not for userspace where #We #undef __x86_64__ for kernelspace, not for userspace where
#it's needed for headers to work! #it's needed for headers to work!
CFLAGS += -U__$(SUBARCH)__ -fno-builtin $(STUB_CFLAGS) CFLAGS += -U__$(SUBARCH)__ -fno-builtin
USER_CFLAGS += -fno-builtin USER_CFLAGS += -fno-builtin
ELF_ARCH := i386:x86-64 ELF_ARCH := i386:x86-64

6
arch/um/sys-i386/Makefile
View File

@@ -16,11 +16,7 @@ semaphore.c-dir = kernel
highmem.c-dir = mm highmem.c-dir = mm
module.c-dir = kernel module.c-dir = kernel
STUB_CFLAGS = -Wp,-MD,$(depfile) $(call unprofile,$(USER_CFLAGS)) $(obj)/stub_segv.o : _c_flags = $(call unprofile,$(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)
subdir- := util subdir- := util

3
arch/um/sys-i386/stub_segv.c
View File

@@ -3,8 +3,7 @@
* Licensed under the GPL * Licensed under the GPL
*/ */
#include <signal.h> #include <asm/signal.h>
#include <asm/sigcontext.h>
#include <asm/unistd.h> #include <asm/unistd.h>
#include "uml-config.h" #include "uml-config.h"
#include "sysdep/sigcontext.h" #include "sysdep/sigcontext.h"

6
arch/um/sys-x86_64/Makefile
View File

@@ -27,11 +27,7 @@ memcpy.S-dir = lib
thunk.S-dir = lib thunk.S-dir = lib
module.c-dir = kernel module.c-dir = kernel
STUB_CFLAGS = -Wp,-MD,$(depfile) $(call unprofile,$(USER_CFLAGS)) $(obj)/stub_segv.o: _c_flags = $(call unprofile,$(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)
subdir- := util subdir- := util

3
arch/um/sys-x86_64/stub_segv.c
View File

@@ -3,9 +3,10 @@
* Licensed under the GPL * Licensed under the GPL
*/ */
#include <signal.h> #include <asm/signal.h>
#include <linux/compiler.h> #include <linux/compiler.h>
#include <asm/unistd.h> #include <asm/unistd.h>
#include <asm/ucontext.h>
#include "uml-config.h" #include "uml-config.h"
#include "sysdep/sigcontext.h" #include "sysdep/sigcontext.h"
#include "sysdep/faultinfo.h" #include "sysdep/faultinfo.h"