Merge libdwfl contents into libdw.so

diff --git a/ChangeLog b/ChangeLog
index 2561ca2809c717a60f2c13503bb4474e035214bb..3192cee8d6cbf990ba52def1fbc720c19120ae55 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-07-27  Roland McGrath  <roland@redhat.com>
+
+       * Makefile.am (all_SUBDIRS): Put libdwfl before libdw.
+
 2005-07-21  Roland McGrath  <roland@redhat.com>
 
        * configure.ac: Take --enable-libebl-subdir=DIR to set LIBEBL_SUBDIR.

diff --git a/Makefile.am b/Makefile.am
index 7d27a7c414a321f98e2ba1803bea98ba5a874a7b..ef24c4169660350698fad0757b17cba78bba853b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,7 @@ ACLOCAL_AMFLAGS = -I m4
 
 mini_SUBDIRS = config m4 lib libelf libelf-po
 # Add doc back when we have some real content.
-all_SUBDIRS = libebl libdw libdwfl libcpu libasm src po tests
+all_SUBDIRS = libebl libdwfl libdw libcpu libasm src po tests
 SUBDIRS = $(mini_SUBDIRS) $(all_SUBDIRS)
 
 EXTRA_DIST = elfutils.spec GPG-KEY NOTES COPYING.GPL

diff --git a/libdw/ChangeLog b/libdw/ChangeLog
index 81b928586d1c493630dda4b96bce406e533acb6c..e83094e62dcc07e123dbcc7e370c2d1e991a5610 100644 (file)
--- a/libdw/ChangeLog
+++ b/libdw/ChangeLog
@@ -1,5 +1,13 @@
 2005-07-27  Roland McGrath  <roland@redhat.com>
 
+       * ptest.c: Moved to ../tests/dwflmodtest.c.
+
+       * Makefile.am (libdw.so): Link ../libdwfl/libdwfl_pic.a in,
+       along with ../libebl/libebl.a and ../lib/libeu.a;
+       depend on ../libelf/libelf.so.
+       (libdw_so_LDADD): New variable.
+       * libdw.map: Add dwfl_* symbols formerly in ../libdwfl/libdwfl.map.
+
        * libdw.map: Define an empty base version and move all symbols to
        version ELFUTILS_0.111; don't define ELFUTILS_1.0 at all yet.
 

diff --git a/libdw/Makefile.am b/libdw/Makefile.am
index 17be31dd6540a9e122c3179980369866e6a176d2..92ca9418337a12748dc2935ea9466363fbb4cd5b 100644 (file)
--- a/libdw/Makefile.am
+++ b/libdw/Makefile.am
@@ -71,11 +71,13 @@ libdw_pic_a_SOURCES =
 am_libdw_pic_a_OBJECTS = $(libdw_a_SOURCES:.c=.os)
 
 libdw_so_SOURCES =
-libdw.so: libdw_pic.a $(srcdir)/libdw.map
-       $(CC) -shared -o $@ -Wl,--whole-archive,$<,--no-whole-archive \
-             -Wl,--version-script,$(srcdir)/libdw.map,--no-undefined \
-             -Wl,--soname,$@.$(VERSION),-z,defs \
-             ../libelf/libelf.so
+libdw.so: $(srcdir)/libdw.map libdw_pic.a \
+         ../libdwfl/libdwfl_pic.a ../libebl/libebl.a ../lib/libeu.a \
+         ../libelf/libelf.so
+       $(CC) -shared -o $@ -Wl,--soname,$@.$(VERSION),-z,defs \
+             -Wl,--version-script,$<,--no-undefined \
+             -Wl,--whole-archive $(filter-out $<,$^) -Wl,--no-whole-archive \
+             -ldl
        if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi
        ln -fs $@ $@.$(VERSION)
 

diff --git a/libdw/libdw.map b/libdw/libdw.map
index 5c713e8e35da4e3cebc47c5f7dbc139b5ffdb44a..fb4a62d17bc55992500654c4ff8d5f7169ba0384 100644 (file)
--- a/libdw/libdw.map
+++ b/libdw/libdw.map
@@ -88,6 +88,42 @@ ELFUTILS_0.111 {
     dwarf_whatattr;
     dwarf_whatform;
 
+    # libdwfl_pic.a contributes these symbols.
+    dwfl_addrdie;
+    dwfl_addrdwarf;
+    dwfl_addrmodule;
+    dwfl_begin;
+    dwfl_end;
+    dwfl_errmsg;
+    dwfl_errno;
+    dwfl_getdwarf;
+    dwfl_getmodules;
+    dwfl_getsrc;
+    dwfl_linecu;
+    dwfl_lineinfo;
+    dwfl_linemodule;
+    dwfl_linux_kernel_find_elf;
+    dwfl_linux_kernel_module_section_address;
+    dwfl_linux_kernel_report_kernel;
+    dwfl_linux_kernel_report_modules;
+    dwfl_linux_proc_find_elf;
+    dwfl_linux_proc_report;
+    dwfl_module_addrdie;
+    dwfl_module_addrname;
+    dwfl_module_getdwarf;
+    dwfl_module_getelf;
+    dwfl_module_getsrc;
+    dwfl_module_getsrc_file;
+    dwfl_module_info;
+    dwfl_module_nextcu;
+    dwfl_nextcu;
+    dwfl_report_begin;
+    dwfl_report_elf;
+    dwfl_report_end;
+    dwfl_report_module;
+    dwfl_standard_argp;
+    dwfl_standard_find_debuginfo;
+
   local:
     *;
 } ELFUTILS_0;

diff --git a/libdwfl/ChangeLog b/libdwfl/ChangeLog
index 6b9b5ed12eb38c27c54a5c1354a4baaafb437ae9..baf26f2b02c415ca9ff459091a6a65190ff87b39 100644 (file)
--- a/libdwfl/ChangeLog
+++ b/libdwfl/ChangeLog
@@ -1,5 +1,13 @@
 2005-07-28  Roland McGrath  <roland@redhat.com>
 
+       * Makefile.am (noinst_PROGRAMS): Variable removed.
+       (libdwfl_so_SOURCES, libdwfl_LIBS, libdwfl_so_LDADD): Likewise.
+       (EXTRA_DIST, ptest_LDADD, test2_LDADD): Likewise.
+       (libdwfl): Don't use libdwfl.so any more.
+       (libdwfl.so, install, uninstall): Targets removed.
+       (test2_SOURCES): Define EXTRA_DIST instead of this.
+       * libdwfl.map: File removed.
+
        * libdwfl.h: Use "" for libdw.h #include.
 
 2005-07-27  Roland McGrath  <roland@redhat.com>

diff --git a/libdwfl/Makefile.am b/libdwfl/Makefile.am
index de4507f21d9055fe7133b2c5162700c77b46e831..8fb9775d162fc8c2fcec94c48dca01d0086b30ec 100644 (file)
--- a/libdwfl/Makefile.am
+++ b/libdwfl/Makefile.am
@@ -25,14 +25,11 @@ INCLUDES = -I. -I$(srcdir) -I$(srcdir)/../libelf -I$(srcdir)/../libebl \
           -I$(srcdir)/../libdw -I.. -I$(srcdir)/../lib
 VERSION = 1
 
-noinst_PROGRAMS = ptest test2
-
-test2_SOURCES = test2.c loc2c.c
+EXTRA_DIST = test2.c loc2c.c
 
 lib_LIBRARIES = libdwfl.a
 if !MUDFLAP
 noinst_LIBRARIES = libdwfl_pic.a
-noinst_PROGRAMS += $(noinst_LIBRARIES:_pic.a=.so)
 endif
 
 euincludedir = ${includedir}/elfutils
@@ -59,7 +56,7 @@ libdw = ../libdw/libdw.a
 libelf = ../libelf/libelf.a
 libmudflap = -lmudflap
 else
-libdwfl = libdwfl.so
+libdwfl = $(libdw)
 libdw = ../libdw/libdw.so
 libelf = ../libelf/libelf.so
 endif
@@ -71,18 +68,6 @@ if !MUDFLAP
 libdwfl_pic_a_SOURCES =
 am_libdwfl_pic_a_OBJECTS = $(libdwfl_a_SOURCES:.c=.os)
 
-libdwfl_so_SOURCES =
-libdwfl_LIBS = $(libeu) $(libdw) $(libebl) $(libelf)
-libdwfl_so_LDADD = -ldl
-libdwfl.so: libdwfl_pic.a $(srcdir)/libdwfl.map $(libdwfl_LIBS)
-       $(CC) -shared -o $@ -Wl,--whole-archive,$<,--no-whole-archive \
-             -Wl,--version-script,$(srcdir)/libdwfl.map,--no-undefined \
-             -Wl,--soname,$@.$(VERSION),-z,defs \
-             $(libdwfl_LIBS) $(libdwfl_so_LDADD)
-       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)/'`$<; \
@@ -90,25 +75,8 @@ libdwfl.so: libdwfl_pic.a $(srcdir)/libdwfl.map $(libdwfl_LIBS)
             rm -f "$(DEPDIR)/$*.Tpo"; \
        else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
        fi
-
-install: install-am libdwfl.so
-       $(mkinstalldirs) $(DESTDIR)$(libdir)
-       $(INSTALL_PROGRAM) libdwfl.so $(DESTDIR)$(libdir)/libdwfl-$(PACKAGE_VERSION).so
-       ln -fs libdwfl-$(PACKAGE_VERSION).so $(DESTDIR)$(libdir)/libdwfl.so.$(VERSION)
-       ln -fs libdwfl.so.$(VERSION) $(DESTDIR)$(libdir)/libdwfl.so
-
-uninstall: uninstall-am
-       rm -f $(DESTDIR)$(libdir)/libdwfl-$(PACKAGE_VERSION).so
-       rm -f $(DESTDIR)$(libdir)/libdwfl.so.$(VERSION)
-       rm -f $(DESTDIR)$(libdir)/libdwfl.so
-       rmdir --ignore-fail-on-non-empty $(DESTDIR)$(includedir)/elfutils
 endif
 
 noinst_HEADERS = libdwflP.h loc2c.h
 
-EXTRA_DIST = libdwfl.map
-
 CLEANFILES = $(am_libdwfl_pic_a_OBJECTS)
-
-ptest_LDADD = $(libdwfl) $(libdw) $(libmudflap)
-test2_LDADD = $(libdwfl) $(libdw) $(libmudflap)

diff --git a/libdwfl/libdwfl.map b/libdwfl/libdwfl.map
deleted file mode 100644 (file)
index 6910865..0000000
--- a/libdwfl/libdwfl.map
+++ /dev/null
@@ -1,40 +0,0 @@
-ELFUTILS_1.0 {
-  global:
-    dwfl_addrdie;
-    dwfl_addrdwarf;
-    dwfl_addrmodule;
-    dwfl_begin;
-    dwfl_end;
-    dwfl_errmsg;
-    dwfl_errno;
-    dwfl_getdwarf;
-    dwfl_getmodules;
-    dwfl_getsrc;
-    dwfl_linecu;
-    dwfl_lineinfo;
-    dwfl_linemodule;
-    dwfl_linux_kernel_find_elf;
-    dwfl_linux_kernel_module_section_address;
-    dwfl_linux_kernel_report_kernel;
-    dwfl_linux_kernel_report_modules;
-    dwfl_linux_proc_find_elf;
-    dwfl_linux_proc_report;
-    dwfl_module_addrdie;
-    dwfl_module_addrname;
-    dwfl_module_getdwarf;
-    dwfl_module_getelf;
-    dwfl_module_getsrc;
-    dwfl_module_getsrc_file;
-    dwfl_module_info;
-    dwfl_module_nextcu;
-    dwfl_nextcu;
-    dwfl_report_begin;
-    dwfl_report_elf;
-    dwfl_report_end;
-    dwfl_report_module;
-    dwfl_standard_argp;
-    dwfl_standard_find_debuginfo;
-
-  local:
-    *;
-};

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 024c7c8b265961367a0bf630915f754f1d0fa127..eb15083b38f83553f90526782943079a5f18aef8 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,10 @@
+2005-07-28  Roland McGrath  <roland@redhat.com>
+
+       * dwflmodtest.c: New file, moved from ../libdwfl/ptest.c to here.
+       * Makefile.am (noinst_PROGRAMS): Add dwflmodtest.
+       (dwflmodtest_LDADD): New variable.
+       (INCLUDES): Add -I$(top_srcdir)/libdwfl here.
+
 2005-07-21  Ulrich Drepper  <drepper@redhat.com>
 
        * testfile18.bz2: New file.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 674ed570c18ed3d203ffffdcaf0d175176b048d0..5504326d482609528f91e4160e8818f09524433f 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -22,6 +22,7 @@ AM_CFLAGS = -Wall -Werror -Wextra -std=gnu99 \
 AM_LDFLAGS = -Wl,-rpath,\$$ORIGIN/../libasm:\$$ORIGIN/../libdw:\$$ORIGIN/../libebl:\$$ORIGIN/../libelf
 endif
 INCLUDES = -I$(top_srcdir)/libasm -I$(top_srcdir)/libdw \
+          -I$(top_srcdir)/libdwfl \
           -I$(top_srcdir)/libebl -I$(top_srcdir)/libelf \
           -I$(top_srcdir)/lib -I..
 
@@ -31,7 +32,7 @@ noinst_PROGRAMS = arextract arsymtest newfile saridx scnnames sectiondump \
                  get-aranges allfcts line2addr \
                  show-abbrev hash asm-tst1 asm-tst2 asm-tst3 \
                  asm-tst4 asm-tst5 asm-tst6 asm-tst7 asm-tst8 asm-tst9 \
-                 msg_tst newscn ecp
+                 msg_tst newscn ecp dwflmodtest
 # get-ciefde
 
 TESTS = run-arextract.sh run-arsymtest.sh newfile test-nlist \
@@ -109,5 +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)
 
 CLEANFILES = xxx

diff --git a/libdwfl/ptest.c b/tests/dwflmodtest.c
similarity index 100%
rename from libdwfl/ptest.c
rename to tests/dwflmodtest.c