+2015-09-24 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
+
+ * configure.ac (gcc_cv_ld_pie): Check for gld >= 2.26 on Solaris.
+ Check for ld -type pie on Solaris 11.x and 12.
+ * configure: Regenerate.
+ * config.in: Regenerate.
+
+ * gcc.c (LD_PIE_SPEC): Allow redefinition.
+
+ * config/sol2.h (STARTFILE_CRTBEGIN_SPEC): Define.
+ (STARTFILE_SPEC): Use it.
+ (ENDFILE_CRTEND_SPEC): Define.
+ (ENDFILE_SPEC): Use it and ENDFILE_ARCH_SPEC.
+ (SUBTARGET_EXTRA_SPECS): Add STARTFILE_CRTBEGIN_SPEC,
+ ENDFILE_ARCH_SPEC, ENDFILE_CRTEND_SPEC.
+ [HAVE_LD_PIE && HAVE_SOLARIS_CRTS] (LD_PIE_SPEC): Define.
+ (!(HAVE_LD_PIE && HAVE_SOLARIS_CRTS)] (LINK_PIE_SPEC): Define.
+ * config/i386/sol2.h (ENDFILE_SPEC): Remove.
+ (ENDFILE_ARCH_SPEC): Define.
+ * config/sparc/sol2.h (ENDFILE_ARCH_SPEC): Define.
+
2015-09-24 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
* configure.ac (gcc_cv_solaris_crts): New test.
#endif
-/* Define if your linker supports -pie option. */
+/* Define if your linker supports PIE option. */
#ifndef USED_FOR_TARGET
#undef HAVE_LD_PIE
#endif
#endif
#endif
-#undef ENDFILE_SPEC
-#define ENDFILE_SPEC \
- "%{Ofast|ffast-math|funsafe-math-optimizations:crtfastmath.o%s} \
- %{mpc32:crtprec32.o%s} \
+#define ENDFILE_ARCH_SPEC \
+ "%{mpc32:crtprec32.o%s} \
%{mpc64:crtprec64.o%s} \
- %{mpc80:crtprec80.o%s} \
- crtend.o%s crtn.o%s"
+ %{mpc80:crtprec80.o%s}"
#define SUBTARGET_CPU_EXTRA_SPECS \
{ "cpp_subtarget", CPP_SUBTARGET_SPEC }, \
#define STARTFILE_ARCH_SPEC "%{ansi:values-Xc.o%s} \
%{!ansi:values-Xa.o%s}"
+#if defined(HAVE_LD_PIE) && defined(HAVE_SOLARIS_CRTS)
+#define STARTFILE_CRTBEGIN_SPEC "%{shared:crtbeginS.o%s} \
+ %{" PIE_SPEC ":crtbeginS.o%s} \
+ %{" NO_PIE_SPEC ":crtbegin.o%s}"
+#else
+#define STARTFILE_CRTBEGIN_SPEC "crtbegin.o%s"
+#endif
+
/* We don't use the standard svr4 STARTFILE_SPEC because it's wrong for us. */
#undef STARTFILE_SPEC
#ifdef HAVE_SOLARIS_CRTS
%{p:%e-p is not supported; \
pg:crtpg.o%s gmon.o%s; \
:crtp.o%s}}} \
- crti.o%s %(startfile_arch) \
- crtbegin.o%s"
+ crti.o%s %(startfile_arch) %(startfile_crtbegin)"
#else
#define STARTFILE_SPEC "%{!shared:%{!symbolic: \
%{p:mcrt1.o%s; \
pg:gcrt1.o%s gmon.o%s; \
:crt1.o%s}}} \
- crti.o%s %(startfile_arch) \
- crtbegin.o%s"
+ crti.o%s %(startfile_arch) %(startfile_crtbegin)"
+#endif
+
+#if defined(HAVE_LD_PIE) && defined(HAVE_SOLARIS_CRTS)
+#define ENDFILE_CRTEND_SPEC "%{shared:crtendS.o%s;: \
+ %{" PIE_SPEC ":crtendS.o%s} \
+ %{" NO_PIE_SPEC ":crtend.o%s}}"
+#else
+#define ENDFILE_CRTEND_SPEC "crtend.o%s"
#endif
#undef ENDFILE_SPEC
#define ENDFILE_SPEC \
"%{Ofast|ffast-math|funsafe-math-optimizations:crtfastmath.o%s} \
- crtend.o%s crtn.o%s"
+ %(endfile_arch) %(endfile_crtend) crtn.o%s"
#undef LINK_ARCH32_SPEC_BASE
#define LINK_ARCH32_SPEC_BASE \
#undef SUBTARGET_EXTRA_SPECS
#define SUBTARGET_EXTRA_SPECS \
- { "startfile_arch", STARTFILE_ARCH_SPEC }, \
- { "link_arch32", LINK_ARCH32_SPEC }, \
- { "link_arch64", LINK_ARCH64_SPEC }, \
- { "link_arch_default", LINK_ARCH_DEFAULT_SPEC }, \
- { "link_arch", LINK_ARCH_SPEC }, \
+ { "startfile_arch", STARTFILE_ARCH_SPEC }, \
+ { "startfile_crtbegin", STARTFILE_CRTBEGIN_SPEC }, \
+ { "link_arch32", LINK_ARCH32_SPEC }, \
+ { "link_arch64", LINK_ARCH64_SPEC }, \
+ { "link_arch_default", LINK_ARCH_DEFAULT_SPEC }, \
+ { "link_arch", LINK_ARCH_SPEC }, \
+ { "endfile_arch", ENDFILE_ARCH_SPEC }, \
+ { "endfile_crtend", ENDFILE_CRTEND_SPEC }, \
SUBTARGET_CPU_EXTRA_SPECS
/* C++11 programs need -lrt for nanosleep. */
#endif /* HAVE_LD_EH_FRAME && TARGET_DL_ITERATE_PHDR */
#endif
+#if defined(HAVE_LD_PIE) && defined(HAVE_SOLARIS_CRTS)
+#ifdef USE_GLD
+/* Assert -z text by default to match Solaris ld. */
+#define LD_PIE_SPEC "-pie %{!mimpure-text:-z text}"
+#else
+/* Solaris ld needs -z type=pie instead of -pie. */
+#define LD_PIE_SPEC "-z type=pie %{mimpure-text:-z textoff}"
+#endif
+#else
+/* Error out if some part of PIE support is missing. */
+#define LINK_PIE_SPEC \
+ "%{no-pie:} %{pie:%e-pie is not supported in this configuration} "
+#endif
+
/* collect2.c can only parse GNU nm -n output. Solaris nm needs -png to
produce the same format. */
#define NM_FLAGS "-png"
#define SUBTARGET_CPU_EXTRA_SPECS
+#define ENDFILE_ARCH_SPEC ""
+
\f
/* Register the Solaris-specific #pragma directives. */
$as_echo_n "checking linker position independent executable support... " >&6; }
gcc_cv_ld_pie=no
if test $in_tree_ld = yes ; then
- if test "$gcc_cv_gld_major_version" -eq 2 -a "$gcc_cv_gld_minor_version" -ge 15 -o "$gcc_cv_gld_major_version" -gt 2 \
+ case "$target" in
+ # Full PIE support on Solaris was only introduced in gld 2.26.
+ *-*-solaris2*) gcc_gld_pie_min_version=26 ;;
+ *) gcc_gld_pie_min_version=15 ;;
+ esac
+ if test "$gcc_cv_gld_major_version" -eq 2 -a "$gcc_cv_gld_minor_version" -ge "$gcc_gld_pie_min_version" -o "$gcc_cv_gld_major_version" -gt 2 \
&& test $in_tree_ld_is_elf = yes; then
gcc_cv_ld_pie=yes
fi
elif test x$gcc_cv_ld != x; then
- # Check if linker supports -pie option
- if $gcc_cv_ld --help 2>/dev/null | grep -- -pie > /dev/null; then
- gcc_cv_ld_pie=yes
+ # Check if linker supports -pie option
+ if $gcc_cv_ld --help 2>/dev/null | grep -- -pie > /dev/null; then
+ gcc_cv_ld_pie=yes
+ case "$target" in
+ *-*-solaris2*)
+ if echo "$ld_ver" | grep GNU > /dev/null \
+ && test "$ld_vers_major" -eq 2 -a "$ld_vers_minor" -lt 26; then
+ gcc_cv_ld_pie=no
fi
+ ;;
+ esac
+ else
+ case "$target" in
+ *-*-solaris2.1[1-9]*)
+ # Solaris 11.x and Solaris 12 added PIE support.
+ if $gcc_cv_ld -z help 2>&1 | grep -- type.*pie > /dev/null; then
+ gcc_cv_ld_pie=yes
+ fi
+ ;;
+ esac
+ fi
fi
if test x"$gcc_cv_ld_pie" = xyes; then
AC_MSG_CHECKING(linker position independent executable support)
gcc_cv_ld_pie=no
if test $in_tree_ld = yes ; then
- if test "$gcc_cv_gld_major_version" -eq 2 -a "$gcc_cv_gld_minor_version" -ge 15 -o "$gcc_cv_gld_major_version" -gt 2 \
+ case "$target" in
+ # Full PIE support on Solaris was only introduced in gld 2.26.
+ *-*-solaris2*) gcc_gld_pie_min_version=26 ;;
+ *) gcc_gld_pie_min_version=15 ;;
+ esac
+ if test "$gcc_cv_gld_major_version" -eq 2 -a "$gcc_cv_gld_minor_version" -ge "$gcc_gld_pie_min_version" -o "$gcc_cv_gld_major_version" -gt 2 \
&& test $in_tree_ld_is_elf = yes; then
gcc_cv_ld_pie=yes
fi
elif test x$gcc_cv_ld != x; then
- # Check if linker supports -pie option
- if $gcc_cv_ld --help 2>/dev/null | grep -- -pie > /dev/null; then
- gcc_cv_ld_pie=yes
+ # Check if linker supports -pie option
+ if $gcc_cv_ld --help 2>/dev/null | grep -- -pie > /dev/null; then
+ gcc_cv_ld_pie=yes
+ case "$target" in
+ *-*-solaris2*)
+ if echo "$ld_ver" | grep GNU > /dev/null \
+ && test "$ld_vers_major" -eq 2 -a "$ld_vers_minor" -lt 26; then
+ gcc_cv_ld_pie=no
fi
+ ;;
+ esac
+ else
+ case "$target" in
+ *-*-solaris2.1[[1-9]]*)
+ # Solaris 11.x and Solaris 12 added PIE support.
+ if $gcc_cv_ld -z help 2>&1 | grep -- type.*pie > /dev/null; then
+ gcc_cv_ld_pie=yes
+ fi
+ ;;
+ esac
+ fi
fi
if test x"$gcc_cv_ld_pie" = xyes; then
AC_DEFINE(HAVE_LD_PIE, 1,
-[Define if your linker supports -pie option.])
+[Define if your linker supports PIE option.])
fi
AC_MSG_RESULT($gcc_cv_ld_pie)
#ifndef LINK_PIE_SPEC
#ifdef HAVE_LD_PIE
+#ifndef LD_PIE_SPEC
#define LD_PIE_SPEC "-pie"
+#endif
#else
#define LD_PIE_SPEC ""
#endif
+2015-09-24 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
+
+ * lib/target-supports.exp (check_effective_target_pie): Check for
+ PIE support on Solaris 11.x and 12.
+
2015-09-24 Richard Biener <rguenther@suse.de>
* g++.dg/tree-ssa/restrict3.C: New testcase.
|| [istarget *-*-gnu*] } {
return 1;
}
+ if { [istarget *-*-solaris2.1\[1-9\]*] } {
+ # Full PIE support was added in Solaris 11.x and Solaris 12, but gcc
+ # errors out if missing, so check for that.
+ return [check_no_compiler_messages pie executable {
+ int main (void) { return 0; }
+ } "-pie -fpie"]
+ }
return 0
}
+2015-09-24 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
+
+ * config.host (*-*-solaris2*): Add t-crtstuff-pic to tmake_file.
+ Add crtbeginS.o, crtendS.o to extra_parts if libgcc_cv_solaris_crts.
+ * config/sol2/gmon.c: (monstartup): Don't write trailing NUL of
+ messages.
+ (internal_mcount): Likewise.
+ * config/sol2/t-sol2 (crtp.o, crtpg.o, gmon.o): Compile with
+ crt_compile, add CRTSTUFF_T_CFLAGS_S.
+
2015-09-24 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
* configure.ac (libgcc_cv_solaris_crts): New test.
*-*-solaris2*)
# Unless linker support and dl_iterate_phdr are present,
# unwind-dw2-fde-dip.c automatically falls back to unwind-dw2-fde.c.
- tmake_file="$tmake_file sol2/t-sol2 t-eh-dw2-dip t-libgcc-pic t-slibgcc t-slibgcc-elf-ver"
+ tmake_file="$tmake_file sol2/t-sol2 t-eh-dw2-dip t-crtstuff-pic t-libgcc-pic t-slibgcc t-slibgcc-elf-ver"
if test $with_gnu_ld = yes; then
tmake_file="$tmake_file t-slibgcc-gld"
else
# Solaris 11.x and 12 provide crt1.o, crti.o, and crtn.o as part of the
# base system. crtp.o and crtpg.o implement the compiler-dependent parts.
extra_parts="$extra_parts crtp.o crtpg.o"
+ # If the Solaris CRTs are present, both ld and gld will have PIE support.
+ extra_parts="$extra_parts crtbeginS.o crtendS.o"
else
case ${host} in
i?86-*-solaris2.1[0-9]* | x86_64-*-solaris2.1[0-9]*)
/* Define if the system-provided CRTs are present on Solaris. */
#undef HAVE_SOLARIS_CRTS
+/* Define if the system-provided CRTs are present on Solaris. */
+#undef HAVE_SOLARIS_CRTS
+
/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H
monsize = (s_textsize / HISTFRACTION) + sizeof (struct phdr);
buffer = sbrk (monsize);
if (buffer == (void *) -1) {
- write (STDERR_FILENO, MSG, sizeof (MSG));
+ write (STDERR_FILENO, MSG, sizeof (MSG) - 1);
return;
}
froms = sbrk (s_textsize / HASHFRACTION);
if (froms == (void *) -1) {
- write (STDERR_FILENO, MSG, sizeof (MSG));
+ write (STDERR_FILENO, MSG, sizeof (MSG) - 1);
froms = NULL;
return;
}
}
tos = sbrk (tolimit * sizeof (struct tostruct));
if (tos == (void *) -1) {
- write (STDERR_FILENO, MSG, sizeof (MSG));
+ write (STDERR_FILENO, MSG, sizeof (MSG) - 1);
froms = NULL;
tos = NULL;
return;
profiling++;
#define TOLIMIT "mcount: tos overflow\n"
- write (STDERR_FILENO, TOLIMIT, sizeof (TOLIMIT));
+ write (STDERR_FILENO, TOLIMIT, sizeof (TOLIMIT) - 1);
goto out;
}
# crtp, crtpg build rules
crtp.o: $(srcdir)/config/sol2/crtp.c
- $(gcc_compile) -c $<
+ $(crt_compile) $(CRTSTUFF_T_CFLAGS_S) -c $<
crtpg.o: $(srcdir)/config/sol2/crtpg.c
- $(gcc_compile) -c $<
+ $(crt_compile) $(CRTSTUFF_T_CFLAGS_S) -c $<
# gmon build rule
gmon.o: $(srcdir)/config/sol2/gmon.c
- $(gcc_compile) -c $<
+ $(crt_compile) $(CRTSTUFF_T_CFLAGS_S) -c $<
# Assemble startup files.
crt1.o: $(srcdir)/config/$(cpu_type)/sol2-c1.S
projects / gcc.git / commitdiff