summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--dlfcn/Makefile2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 256931358b..4c72197ccf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-07-28  Ulrich Drepper  <drepper@redhat.com>
+
+	* dlfcn/Makefile (LDLIBS-bug-atexit3-lib.so): Use this instead of
+	LDFLAGS.  Add -lgcc_eh and libc_nonshared (again) to make sure we
+	get the __stack_chk_fail_local definition when it's needed.
+
 2006-07-26  Ulrich Drepper  <drepper@redhat.com>
 
 	* dlfcn/Makefile: Add rules to build and run bug-atexit3.
diff --git a/dlfcn/Makefile b/dlfcn/Makefile
index f2ef2f72a3..649f61de63 100644
--- a/dlfcn/Makefile
+++ b/dlfcn/Makefile
@@ -136,7 +136,7 @@ $(objpfx)bug-atexit2.out: $(objpfx)bug-atexit2-lib.so
 $(objpfx)bug-atexit2-lib.so: $(common-objpfx)libc.so \
 			     $(common-objpfx)libc_nonshared.a
 
-LDFLAGS-bug-atexit3-lib.so = -lstdc++
+LDLIBS-bug-atexit3-lib.so = -lstdc++ -lgcc_eh $(common-objpfx)libc_nonshared.a
 $(objpfx)bug-atexit3: $(libdl)
 $(objpfx)bug-atexit3.out: $(objpfx)bug-atexit3-lib.so
 $(objpfx)bug-atexit3-lib.so: $(common-objpfx)libc.so \