about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2009-07-31 07:26:36 -0700
committerPetr Baudis <pasky@suse.cz>2009-09-18 16:51:52 +0200
commit01d137496b4b6df9a92139708ce43c54dc63ba93 (patch)
treedc6ec6d55c496d527c019c0ea03be4d5a92ab3a9
parentb1cc14cb09c03318a0c1ce2a29519999fde7b7c0 (diff)
downloadglibc-01d137496b4b6df9a92139708ce43c54dc63ba93.tar.gz
glibc-01d137496b4b6df9a92139708ce43c54dc63ba93.tar.xz
glibc-01d137496b4b6df9a92139708ce43c54dc63ba93.zip
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)
-rw-r--r--ChangeLog4
-rw-r--r--malloc/Makefile1
2 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 64b35cafeb..f3ad8d85b9 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 1099335fff..e7ec1abf93 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 $@