diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2017-02-24 13:11:03 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2017-04-28 09:21:43 +0000 |
| commit | 76acde30382254f7ca51af67ea91433719080edd (patch) | |
| tree | 71564ca688cff175381ecd3e51b1c8e2507db998 /libasm | |
| parent | ffb6a77fc4f0533126a3ff49ec5c03ef8e674520 (diff) | |
Check for -z,defs, -z,relro, -fPIC, -fPIE before using them
On windows those aren't needed because the link results are no ELF
files and all code is position independent anyway. gcc then complains
about them, which is in turn caught by -Werror.
Change-Id: Ie3d600b7c430698fc3d867a986a4d48f7ad1bbec
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'libasm')
| -rw-r--r-- | libasm/ChangeLog | 4 | ||||
| -rw-r--r-- | libasm/Makefile.am | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/libasm/ChangeLog b/libasm/ChangeLog index 80aa7de9..971492a8 100644 --- a/libasm/ChangeLog +++ b/libasm/ChangeLog @@ -1,5 +1,9 @@ 2017-02-27 Ulf Hermann <ulf.hermann@qt.io> + * Makefile.am: Use dso_LDFLAGS. + +2017-02-27 Ulf Hermann <ulf.hermann@qt.io> + * disasm_str.c: Don't include system.h 2017-02-21 Ulf Hermann <ulf.hermann@qt.io> diff --git a/libasm/Makefile.am b/libasm/Makefile.am index 8713070c..a5fc9fc1 100644 --- a/libasm/Makefile.am +++ b/libasm/Makefile.am @@ -65,7 +65,7 @@ endif libasm_so_SOURCES = libasm.so$(EXEEXT): libasm_pic.a libasm.map - $(AM_V_CCLD)$(LINK) -shared -o $@ -Wl,--whole-archive,$<,--no-whole-archive \ + $(AM_V_CCLD)$(LINK) $(dso_LDFLAGS) -o $@ -Wl,--whole-archive,$<,--no-whole-archive \ -Wl,--version-script,$(srcdir)/libasm.map,--no-undefined \ -Wl,--soname,$@.$(VERSION) \ ../libebl/libebl.a ../libelf/libelf.so ../libdw/libdw.so \ |