diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2005-08-29 16:27:10 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2005-08-29 16:27:10 +0000 |
| commit | fbe998a0b1be1f006bc72e5138fb38c188cc0433 (patch) | |
| tree | bc00ddfec68454b8987056fbc1f1ace2da2597fa /libasm | |
| parent | b0bc2788cfa2012bfbcc68cac74cd39e3f5a8085 (diff) | |
merge of 333c187506c852455e9f7be44fa9adc360416217
and 79955b942e3f0ddc71117feea5754df61edcc42a
Diffstat (limited to 'libasm')
| -rw-r--r-- | libasm/ChangeLog | 6 | ||||
| -rw-r--r-- | libasm/Makefile.am | 15 |
2 files changed, 15 insertions, 6 deletions
diff --git a/libasm/ChangeLog b/libasm/ChangeLog index 6adeef1e..d4c06348 100644 --- a/libasm/ChangeLog +++ b/libasm/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-02 Ulrich Drepper <drepper@redhat.com> * Makefile.am (AM_CFLAGS): Add -std=gnu99. diff --git a/libasm/Makefile.am b/libasm/Makefile.am index 7802a5c0..e9b99397 100644 --- a/libasm/Makefile.am +++ b/libasm/Makefile.am @@ -24,6 +24,9 @@ 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 @@ -51,16 +54,16 @@ am_libasm_pic_a_OBJECTS = $(libasm_a_SOURCES:.c=.os) libasm_so_SOURCES = libasm.so: libasm_pic.a libasm.map - $(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 + $(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 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 \ + if $(COMPILE.os) -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"; \ @@ -83,4 +86,4 @@ endif noinst_HEADERS = libasmP.h symbolhash.h EXTRA_DIST = libasm.map -CLEANFILES = $(am_libasm_pic_a_OBJECTS) +CLEANFILES = $(am_libasm_pic_a_OBJECTS) *.gcno *.gcda |