summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndi Kleen <ak@suse.de>2007-07-22 23:13:11 +0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-22 23:43:28 +0400
commit037e20a3c5c206efdf63f1b45c8b082fc57253d2 (patch)
tree9f0f0e9c22a44c705fe601bc12b5a71c4567576e
parentb053c204edbc82b068fe8cfc809b7f90b885fae0 (diff)
downloadlinux-037e20a3c5c206efdf63f1b45c8b082fc57253d2.tar.xz
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 <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--arch/x86_64/vdso/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86_64/vdso/Makefile b/arch/x86_64/vdso/Makefile
index faaa72fb250c..8d03de029d9b 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