Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 037e20a3 authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds
Browse files

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: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b053c204

arch/x86_64/vdso/Makefile

+3 −3
Original line number Original line Diff line number Diff line
@@ -32,10 +32,10 @@ $(obj)/vdso.o: $(src)/vdso.S $(obj)/vdso.so 
$(obj)/vdso.so: $(src)/vdso.lds $(vobjs) FORCE

$(obj)/vdso.so: $(src)/vdso.lds $(vobjs) FORCE

	$(call if_changed,syscall)

	$(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)/vclock_gettime.o: CFLAGS = $(CFL)

$(obj)/vgetcpu.o: CFLAGS = $(CF)

$(obj)/vgetcpu.o: CFLAGS = $(CFL)





# We also create a special relocatable object that should mirror the symbol

# 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

# table and layout of the linked DSO.  With ld -R we can then refer to