diff options
author | Roland McGrath <roland@redhat.com> | 2005-08-25 01:49:35 +0000 |
---|---|---|
committer | Roland McGrath <roland@redhat.com> | 2005-08-25 01:49:35 +0000 |
commit | 4c305da9de0ecfe9af64cb6787b2b4b8a6aa8dd5 (patch) | |
tree | aeba7918420be8f6c080f902529a482993388e5f /libasm | |
parent | 6830bc40bb6a38dee917bebc856c7c1ba5126e24 (diff) |
2005-08-24 Roland McGrath <roland@redhat.com>
* line2addr.c (print_address): Omit () for DSOs.
Diffstat (limited to 'libasm')
-rw-r--r-- | libasm/ChangeLog | 6 | ||||
-rw-r--r-- | libasm/Makefile.am | 15 |
2 files changed, 6 insertions, 15 deletions
diff --git a/libasm/ChangeLog b/libasm/ChangeLog index d4c06348..6adeef1e 100644 --- a/libasm/ChangeLog +++ b/libasm/ChangeLog @@ -1,9 +1,3 @@ -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-02 Ulrich Drepper <drepper@redhat.com> * Makefile.am (AM_CFLAGS): Add -std=gnu99. diff --git a/libasm/Makefile.am b/libasm/Makefile.am index e9b99397..7802a5c0 100644 --- a/libasm/Makefile.am +++ b/libasm/Makefile.am @@ -24,9 +24,6 @@ INCLUDES = -I. -I$(srcdir) -I.. -I$(top_srcdir)/libelf -I$(top_srcdir)/libebl \ GCC_INCLUDE = -I$(shell $(CC) -print-file-name=include) VERSION = 1 -COMPILE.os = $(filter-out -fprofile-arcs, $(filter-out -ftest-coverage, \ - $(COMPILE))) - lib_LIBRARIES = libasm.a if !MUDFLAP noinst_LIBRARIES = libasm_pic.a @@ -54,16 +51,16 @@ am_libasm_pic_a_OBJECTS = $(libasm_a_SOURCES:.c=.os) libasm_so_SOURCES = libasm.so: libasm_pic.a libasm.map - $(LINK) -shared -o $@ -Wl,--whole-archive,$<,--no-whole-archive \ - -Wl,--version-script,$(srcdir)/libasm.map,--no-undefined \ - -Wl,--soname,$@.$(VERSION) \ - ../libebl/libebl.a ../libelf/libelf.so + $(CC) -shared -o $@ -Wl,--whole-archive,$<,--no-whole-archive \ + -Wl,--version-script,$(srcdir)/libasm.map,--no-undefined \ + -Wl,--soname,$@.$(VERSION) \ + ../libebl/libebl.a ../libelf/libelf.so if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi ln -fs $@ $@.$(VERSION) %.os: %.c %.o - if $(COMPILE.os) -c -o $@ -fpic -DPIC -DSHARED -MT $@ -MD -MP \ + if $(COMPILE) -c -o $@ -fpic -DPIC -DSHARED -MT $@ -MD -MP \ -MF "$(DEPDIR)/$*.Tpo" `test -f '$<' || echo '$(srcdir)/'`$<; \ then cat "$(DEPDIR)/$*.Tpo" >> "$(DEPDIR)/$*.Po"; \ rm -f "$(DEPDIR)/$*.Tpo"; \ @@ -86,4 +83,4 @@ endif noinst_HEADERS = libasmP.h symbolhash.h EXTRA_DIST = libasm.map -CLEANFILES = $(am_libasm_pic_a_OBJECTS) *.gcno *.gcda +CLEANFILES = $(am_libasm_pic_a_OBJECTS) |