diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-05-03 08:30:35 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-05-03 08:30:35 -0400 |
| commit | edc4ff7c08e9885c40e60c4fb39fa42cc91a0602 (patch) | |
| tree | f375d28043dd4457428a841167dc93d760ba9a46 /arch/um/kernel/skas/Makefile | |
| parent | cbb9a56177b16294ed347ba7fcb1c66c8adb5dc4 (diff) | |
| parent | e17df688f7064dae1417ce425dd1e4b71d24d63b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/um/kernel/skas/Makefile')
| -rw-r--r-- | arch/um/kernel/skas/Makefile | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/um/kernel/skas/Makefile b/arch/um/kernel/skas/Makefile index 57181a920d48..ea3a8e409a6e 100644 --- a/arch/um/kernel/skas/Makefile +++ b/arch/um/kernel/skas/Makefile | |||
| @@ -6,9 +6,11 @@ | |||
| 6 | obj-y := clone.o exec_kern.o mem.o mmu.o process_kern.o \ | 6 | obj-y := clone.o exec_kern.o mem.o mmu.o process_kern.o \ |
| 7 | syscall.o tlb.o uaccess.o | 7 | syscall.o tlb.o uaccess.o |
| 8 | 8 | ||
| 9 | USER_OBJS := clone.o | 9 | # clone.o is in the stub, so it can't be built with profiling |
| 10 | # GCC hardened also auto-enables -fpic, but we need %ebx so it can't work -> | ||
| 11 | # disable it | ||
| 10 | 12 | ||
| 11 | include arch/um/scripts/Makefile.rules | 13 | CFLAGS_clone.o := $(CFLAGS_NO_HARDENING) |
| 14 | UNPROFILE_OBJS := clone.o | ||
| 12 | 15 | ||
| 13 | # clone.o is in the stub, so it can't be built with profiling | 16 | include arch/um/scripts/Makefile.rules |
| 14 | $(obj)/clone.o : c_flags = -Wp,-MD,$(depfile) $(call unprofile,$(USER_CFLAGS)) | ||