diff options
| author | Sverker Eriksson <[email protected]> | 2016-11-11 16:26:05 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2016-11-11 16:26:05 +0100 |
| commit | fc020db74ae4a27ee0b64251a29fdf306f1f4e5d (patch) | |
| tree | 4503df262ee7098f292c824225de580185ba0513 /erts | |
| parent | cc45e36d1fb0b288ca534fa72fde772b62225e93 (diff) | |
| parent | b4c76edc46f82a4d09d9f569e1d4e6013b265389 (diff) | |
| download | otp-fc020db74ae4a27ee0b64251a29fdf306f1f4e5d.tar.gz otp-fc020db74ae4a27ee0b64251a29fdf306f1f4e5d.tar.bz2 otp-fc020db74ae4a27ee0b64251a29fdf306f1f4e5d.zip | |
Merge branch 'maint'
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/configure.in | 17 | ||||
| -rw-r--r-- | erts/emulator/Makefile.in | 7 |
2 files changed, 22 insertions, 2 deletions
diff --git a/erts/configure.in b/erts/configure.in index 4bff2ebf3d..50f8c3b429 100644 --- a/erts/configure.in +++ b/erts/configure.in @@ -2783,6 +2783,23 @@ if test "$cross_compiling" != "yes" && test X${enable_hipe} != Xno; then fi fi +dnl Check to disable -fPIE and friends for HiPE on amd64 +if test X${enable_hipe} = Xyes && test X$ARCH = Xamd64; then + AC_TRY_COMPILE(, [#if defined(__pie__) || defined(__PIE__) + #error -fPIE is enabled by default + #endif], + [AC_MSG_NOTICE([No -fPIE enabled by default])], + [AC_MSG_WARN([Security feature -fPIE will be disabled for HiPE]) + STATIC_CFLAGS="-fno-PIE $STATIC_CFLAGS" + saved_LDFLAGS=$LDFLAGS + LDFLAGS="-no-pie $LDFLAGS" + AC_TRY_LINK(,, [], + [AC_MSG_WARN([Linked does not accept option -no-pie]) + LDFLAGS=$saved_LDFLAGS])]) + +fi + + if test X${enable_fp_exceptions} = Xauto ; then case $host_os in *linux*) diff --git a/erts/emulator/Makefile.in b/erts/emulator/Makefile.in index fa4de5805e..ce50022683 100644 --- a/erts/emulator/Makefile.in +++ b/erts/emulator/Makefile.in @@ -49,6 +49,7 @@ CREATE_DIRS= LDFLAGS=@LDFLAGS@ ARFLAGS=rc OMIT_OMIT_FP=no +TYPE_LIBS= DIRTY_SCHEDULER_SUPPORT=@DIRTY_SCHEDULER_SUPPORT@ @@ -89,7 +90,7 @@ PURIFY = TYPEMARKER = .gcov TYPE_FLAGS = $(DEBUG_CFLAGS) -DERTS_GCOV -DNO_JUMP_TABLE -fprofile-arcs -ftest-coverage -O0 -DERTS_CAN_INLINE=0 -DERTS_INLINE= ifneq ($(findstring solaris,$(TARGET)),solaris) -LIBS += -lgcov +TYPE_LIBS = -lgcov endif ENABLE_ALLOC_TYPE_VARS += debug else @@ -145,6 +146,8 @@ endif endif endif +LIBS += $(TYPE_LIBS) + comma:=, space:= space+= @@ -932,7 +935,7 @@ $(OBJDIR)/%.o: hipe/%.c $(V_CC) $(subst O2,O3, $(CFLAGS)) $(INCLUDES) -c $< -o $@ $(BINDIR)/hipe_mkliterals$(TF_MARKER): $(OBJDIR)/hipe_mkliterals.o - $(ld_verbose)$(CC) $(CFLAGS) $(INCLUDES) -o $@ $< + $(ld_verbose)$(CC) $(LDFLAGS) -o $@ $< $(TYPE_LIBS) $(OBJDIR)/hipe_mkliterals.o: $(HIPE_ASM) $(TTF_DIR)/erl_alloc_types.h $(DTRACE_HEADERS) \ $(TTF_DIR)/OPCODES-GENERATED $(TARGET)/TABLES-GENERATED |