From: Andi Kleen Date: Sun, 22 Jul 2007 19:13:11 +0000 (+0200) Subject: x86_64: Rename CF Makefile variable in vdso X-Git-Tag: v2.6.23-rc1~1 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=037e20a3c5c206efdf63f1b45c8b082fc57253d2;p=linux-2.6-omap-h63xx.git x86_64: Rename CF Makefile variable in vdso This avoids a conflict with sparse builds. Reported by Alexey Dobriyan, fix suggested by Al Viro Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds --- diff --git a/arch/x86_64/vdso/Makefile b/arch/x86_64/vdso/Makefile index faaa72fb250..8d03de029d9 100644 --- a/arch/x86_64/vdso/Makefile +++ b/arch/x86_64/vdso/Makefile @@ -32,10 +32,10 @@ $(obj)/vdso.o: $(src)/vdso.S $(obj)/vdso.so $(obj)/vdso.so: $(src)/vdso.lds $(vobjs) FORCE $(call if_changed,syscall) -CF := $(PROFILING) -mcmodel=small -fPIC -g0 -O2 -fasynchronous-unwind-tables -m64 +CFL := $(PROFILING) -mcmodel=small -fPIC -g0 -O2 -fasynchronous-unwind-tables -m64 -$(obj)/vclock_gettime.o: CFLAGS = $(CF) -$(obj)/vgetcpu.o: CFLAGS = $(CF) +$(obj)/vclock_gettime.o: CFLAGS = $(CFL) +$(obj)/vgetcpu.o: CFLAGS = $(CFL) # We also create a special relocatable object that should mirror the symbol # table and layout of the linked DSO. With ld -R we can then refer to