diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2017-08-16 16:37:34 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2017-08-17 17:55:41 +0200 |
| commit | d86c13d143989a961eba149e3abfab9e3f471744 (patch) | |
| tree | c16c260c24712819cb967415ec79e58e26d3e4bf /libasm | |
| parent | 3695a1ba8dcd16459e0f35b74e88dbef48d21861 (diff) | |
| parent | 54ba4ce2973113d8f4315d4fc90e16a9b4476ea6 (diff) | |
Merge tag 'elfutils-0.170'
elfutils 0.170 release
Change-Id: I37d03645902b9f0a9fb708af1551db8843537799
Diffstat (limited to 'libasm')
| -rw-r--r-- | libasm/ChangeLog | 11 | ||||
| -rw-r--r-- | libasm/Makefile.am | 18 |
2 files changed, 21 insertions, 8 deletions
diff --git a/libasm/ChangeLog b/libasm/ChangeLog index 6759acfd..26fced38 100644 --- a/libasm/ChangeLog +++ b/libasm/ChangeLog @@ -23,6 +23,17 @@ * Makefile.am: Link libasm agaist libgnu.a if requested. +2017-02-17 Ulf Hermann <ulf.hermann@qt.io> + + * Makefile.am: Add libasm_so_DEPS to specify external libraries + that have to be linked in, and libasm_so_LIBS to specify the + archives libasm consists of. The dependencies include libeu.a. + (libasm_so_LDLIBS): Add $(libasm_so_DEPS). + (libasm_so$(EXEEXT): Use $(libasm_so_LIBS), + add --no-undefined,-z,defs,-z,relro, + drop the manual enumeration of dependencies, + specify the correct path for libasm.map. + 2017-04-27 Ulf Hermann <ulf.hermann@qt.io> * asm_end.c (binary_end): Fix nesting of braces. diff --git a/libasm/Makefile.am b/libasm/Makefile.am index d486db9b..9bb56ee5 100644 --- a/libasm/Makefile.am +++ b/libasm/Makefile.am @@ -54,13 +54,14 @@ libasm_a_SOURCES = asm_begin.c asm_abort.c asm_end.c asm_error.c \ libasm_pic_a_SOURCES = am_libasm_pic_a_OBJECTS = $(libasm_a_SOURCES:.c=.os) -libasm_so_LDLIBS = $(intl_LDADD) +libasm_so_DEPS = ../lib/libeu.a ../libebl/libebl.a ../libelf/$(libelf_BARE) ../libdw/$(libdw_BARE) +if USE_GNULIB +libasm_so_DEPS += ../libgnu/libgnu.a +endif +libasm_so_LDLIBS = $(libasm_so_DEPS) $(intl_LDADD) if USE_LOCKS libasm_so_LDLIBS += -lpthread endif -if USE_GNULIB -libasm_so_LDLIBS += ../libgnu/libgnu.a -endif if NATIVE_PE GEN_DEF = -Wl,--output-def=$(libasm_BARE:.dll=.def) CLEANFILES += $(libasm_BARE:.dll=.def) @@ -68,11 +69,12 @@ else GEN_DEF = endif -$(libasm_BARE): libasm_pic.a libasm.map - $(AM_V_CCLD)$(LINK) $(dso_LDFLAGS) -o $@ -Wl,--whole-archive,$<,--no-whole-archive \ - -Wl,--version-script,$(srcdir)/libasm.map,--no-undefined \ +libasm_so_LIBS = libasm_pic.a +$(libasm_BARE): $(srcdir)/libasm.map $(libasm_so_LIBS) $(libasm_so_DEPS) + $(AM_V_CCLD)$(LINK) $(dso_LDFLAGS) -o $@ \ -Wl,--soname,$(libasm_SONAME) $(GEN_DEF) \ - ../libebl/libebl.a ../libelf/$(libelf_BARE) ../libdw/$(libdw_BARE) \ + -Wl,--version-script,$<,--no-undefined \ + -Wl,--whole-archive $(libasm_so_LIBS) -Wl,--no-whole-archive \ $(libasm_so_LDLIBS) @$(textrel_check) $(AM_V_at)ln -fs $@ $(libasm_SONAME) |