From 5fe6cc572617afa67ead1b668d7a1c966dc7f37f Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@redhat.com>
Date: Mon, 14 Apr 2008 12:19:30 -0700
Subject: [PATCH] --- yaml --- r: 90990 b: refs/heads/master c:
 8705a49c35be088a50b8d5fc5e1aa24d6711fd5b h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 8044aad4b0b7..7c665f78a9d0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2adee9b30d1382fba97825b9c50e4f50a0117c36
+refs/heads/master: 8705a49c35be088a50b8d5fc5e1aa24d6711fd5b
diff --git a/trunk/arch/x86/vdso/Makefile b/trunk/arch/x86/vdso/Makefile
index 17a6b057856b..b7ad9f89d21f 100644
--- a/trunk/arch/x86/vdso/Makefile
+++ b/trunk/arch/x86/vdso/Makefile
@@ -37,7 +37,8 @@ $(obj)/%.so: OBJCOPYFLAGS := -S
 $(obj)/%.so: $(obj)/%.so.dbg FORCE
 	$(call if_changed,objcopy)
 
-CFL := $(PROFILING) -mcmodel=small -fPIC -g0 -O2 -fasynchronous-unwind-tables -m64
+CFL := $(PROFILING) -mcmodel=small -fPIC -O2 -fasynchronous-unwind-tables -m64 \
+       $(filter -g%,$(KBUILD_CFLAGS))
 
 $(vobjs): KBUILD_CFLAGS += $(CFL)