View | Details | Raw Unified | Return to bug 203394 | Differences between
and this patch

Collapse All | Expand All

(-)share/mk/bsd.sys.mk (-1 / +1 lines)
Lines 149-155 Link Here
149
.if ${MK_SSP} != "no" && \
149
.if ${MK_SSP} != "no" && \
150
    ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips"
150
    ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips"
151
# Don't use -Wstack-protector as it breaks world with -Werror.
151
# Don't use -Wstack-protector as it breaks world with -Werror.
152
SSP_CFLAGS?=	-fstack-protector
152
SSP_CFLAGS?=	-fstack-protector-strong
153
CFLAGS+=	${SSP_CFLAGS}
153
CFLAGS+=	${SSP_CFLAGS}
154
.endif # SSP && !ARM && !MIPS
154
.endif # SSP && !ARM && !MIPS
155
155
(-)contrib/binutils/ld/emultempl/elf32.em (+1 lines)
Lines 97-102 Link Here
97
  ldfile_set_output_arch ("${OUTPUT_ARCH}", bfd_arch_`echo ${ARCH} | sed -e 's/:.*//'`);
97
  ldfile_set_output_arch ("${OUTPUT_ARCH}", bfd_arch_`echo ${ARCH} | sed -e 's/:.*//'`);
98
  config.dynamic_link = ${DYNAMIC_LINK-TRUE};
98
  config.dynamic_link = ${DYNAMIC_LINK-TRUE};
99
  config.has_shared = `if test -n "$GENERATE_SHLIB_SCRIPT" ; then echo TRUE ; else echo FALSE ; fi`;
99
  config.has_shared = `if test -n "$GENERATE_SHLIB_SCRIPT" ; then echo TRUE ; else echo FALSE ; fi`;
100
  link_info.relro = TRUE;
100
}
101
}
101
102
102
EOF
103
EOF

Return to bug 203394