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

Commit d45e44d4 authored by akpm@osdl.org's avatar akpm@osdl.org Committed by Linus Torvalds
Browse files

[PATCH] uml: fix compilation options for USER_OBJS 



From: Jeff Dike <jdike@addtoit.com>, Paolo Giarrusso <blaisorblade@yahoo.it>

Make sure that when compiling USER_OBJS the correct compilation options are
passed; since they are compiled with USER_CFLAGS which is derived from
CFLAGS, make sure it is a recursively evaluated variable, so that changes
to CFLAGS done afterwards the inclusion of arch/$(ARCH)/Makefile are
reflected in USER_CFLAGS.

For instance, without this patch userspace objects are never compiled with
debug info active.

Signed-off-by: default avatarPaolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent b428b51e

arch/um/Makefile

+11 −10
Original line number Diff line number Diff line
@@ -64,9 +64,14 @@ CFLAGS += $(CFLAGS-y) -D__arch_um__ -DSUBARCH=\"$(SUBARCH)\" \ 


AFLAGS += $(ARCH_INCLUDE)



USER_CFLAGS := $(patsubst -I%,,$(CFLAGS))

USER_CFLAGS := $(patsubst -D__KERNEL__,,$(USER_CFLAGS)) $(ARCH_INCLUDE) \

	$(MODE_INCLUDE) -D_FILE_OFFSET_BITS=64

USER_CFLAGS = $(patsubst $(KERNEL_DEFINES),,$(patsubst -D__KERNEL__,,\

	$(patsubst -I%,,$(CFLAGS)))) $(ARCH_INCLUDE) $(MODE_INCLUDE) \

	-D_FILE_OFFSET_BITS=64



include $(srctree)/$(ARCH_DIR)/Makefile-$(SUBARCH)



#This will adjust *FLAGS accordingly to the platform.

include $(srctree)/$(ARCH_DIR)/Makefile-os-$(OS)



# -Derrno=kernel_errno - This turns all kernel references to errno into

# kernel_errno to separate them from the libc errno.  This allows -fno-common
@@ -74,15 +79,11 @@ USER_CFLAGS := $(patsubst -D__KERNEL__,,$(USER_CFLAGS)) $(ARCH_INCLUDE) \ 
# errnos.

# These apply to kernelspace only.



CFLAGS += -Derrno=kernel_errno -Dsigprocmask=kernel_sigprocmask \

	-Dmktime=kernel_mktime

KERNEL_DEFINES = -Derrno=kernel_errno -Dsigprocmask=kernel_sigprocmask \

	-Dmktime=kernel_mktime $(ARCH_KERNEL_DEFINES)

CFLAGS += $(KERNEL_DEFINES)

CFLAGS += $(call cc-option,-fno-unit-at-a-time,)



include $(srctree)/$(ARCH_DIR)/Makefile-$(SUBARCH)



#This will adjust *FLAGS accordingly to the platform.

include $(srctree)/$(ARCH_DIR)/Makefile-os-$(OS)



# These are needed for clean and mrproper, since in that case .config is not

# included; the values here are meaningless

arch/um/Makefile-i386

+1 −3
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ OBJCOPYFLAGS := -O binary -R .note -R .comment -S 
ifeq ("$(origin SUBARCH)", "command line")

ifneq ("$(shell uname -m | sed -e s/i.86/i386/)", "$(SUBARCH)")

CFLAGS			+= $(call cc-option,-m32)

USER_CFLAGS		+= $(call cc-option,-m32)

AFLAGS			+= $(call cc-option,-m32)

LINK-y			+= $(call cc-option,-m32)

UML_OBJCOPYFLAGS	+= -F $(ELF_FORMAT)
@@ -25,7 +24,7 @@ export LDFLAGS HOSTCFLAGS HOSTLDFLAGS UML_OBJCOPYFLAGS 
endif

endif



CFLAGS += -U__$(SUBARCH)__ -U$(SUBARCH)

ARCH_KERNEL_DEFINES += -U__$(SUBARCH)__ -U$(SUBARCH)



# First of all, tune CFLAGS for the specific CPU. This actually sets cflags-y.

include $(srctree)/arch/i386/Makefile.cpu
@@ -38,4 +37,3 @@ cflags-y += $(call cc-option,-mpreferred-stack-boundary=2) 
cflags-y += -ffreestanding



CFLAGS += $(cflags-y)
 
USER_CFLAGS += $(cflags-y)

arch/um/Makefile-x86_64

+2 −2
Original line number Diff line number Diff line
@@ -8,8 +8,8 @@ _extra_flags_ = -fno-builtin -m64 


#We #undef __x86_64__ for kernelspace, not for userspace where

#it's needed for headers to work!

CFLAGS += -U__$(SUBARCH)__ $(_extra_flags_)

USER_CFLAGS += $(_extra_flags_)

ARCH_KERNEL_DEFINES = -U__$(SUBARCH)__

CFLAGS += $(_extra_flags_)



CHECKFLAGS  += -m64

AFLAGS += -m64