aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndi Kleen <ak@suse.de>2007-07-22 15:13:11 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-22 15:43:28 -0400
commit037e20a3c5c206efdf63f1b45c8b082fc57253d2 (patch)
tree9f0f0e9c22a44c705fe601bc12b5a71c4567576e
parentb053c204edbc82b068fe8cfc809b7f90b885fae0 (diff)
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
32$(obj)/vdso.so: $(src)/vdso.lds $(vobjs) FORCE 32$(obj)/vdso.so: $(src)/vdso.lds $(vobjs) FORCE
33 $(call if_changed,syscall) 33 $(call if_changed,syscall)
34 34
35CF := $(PROFILING) -mcmodel=small -fPIC -g0 -O2 -fasynchronous-unwind-tables -m64 35CFL := $(PROFILING) -mcmodel=small -fPIC -g0 -O2 -fasynchronous-unwind-tables -m64
36 36
37$(obj)/vclock_gettime.o: CFLAGS = $(CF) 37$(obj)/vclock_gettime.o: CFLAGS = $(CFL)
38$(obj)/vgetcpu.o: CFLAGS = $(CF) 38$(obj)/vgetcpu.o: CFLAGS = $(CFL)
39 39
40# We also create a special relocatable object that should mirror the symbol 40# We also create a special relocatable object that should mirror the symbol
41# table and layout of the linked DSO. With ld -R we can then refer to 41# table and layout of the linked DSO. With ld -R we can then refer to