merge of 333c187506c852455e9f7be44fa9adc360416217
and 79955b942e3f0ddc71117feea5754df61edcc42a
diff --git a/libdw/ChangeLog b/libdw/ChangeLog
index fcae442..db069c9 100644
--- a/libdw/ChangeLog
+++ b/libdw/ChangeLog
@@ -1,3 +1,9 @@
+2005-08-28 Ulrich Drepper <drepper@redhat.com>
+
+ * Makefile.am: Use $(LINK) not $(CC) when creating DSO.
+ (%.os): Use COMPILE.os.
+ (COMPILE.os): Filter out gconv options.
+
2005-08-27 Roland McGrath <roland@redhat.com>
* dwarf_getscopes.c (dwarf_getscopes): Rewritten using