diff options
author | Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> | 2006-05-01 15:16:05 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-01 21:17:45 -0400 |
commit | 7b12b9137930eb821b68e1bfa11e9de692208620 (patch) | |
tree | e2bfd312a5f2dd5665f2a834af679148bb1718d3 /arch/um/sys-x86_64 | |
parent | 275e6e1ee2bafde77e9390b27e876fa83f24cb60 (diff) |
[PATCH] uml: cleanup unprofile expression and build infrastructure
*) 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>
Diffstat (limited to 'arch/um/sys-x86_64')
-rw-r--r-- | arch/um/sys-x86_64/Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/um/sys-x86_64/Makefile b/arch/um/sys-x86_64/Makefile index 6d3b29c74533..c19794d435d6 100644 --- a/arch/um/sys-x86_64/Makefile +++ b/arch/um/sys-x86_64/Makefile | |||
@@ -16,16 +16,16 @@ subarch-obj-$(CONFIG_MODULES) += kernel/module.o | |||
16 | 16 | ||
17 | ldt-y = ../sys-i386/ldt.o | 17 | ldt-y = ../sys-i386/ldt.o |
18 | 18 | ||
19 | USER_OBJS := ptrace_user.o sigcontext.o stub_segv.o | 19 | USER_OBJS := ptrace_user.o sigcontext.o |
20 | 20 | ||
21 | USER_OBJS += user-offsets.s | 21 | USER_OBJS += user-offsets.s |
22 | extra-y += user-offsets.s | 22 | extra-y += user-offsets.s |
23 | 23 | ||
24 | CFLAGS_stub_segv.o := $(CFLAGS_NO_HARDENING) | ||
25 | |||
26 | extra-$(CONFIG_MODE_TT) += unmap.o | 24 | extra-$(CONFIG_MODE_TT) += unmap.o |
27 | 25 | ||
26 | UNPROFILE_OBJS := stub_segv.o | ||
27 | CFLAGS_stub_segv.o := $(CFLAGS_NO_HARDENING) | ||
28 | |||
28 | include arch/um/scripts/Makefile.rules | 29 | include arch/um/scripts/Makefile.rules |
29 | 30 | ||
30 | $(obj)/stub_segv.o $(obj)/unmap.o: \ | 31 | $(obj)/unmap.%: _c_flags = $(call unprofile,$(CFLAGS)) |
31 | _c_flags = $(call unprofile,$(CFLAGS)) | ||