Adapt Solaris 12 references

	libgo:
	Backport from mainline

libgo: adapt Solaris 12 references

    With the change in the Solaris release model (no more major releases
    like Solaris 12 but only minor ones like 11.4), the Solaris 12
    references in GCC need to be adapted.

    Patch by Rainer Orth.

    Reviewed-on: https://go-review.googlesource.com/77490

	libgcc:
	Backport from mainline
	2017-11-14  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>

	* config.host (*-*-solaris2*): Adapt comment for Solaris 12
	renaming.
	* config/sol2/crtpg.c (__start_crt_compiler): Likewise.
	* configure.ac (libgcc_cv_solaris_crts): Likewise.
	* configure: Regenerate.

	gcc:
	Backport from mainline
	2017-11-14  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>

	* config.gcc (*-*-solaris2*): Enable default_use_cxa_atexit since
	Solaris 11.  Update comment.
	* configure.ac (gcc_cv_ld_pid): Adapt comment for Solaris 12
	renaming.
	* config/sol2.h (STARTFILE_SPEC): Likewise.
	* configure: Regenerate.

	gcc/testsuite:
	Backport from mainline
	2017-11-14  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>

	* lib/target-supports.exp (check_effective_target_pie): Adapt
	comment for Solaris 12 renaming.

	* gcc.dg/torture/pr60092.c: Remove *-*-solaris2.11* dg-xfail-run-if.

From-SVN: r254995

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c44e8ce5cb94d49bc081aa8fa539f6e0f1be0870..e429cecc0d119de5efe6363b66a4dc3519655c90 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,15 @@
+2017-11-21  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+       Backport from mainline
+       2017-11-14  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+       * config.gcc (*-*-solaris2*): Enable default_use_cxa_atexit since
+       Solaris 11.  Update comment.
+       * configure.ac (gcc_cv_ld_pid): Adapt comment for Solaris 12
+       renaming.
+       * config/sol2.h (STARTFILE_SPEC): Likewise.
+       * configure: Regenerate.
+
 2017-11-16  Uros Bizjak  <ubizjak@gmail.com>
 
        * config/i386/i386.c (x86_print_call_or_nop): Emit 5 byte nop

diff --git a/gcc/config.gcc b/gcc/config.gcc
index 8c7d85d4024b0dbacf43882e5669a096809d11ab..bf3f32da08ac44c292f44609f8b1c1f8fbc9528c 100644 (file)
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -850,8 +850,8 @@ case ${target} in
   sol2_tm_file_tail="${cpu_type}/sol2.h sol2.h"
   sol2_tm_file="${sol2_tm_file_head} ${sol2_tm_file_tail}"
   case ${target} in
-    *-*-solaris2.1[2-9]*)
-      # __cxa_atexit was introduced in Solaris 12.
+    *-*-solaris2.1[1-9]*)
+      # __cxa_atexit was introduced in Solaris 11.4.
       default_use_cxa_atexit=yes
       ;;
   esac

diff --git a/gcc/config/sol2.h b/gcc/config/sol2.h
index 78764c4e556868857e4f8ca01a0e203ef4ccde20..f7c7772756633c13b4f87c93bc19566de046c7db 100644 (file)
--- a/gcc/config/sol2.h
+++ b/gcc/config/sol2.h
@@ -185,8 +185,8 @@ along with GCC; see the file COPYING3.  If not see
 /* We don't use the standard svr4 STARTFILE_SPEC because it's wrong for us.  */
 #undef STARTFILE_SPEC
 #ifdef HAVE_SOLARIS_CRTS
-/* Since Solaris 11.x and Solaris 12, the OS delivers crt1.o, crti.o, and
-   crtn.o, with a hook for compiler-dependent stuff like profile handling.  */
+/* Since Solaris 11.4, the OS delivers crt1.o, crti.o, and crtn.o, with a hook
+   for compiler-dependent stuff like profile handling.  */
 #define STARTFILE_SPEC "%{!shared:%{!symbolic: \
                          crt1.o%s \
                          %{p:%e-p is not supported; \

diff --git a/gcc/configure b/gcc/configure
index ba0ea994309813e28853efb20e476bb9db58d9ef..ee300a87d983d5b2df74afac477611da0f062e5c 100755 (executable)
--- a/gcc/configure
+++ b/gcc/configure
@@ -27888,7 +27888,7 @@ elif test x$gcc_cv_ld != x; then
   else
     case "$target" in
       *-*-solaris2.1[1-9]*)
-       # Solaris 11.x and Solaris 12 added PIE support.
+       # Solaris 11.3 added PIE support.
        if $gcc_cv_ld -z help 2>&1 | grep -- type.*pie > /dev/null; then
          gcc_cv_ld_pie=yes
        fi

diff --git a/gcc/configure.ac b/gcc/configure.ac
index fb48d207d3803f2d97e4f8069b2ef0851773dc22..e9d69751ee8e2743bcede55f96bf2d8dc4e63d20 100644 (file)
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -4932,7 +4932,7 @@ elif test x$gcc_cv_ld != x; then
   else
     case "$target" in
       *-*-solaris2.1[[1-9]]*)
-       # Solaris 11.x and Solaris 12 added PIE support.
+       # Solaris 11.3 added PIE support.
        if $gcc_cv_ld -z help 2>&1 | grep -- type.*pie > /dev/null; then
          gcc_cv_ld_pie=yes
        fi

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index df7913a0ae416ab658e67e73f640d5027a573339..f9398699636ef1cccdf977b5dc70d06fbd652ada 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,13 @@
+2017-11-21  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+       Backport from mainline
+       2017-11-14  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+       * lib/target-supports.exp (check_effective_target_pie): Adapt
+       comment for Solaris 12 renaming.
+
+       * gcc.dg/torture/pr60092.c: Remove *-*-solaris2.11* dg-xfail-run-if.
+
 2017-11-13  Paul Thomas  <pault@gcc.gnu.org>
 
        Backport from trunk

diff --git a/gcc/testsuite/gcc.dg/torture/pr60092.c b/gcc/testsuite/gcc.dg/torture/pr60092.c
index d66e3f2444e80fad19bc10350659facf82900d82..7c6cabb509a62e55675e05ac1fc1afe4a95bebf9 100644 (file)
--- a/gcc/testsuite/gcc.dg/torture/pr60092.c
+++ b/gcc/testsuite/gcc.dg/torture/pr60092.c
@@ -4,7 +4,6 @@
 /* { dg-skip-if "No undefined weak" { nvptx-*-* } { "*" } { "" } } */
 /* { dg-additional-options "-Wl,-undefined,dynamic_lookup" { target *-*-darwin* } } */
 /* { dg-additional-options "-Wl,-flat_namespace" { target *-*-darwin[89]* } } */
-/* { dg-xfail-run-if "posix_memalign modifies first arg on error" { *-*-solaris2.11* } { "-O0" } } */
 
 typedef __SIZE_TYPE__ size_t;
 extern int posix_memalign(void **memptr, size_t alignment, size_t size) __attribute__((weak));

diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp
index 6142ed9e3b08cc129d100ff3aa0f4e6c9cc049d0..e31bf3a17a777e82e0b257b0d71f89edcb0b7d88 100644 (file)
--- a/gcc/testsuite/lib/target-supports.exp
+++ b/gcc/testsuite/lib/target-supports.exp
@@ -1060,8 +1060,8 @@ proc check_effective_target_pie { } {
        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.
+       # Full PIE support was added in Solaris 11.3, but gcc errors out
+       # if missing, so check for that.
        return [check_no_compiler_messages pie executable {
            int main (void) { return 0; }
        } "-pie -fpie"]

diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index 488af8ec77f8675108847f83b9ef8052dca9eabc..fc76c961dde9c2595b6d4bbfd5363fbc3d62c773 100644 (file)
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,14 @@
+2017-11-21  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+       Backport from mainline
+       2017-11-14  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+       * config.host (*-*-solaris2*): Adapt comment for Solaris 12
+       renaming.
+       * config/sol2/crtpg.c (__start_crt_compiler): Likewise.
+       * configure.ac (libgcc_cv_solaris_crts): Likewise.
+       * configure: Regenerate.
+
 2017-11-05  Andreas Tobler  <andreast@gcc.gnu.org>
 
        Backport from mainline

diff --git a/libgcc/config.host b/libgcc/config.host
index 2b139b8befc2ba3df35b36c994e6b18988acf744..6f6810cf0bafec6c99089c0ea54b23f73c45a2fe 100644 (file)
--- a/libgcc/config.host
+++ b/libgcc/config.host
@@ -277,7 +277,7 @@ case ${host} in
   tmake_file="$tmake_file $cpu_type/t-sol2"
   extra_parts="gmon.o crtbegin.o crtend.o"
   if test "${libgcc_cv_solaris_crts}" = yes; then
-    # Solaris 11.x and 12 provide crt1.o, crti.o, and crtn.o as part of the
+    # Solaris 11.4 provides 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.

diff --git a/libgcc/config/sol2/crtpg.c b/libgcc/config/sol2/crtpg.c
index 38ee21cc9b4d3bfe37fd59538dc72fad276cfaae..d6672c8f372210939db6d0f71ebe52bd7937d105 100644 (file)
--- a/libgcc/config/sol2/crtpg.c
+++ b/libgcc/config/sol2/crtpg.c
@@ -31,11 +31,10 @@ extern char _start[], _etext[];
 
 int __start_crt_compiler (int, char **);
 
-/* Since Solaris 11.x and Solaris 12, the system-provided CRTs provide a
-   hook to invoke initialization code early during process startup.
-   __start_crt_compiler is documented in crt1.o(5).  We use it to perform
-   initialization for profiling as a substitute for the earlier separate
-   gcrt1.o.  */
+/* Since Solaris 11.4, the system-provided CRTs provide a hook to invoke
+   initialization code early during process startup.  __start_crt_compiler
+   is documented in crt1.o(5).  We use it to perform initialization for
+   profiling as a substitute for the earlier separate gcrt1.o.  */
 
 int
 __start_crt_compiler (int argc __attribute__ ((unused)),

diff --git a/libgcc/configure b/libgcc/configure
index e7d6c75a6f76eff959dde7136a5775c42a0fde19..04ff07636fc9db0b2829f9e0b8802abe5be1f9fb 100644 (file)
--- a/libgcc/configure
+++ b/libgcc/configure
@@ -4667,7 +4667,7 @@ esac
 
 case ${host} in
 *-*-solaris2*)
-  # Check for system-provided CRTs on Solaris 11.x and Solaris 12.
+  # Check for system-provided CRTs on Solaris 11.4.
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking system-provided CRTs on Solaris" >&5
 $as_echo_n "checking system-provided CRTs on Solaris... " >&6; }
 if test "${libgcc_cv_solaris_crts+set}" = set; then :

diff --git a/libgcc/configure.ac b/libgcc/configure.ac
index 269997f23e25ef9253f799afdfee616e04699265..58b67790c05ab61568ca83fb535bd9022bc397ea 100644 (file)
--- a/libgcc/configure.ac
+++ b/libgcc/configure.ac
@@ -294,7 +294,7 @@ esac
 
 case ${host} in
 *-*-solaris2*)
-  # Check for system-provided CRTs on Solaris 11.x and Solaris 12.
+  # Check for system-provided CRTs on Solaris 11.4.
   AC_CACHE_CHECK([system-provided CRTs on Solaris],
                 [libgcc_cv_solaris_crts],
     [libgcc_cv_solaris_crts=no

diff --git a/libgo/configure.ac b/libgo/configure.ac
index a86bcb82311a9890fd3189e4d902ca745745712f..b23685c714496d51e1e87ff4d4b50f0705d2aa0d 100644 (file)
--- a/libgo/configure.ac
+++ b/libgo/configure.ac
@@ -684,7 +684,7 @@ STRUCT_EPOLL_EVENT_FD_OFFSET=${libgo_cv_c_epoll_event_fd_offset}
 AC_SUBST(STRUCT_EPOLL_EVENT_FD_OFFSET)
 
 dnl Check if <sys/stat.h> uses timespec_t for st_?tim members.  Introduced
-dnl in Solaris 12 for XPG7 compatibility.
+dnl in Solaris 11.4 for XPG7 compatibility.
 AC_EGREP_HEADER([timespec_t.*st_atim], [sys/stat.h],
                [have_stat_timespec=yes], [have_stat_timespec=no])
 AM_CONDITIONAL(HAVE_STAT_TIMESPEC, test $have_stat_timespec = yes)

diff --git a/libgo/mksysinfo.sh b/libgo/mksysinfo.sh
index 1271e1a550f666a327ba36b41d691e8cda5c7940..53c017f7596f72145d7596b6f31c19df60caa32e 100755 (executable)
--- a/libgo/mksysinfo.sh
+++ b/libgo/mksysinfo.sh
@@ -1503,22 +1503,22 @@ grep '^type _zone_net_addr_t ' gen-sysinfo.go | \
     sed -e 's/_in6_addr/[16]byte/' \
     >> ${OUT}
 
-# The Solaris 12 _flow_arp_desc_t struct.
+# The Solaris 11.4 _flow_arp_desc_t struct.
 grep '^type _flow_arp_desc_t ' gen-sysinfo.go | \
     sed -e 's/_in6_addr_t/[16]byte/g' \
     >> ${OUT}
 
-# The Solaris 12 _flow_l3_desc_t struct.
+# The Solaris 11.4 _flow_l3_desc_t struct.
 grep '^type _flow_l3_desc_t ' gen-sysinfo.go | \
     sed -e 's/_in6_addr_t/[16]byte/g' \
     >> ${OUT}
 
-# The Solaris 12 _mac_ipaddr_t struct.
+# The Solaris 11.3 _mac_ipaddr_t struct.
 grep '^type _mac_ipaddr_t ' gen-sysinfo.go | \
     sed -e 's/_in6_addr_t/[16]byte/g' \
     >> ${OUT}
 
-# The Solaris 12 _mactun_info_t struct.
+# The Solaris 11.3 _mactun_info_t struct.
 grep '^type _mactun_info_t ' gen-sysinfo.go | \
     sed -e 's/_in6_addr_t/[16]byte/g' \
     >> ${OUT}