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

Commit 30f7dabb authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[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: 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 e32dacb9

arch/um/Makefile-x86_64

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/um/sys-i386/Makefile

+1 −5
Original line number Diff line number Diff line
@@ -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

arch/um/sys-i386/stub_segv.c

+1 −2
Original line number Diff line number Diff line
@@ -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"

arch/um/sys-x86_64/Makefile

+1 −5
Original line number Diff line number Diff line
@@ -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

arch/um/sys-x86_64/stub_segv.c

+2 −1
Original line number Diff line number Diff line
@@ -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"