From: Jakub Jelinek <jakub@redhat.com>
Date: Fri, 31 Jul 2009 14:26:36 +0000 (-0700)
Subject: Fix obstack* on i?86
X-Git-Tag: glibc-2.10.2~29
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=01d137496b4b6df9a92139708ce43c54dc63ba93;p=thirdparty%2Fglibc.git

Fix obstack* on i?86

obstack calls several callbacks, so on i?86 it'd better be compiled
without -mpreferred-stack-boundary=2, otherwise the callbacks are called
with misaligned stack.
(cherry picked from commit 1877ea16ca0714abd715d6ce0aa1b840c3850241)
---

diff --git a/ChangeLog b/ChangeLog
index 64b35cafebe..f3ad8d85b9a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-07-31  Jakub Jelinek  <jakub@redhat.com>
+
+	* malloc/Makefile (CFLAGS-obstack.c): Add $(uses-callbacks).
+
 2009-07-30  Ulrich Drepper  <drepper@redhat.com>
 
 	* sysdeps/ia64/backtrace.c (backtrace_helper): Stop backtrace when
diff --git a/malloc/Makefile b/malloc/Makefile
index 1099335fff2..e7ec1abf93c 100644
--- a/malloc/Makefile
+++ b/malloc/Makefile
@@ -104,6 +104,7 @@ $(objpfx)memusagestat: $(memusagestat-modules:%=$(objpfx)%.o)
 include ../Rules
 
 CFLAGS-mcheck-init.c = $(PIC-ccflag)
+CFLAGS-obstack.c = $(uses-callbacks)
 
 $(objpfx)libmcheck.a: $(objpfx)mcheck-init.o
 	-rm -f $@