diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-05-12 16:48:52 +0200 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-05-12 16:48:52 +0200 |
| commit | 7d63b54a65ce902f9aaa8efe8192aa3b983264d4 (patch) | |
| tree | 250a77bebe92cbd6edac70a649866044295876db /arch/um/sys-x86_64/Makefile | |
| parent | [GFS2] Readpages support (diff) | |
| parent | Linux v2.6.17-rc4 (diff) | |
| download | linux-7d63b54a65ce902f9aaa8efe8192aa3b983264d4.tar.xz linux-7d63b54a65ce902f9aaa8efe8192aa3b983264d4.zip | |
Merge branch 'master'
Diffstat (limited to 'arch/um/sys-x86_64/Makefile')
| -rw-r--r-- | arch/um/sys-x86_64/Makefile | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/arch/um/sys-x86_64/Makefile b/arch/um/sys-x86_64/Makefile index b5fc22babddf..c19794d435d6 100644 --- a/arch/um/sys-x86_64/Makefile +++ b/arch/um/sys-x86_64/Makefile @@ -16,11 +16,16 @@ subarch-obj-$(CONFIG_MODULES) += kernel/module.o ldt-y = ../sys-i386/ldt.o -USER_OBJS := ptrace_user.o sigcontext.o stub_segv.o +USER_OBJS := ptrace_user.o sigcontext.o -include arch/um/scripts/Makefile.rules +USER_OBJS += user-offsets.s +extra-y += user-offsets.s extra-$(CONFIG_MODE_TT) += unmap.o -$(obj)/stub_segv.o $(obj)/unmap.o: \ - _c_flags = $(call unprofile,$(CFLAGS)) +UNPROFILE_OBJS := stub_segv.o +CFLAGS_stub_segv.o := $(CFLAGS_NO_HARDENING) + +include arch/um/scripts/Makefile.rules + +$(obj)/unmap.%: _c_flags = $(call unprofile,$(CFLAGS)) |