From 8c3760ccfbad09caa612f25dd9ff2a10af55dd12 Mon Sep 17 00:00:00 2001
From: Andy Lutomirski <luto@MIT.EDU>
Date: Mon, 23 May 2011 09:31:29 -0400
Subject: [PATCH] --- yaml --- r: 251983 b: refs/heads/master c:
 6447facba36e3fff77ab4c68f46297a5dab024c8 h: refs/heads/master i:   251981:
 5187cd6e1d2fcac378a6cdeb334a6ba2516cb7f0   251979:
 3fb95e3861ce3a817f495cf2269667ece0991aea   251975:
 d2872de74aca0761c23c9bb6b9ed186900807691   251967:
 5b15a4bda038b88c1f66f2d8f20d4d20ab4521d1 v: v3

---
 [refs]                       |  2 +-
 trunk/arch/x86/vdso/Makefile | 15 ++++++++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ed64d25c11d7..5bb20412fbfa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 44259b1abfaa8bb819d25d41d71e8e33e25dd36a
+refs/heads/master: 6447facba36e3fff77ab4c68f46297a5dab024c8
diff --git a/trunk/arch/x86/vdso/Makefile b/trunk/arch/x86/vdso/Makefile
index a651861f7e8e..bef0bc962400 100644
--- a/trunk/arch/x86/vdso/Makefile
+++ b/trunk/arch/x86/vdso/Makefile
@@ -37,11 +37,24 @@ $(obj)/%.so: OBJCOPYFLAGS := -S
 $(obj)/%.so: $(obj)/%.so.dbg FORCE
 	$(call if_changed,objcopy)
 
+#
+# Don't omit frame pointers for ease of userspace debugging, but do
+# optimize sibling calls.
+#
 CFL := $(PROFILING) -mcmodel=small -fPIC -O2 -fasynchronous-unwind-tables -m64 \
-       $(filter -g%,$(KBUILD_CFLAGS)) $(call cc-option, -fno-stack-protector)
+       $(filter -g%,$(KBUILD_CFLAGS)) $(call cc-option, -fno-stack-protector) \
+       -fno-omit-frame-pointer -foptimize-sibling-calls
 
 $(vobjs): KBUILD_CFLAGS += $(CFL)
 
+#
+# vDSO code runs in userspace and -pg doesn't help with profiling anyway.
+#
+CFLAGS_REMOVE_vdso-note.o = -pg
+CFLAGS_REMOVE_vclock_gettime.o = -pg
+CFLAGS_REMOVE_vgetcpu.o = -pg
+CFLAGS_REMOVE_vvar.o = -pg
+
 targets += vdso-syms.lds
 obj-$(VDSO64-y)			+= vdso-syms.lds