forked from Minki/linux
7b12b91379
*) Rather than duplicate in various buggy ways the application of CFLAGS_NO_HARDENING and UNPROFILE (which apply to the same files), centralize it in Makefile.rules. UNPROFILE_OBJS mustn't be listed in USER_OBJS but are compiled as such. I've also verified that unprofile didn't work in the current form, because we set _c_flags directly (using CFLAGS and not USER_CFLAGS, which is wrong), which is normally used by c_flags, but we also override c_flags for all USER_OBJS, and there we don't call unprofile. Instead it only worked for unmap.o, the only one which wasn't a USER_OBJ. We need to set c_flags (which is not a public Kbuild API) to clear a lot of compilation flags like -nostdinc which Kbuild forces on everything. *) Rather than $(CFLAGS_$(notdir $@)), which expands to CFLAGS_anObj.s when building "anObj.s", use $(CFLAGS_$(*F).o) which always accesses CFLAGS_anObj.o, like done by Kbuild. *) Make c_flags apply to all targets having the same basename, rather than listing .s, .i, .lst and .o, with the use (which I tested) of $(USER_OBJS:.o=.%): c_flags = ... and of - $(obj)/unmap.c: _c_flags = ... + $(obj)/unmap.%: _c_flags = ... Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Acked-by: Jeff Dike <jdike@addtoit.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
33 lines
1.2 KiB
Makefile
33 lines
1.2 KiB
Makefile
# ===========================================================================
|
|
# arch/um: Generic definitions
|
|
# ===========================================================================
|
|
|
|
USER_SINGLE_OBJS := \
|
|
$(foreach f,$(patsubst %.o,%,$(obj-y) $(obj-m)),$($(f)-objs))
|
|
USER_OBJS += $(filter %_user.o,$(obj-y) $(obj-m) $(USER_SINGLE_OBJS))
|
|
USER_OBJS := $(foreach file,$(USER_OBJS),$(obj)/$(file))
|
|
|
|
$(USER_OBJS:.o=.%): \
|
|
c_flags = -Wp,-MD,$(depfile) $(USER_CFLAGS) $(CFLAGS_$(*F).o)
|
|
$(USER_OBJS) : CHECKFLAGS := -D__linux__ -Dlinux -D__STDC__ \
|
|
-Dunix -D__unix__ -D__$(SUBARCH)__
|
|
|
|
# These are like USER_OBJS but filter USER_CFLAGS through unprofile instead of
|
|
# using it directly.
|
|
UNPROFILE_OBJS := $(foreach file,$(UNPROFILE_OBJS),$(obj)/$(file))
|
|
|
|
$(UNPROFILE_OBJS:.o=.%): \
|
|
c_flags = -Wp,-MD,$(depfile) $(call unprofile,$(USER_CFLAGS)) $(CFLAGS_$(*F).o)
|
|
$(UNPROFILE_OBJS) : CHECKFLAGS := -D__linux__ -Dlinux -D__STDC__ \
|
|
-Dunix -D__unix__ -D__$(SUBARCH)__
|
|
|
|
# The stubs and unmap.o can't try to call mcount or update basic block data
|
|
define unprofile
|
|
$(patsubst -pg,,$(patsubst -fprofile-arcs -ftest-coverage,,$(1)))
|
|
endef
|
|
|
|
ifdef subarch-obj-y
|
|
obj-y += subarch.o
|
|
subarch-y = $(addprefix ../../$(SUBARCH)/,$(subarch-obj-y))
|
|
endif
|