Merge all of libdwfl.a into libdw.a. libdwfl.a is not installed.

Fix building of libdwfl.  libdwfl.a must not depend on libwu.a
since the latter is not available after installation.  Add copies
of the crc32 files to libdwfl.

diff --git a/libdw/ChangeLog b/libdw/ChangeLog
index 3ec3b65caf12e3da9b41df1669a780be8a8f7326..85f12c4e9f31f47236a68ef437d63fb4f56cd900 100644 (file)
--- a/libdw/ChangeLog
+++ b/libdw/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-28  Ulrich Drepper  <drepper@redhat.com>
+
+       * Makefile.am (libdw.so): No need to link with libeu.a anymore.
+       (libdw_a_LIBADD): Add all files from libdwfl.a.
+
 2005-07-27  Roland McGrath  <roland@redhat.com>
 
        * Makefile.am (libdw.so): Link ../libdwfl/libdwfl_pic.a in,

diff --git a/libdw/Makefile.am b/libdw/Makefile.am
index 92ca9418337a12748dc2935ea9466363fbb4cd5b..097ec3a253c905efabaacad1b5fbbaebc3567050 100644 (file)
--- a/libdw/Makefile.am
+++ b/libdw/Makefile.am
@@ -72,7 +72,7 @@ am_libdw_pic_a_OBJECTS = $(libdw_a_SOURCES:.c=.os)
 
 libdw_so_SOURCES =
 libdw.so: $(srcdir)/libdw.map libdw_pic.a \
-         ../libdwfl/libdwfl_pic.a ../libebl/libebl.a ../lib/libeu.a \
+         ../libdwfl/libdwfl_pic.a ../libebl/libebl.a \
          ../libelf/libelf.so
        $(CC) -shared -o $@ -Wl,--soname,$@.$(VERSION),-z,defs \
              -Wl,--version-script,$<,--no-undefined \
@@ -81,7 +81,6 @@ libdw.so: $(srcdir)/libdw.map libdw_pic.a \
        if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi
        ln -fs $@ $@.$(VERSION)
 
-
 %.os: %.c %.o
        if $(COMPILE) -c -o $@ -fpic -DPIC -DSHARED -MT $@ -MD -MP \
           -MF "$(DEPDIR)/$*.Tpo" `test -f '$<' || echo '$(srcdir)/'`$<; \
@@ -103,6 +102,8 @@ uninstall: uninstall-am
        rmdir --ignore-fail-on-non-empty $(DESTDIR)$(includedir)/elfutils
 endif
 
+libdw_a_LIBADD = $(addprefix ../libdwfl/,$(shell $(AR) t ../libdwfl/libdwfl.a))
+
 noinst_HEADERS = libdwP.h memory-access.h dwarf_abbrev_hash.h
 
 EXTRA_DIST = libdw.map

diff --git a/libdwfl/ChangeLog b/libdwfl/ChangeLog
index 8120125a48b46b7d05b4140916ed7fd59a5353e2..398676324abab1d4fa3e19caec94fe47eb94bedc 100644 (file)
--- a/libdwfl/ChangeLog
+++ b/libdwfl/ChangeLog
@@ -1,3 +1,13 @@
+2005-07-28  Ulrich Drepper  <drepper@redhat.com>
+
+       * libdwfl_crc32.c: New file.
+       * libdwfl_crc32_file.c: New file.
+       * libdwflP.h: Declare the new functions.
+       * Makefile.am (libdwfl_a_SOURCES): Add libdwfl_crc32.c and
+       libdwfl_crc32_file.c.
+       * libdwfl/find-debuginfo.c (check_crc): Use __libdwfl_crc32_file
+       instead of crc32_file.
+
 2005-07-28  Roland McGrath  <roland@redhat.com>
 
        * ptest.c: Moved to ../tests/dwflmodtest.c.

diff --git a/libdwfl/Makefile.am b/libdwfl/Makefile.am
index 8fb9775d162fc8c2fcec94c48dca01d0086b30ec..5b52dc3ff173cc0a74c4a06a8b7f1a7d6e9c73de 100644 (file)
--- a/libdwfl/Makefile.am
+++ b/libdwfl/Makefile.am
@@ -47,6 +47,7 @@ libdwfl_a_SOURCES = dwfl_begin.c dwfl_end.c dwfl_error.c \
                    lines.c dwfl_lineinfo.c dwfl_linemodule.c \
                    dwfl_module_getsrc.c dwfl_getsrc.c \
                    dwfl_module_getsrc_file.c \
+                   libdwfl_crc32.c libdwfl_crc32_file.c \
                    elf-from-memory.c
 
 

diff --git a/libdwfl/find-debuginfo.c b/libdwfl/find-debuginfo.c
index c9e640dd106f130e8ddf6c3791509cbb2a75d870..372ece9e85bb6ef8cc91c902e5a6f857349c63ec 100644 (file)
--- a/libdwfl/find-debuginfo.c
+++ b/libdwfl/find-debuginfo.c
@@ -54,7 +54,8 @@ static inline bool
 check_crc (int fd, GElf_Word debuglink_crc)
 {
   uint32_t file_crc;
-  return crc32_file (fd, &file_crc) == 0 && file_crc == debuglink_crc;
+  return (__libdwfl_crc32_file (fd, &file_crc) == 0
+         && file_crc == debuglink_crc);
 }
 
 int

diff --git a/libdwfl/libdwflP.h b/libdwfl/libdwflP.h
index ccf6ba5ce0d3c65e3b20374fcaadaf516759c4dc..e8fb88c8cdb29a44ce027c238c0a9cac3773a115 100644 (file)
--- a/libdwfl/libdwflP.h
+++ b/libdwfl/libdwflP.h
@@ -205,6 +205,10 @@ extern Dwfl_Error __libdwfl_cu_getsrclines (struct dwfl_cu *cu)
      internal_function;
 
 
+extern uint32_t __libdwfl_crc32 (uint32_t crc, unsigned char *buf, size_t len)
+     attribute_hidden;
+extern int __libdwfl_crc32_file (int fd, uint32_t *resp) attribute_hidden;
+
 
 
 /* Avoid PLT entries.  */

diff --git a/tests/ChangeLog b/tests/ChangeLog
index eb15083b38f83553f90526782943079a5f18aef8..957bb342330ff5825a3ea61d105aae9c2179444d 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,7 @@
+2005-07-28  Ulrich Drepper  <drepper@redhat.com>
+
+       * Makefile.am (dwflmodtest_LDADD): Add $(libebl).
+
 2005-07-28  Roland McGrath  <roland@redhat.com>
 
        * dwflmodtest.c: New file, moved from ../libdwfl/ptest.c to here.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5504326d482609528f91e4160e8818f09524433f..5560d6eed273aed49684468c4dafc6297716a175 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -110,6 +110,6 @@ asm_tst6_LDADD = $(libasm) $(libebl) $(libelf) $(libmudflap)
 asm_tst7_LDADD = $(libasm) $(libebl) $(libelf) $(libmudflap)
 asm_tst8_LDADD = $(libasm) $(libebl) $(libelf) $(libmudflap)
 asm_tst9_LDADD = $(libasm) $(libebl) $(libelf) $(libmudflap)
-dwflmodtest_LDADD = $(libdw) $(libelf) $(libmudflap)
+dwflmodtest_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap)
 
 CLEANFILES = xxx