diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/ChangeLog | 12 | ||||
| -rw-r--r-- | config/eu.am | 23 |
2 files changed, 33 insertions, 2 deletions
diff --git a/config/ChangeLog b/config/ChangeLog index 0e9cc28c..1e8ad0e4 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,15 @@ +2017-05-04 Ulf Hermann <ulf.hermann@qt.io> + + * eu.am: Increase stack limit to 512k. + +2017-04-28 Ulf Hermann <ulf.hermann@qt.io> + + * eu.am: Disable textrel_check if we're not building ELF files. + +2017-04-21 Ulf Hermann <ulf.hermann@qt.io> + + * eu.am: Add $(top_srcdir)libgnu and $(top_builddir)/libgnu to -I if requested. + 2018-06-11 Mark Wielaard <mark@klomp.org> * elfutils.spec.in: Update for 0.172. diff --git a/config/eu.am b/config/eu.am index c2cc349c..3949cf0e 100644 --- a/config/eu.am +++ b/config/eu.am @@ -31,14 +31,17 @@ DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -DLOCALEDIR='"${localedir}"' AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. +if USE_GNULIB +AM_CPPFLAGS += -I$(top_srcdir)/libgnu -I$(top_builddir)/libgnu +endif # Drop the 'u' flag that automake adds by default. It is incompatible # with deterministic archives. ARFLAGS = cr -# Warn about stack usage of more than 256K = 262144 bytes. +# Warn about stack usage of more than 512K = 524288 bytes. if ADD_STACK_USAGE_WARNING -STACK_USAGE_WARNING=-Wstack-usage=262144 +STACK_USAGE_WARNING=-Wstack-usage=524288 else STACK_USAGE_WARNING= endif @@ -107,7 +110,23 @@ textrel_found = $(textrel_msg); exit 1 else textrel_found = $(textrel_msg) endif +if NATIVE_ELF textrel_check = if $(READELF) -d $@ | fgrep -q TEXTREL; then $(textrel_found); fi +else +textrel_check = +endif + +if NATIVE_PE +%.lib: %.def + case '$(host_cpu)' in \ + i?86) \ + lib /machine:x86 /def:$< ;;\ + x86_64) \ + lib /machine:x64 /def:$< ;;\ + arm) \ + lib /machine:arm /def:$< ;;\ + esac; +endif print-%: @echo $*=$($*) |