Author: iraisr
Date: Mon Jul 31 16:24:08 2017
New Revision: 16464
Log:
Fix the Solaris build after development trunk has been renamed.
Effectively Solaris 12 is now becoming Solaris 11.4.
Modified:
trunk/README.solaris
trunk/configure.ac
trunk/coregrind/m_initimg/initimg-solaris.c
trunk/memcheck/tests/solaris/scalar_auditon_stat.c
trunk/memcheck/tests/solaris/scalar_lwp_sigqueue_pid.c
Modified: trunk/README.solaris
==============================================================================
--- trunk/README.solaris (original)
+++ trunk/README.solaris Mon Jul 31 16:24:08 2017
@@ -52,8 +52,8 @@
- syscall number for unlinkat() is 76 on Solaris 11, but 65 on illumos [2]
- illumos (in April 2013) changed interface of the accept() and pipe()
syscalls [3]
-- posix_spawn() functionality is backed up by true spawn() syscall on Solaris 12
- whereas illumos and Solaris 11 leverage vfork()
+- posix_spawn() functionality is backed up by true spawn() syscall on Solaris 11.4
+ whereas illumos and Solaris 11.3 leverage vfork()
- illumos and older Solaris use utimesys() syscall whereas newer Solaris
uses utimensat()
Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Mon Jul 31 16:24:08 2017
@@ -428,7 +428,16 @@
solaris2.11*)
AC_MSG_RESULT([ok (${host_os})])
VGCONF_OS="solaris"
- DEFAULT_SUPP="solaris11.supp ${DEFAULT_SUPP}"
+
+ uname_v=$( uname -v )
+ case "$uname_v" in
+ 11.4.*)
+ DEFAULT_SUPP="solaris12.supp ${DEFAULT_SUPP}"
+ ;;
+ *)
+ DEFAULT_SUPP="solaris11.supp ${DEFAULT_SUPP}"
+ ;;
+ esac
;;
solaris2.12*)
@@ -3058,11 +3067,11 @@
# Solaris-specific check determining if the lwp_sigqueue() syscall
# takes both pid and thread id arguments or just thread id.
#
-# Old syscall (available on Solaris 11.x):
+# Old syscall (available up to Solaris 11.3):
# int lwp_sigqueue(id_t lwpid, int sig, void *value,
# int si_code, timespec_t *timeout);
#
-# New syscall (available on Solaris 12):
+# New syscall (available since Solaris 11.4):
# int lwp_sigqueue(pid_t pid, id_t lwpid, int sig, void *value,
# int si_code, timespec_t *timeout);
#
@@ -3178,7 +3187,7 @@
# Solaris-specific check determining if commands A_GETSTAT and A_SETSTAT
# for auditon(2) subcode of the auditsys() syscall are available.
# These commands are available in Solaris 11 and illumos but were removed
-# in Solaris 12.
+# in Solaris 11.4.
#
# C-level symbol: SOLARIS_AUDITON_STAT
# Automake-level symbol: SOLARIS_AUDITON_STAT
@@ -3350,8 +3359,8 @@
# Solaris-specific check determining if the new pset() syscall subcode
-# PSET_GET_NAME is available. This subcode was added in Solaris 12 but
-# is missing on illumos and Solaris 11.
+# PSET_GET_NAME is available. This subcode was added in Solaris 11.4 but
+# is missing on illumos and Solaris 11.3.
#
# C-level symbol: SOLARIS_PSET_GET_NAME
# Automake-level symbol: SOLARIS_PSET_GET_NAME
@@ -3616,7 +3625,7 @@
# Solaris-specific check determining if "sysstat" segment reservation type
# is available.
#
-# New "sysstat" segment reservation (available on Solaris 12):
+# New "sysstat" segment reservation (available on Solaris 11.4):
# - program header type: PT_SUNW_SYSSTAT
# - auxiliary vector entry: AT_SUN_SYSSTAT_ADDR
#
@@ -3643,7 +3652,7 @@
# Solaris-specific check determining if "sysstat_zone" segment reservation type
# is available.
#
-# New "sysstat_zone" segment reservation (available on Solaris 12):
+# New "sysstat_zone" segment reservation (available on Solaris 11.4):
# - program header type: PT_SUNW_SYSSTAT_ZONE
# - auxiliary vector entry: AT_SUN_SYSSTAT_ZONE_ADDR
#
Modified: trunk/coregrind/m_initimg/initimg-solaris.c
==============================================================================
--- trunk/coregrind/m_initimg/initimg-solaris.c (original)
+++ trunk/coregrind/m_initimg/initimg-solaris.c Mon Jul 31 16:24:08 2017
@@ -369,7 +369,7 @@
Note that auxiliary vector is *not* created by kernel on illumos and
Solaris 11 if the program is statically linked (which is our case).
- Although we now taught Solaris 12 to create the auxiliary vector, we still
+ Although we now taught Solaris 11.4 to create the auxiliary vector, we still
have to build auxv from scratch, to make the code consistent. */
static Addr setup_client_stack(Addr init_sp,
Modified: trunk/memcheck/tests/solaris/scalar_auditon_stat.c
==============================================================================
--- trunk/memcheck/tests/solaris/scalar_auditon_stat.c (original)
+++ trunk/memcheck/tests/solaris/scalar_auditon_stat.c Mon Jul 31 16:24:08 2017
@@ -1,6 +1,6 @@
/* Scalar test for commands A_GETSTAT and A_SETSTAT for auditon(2) subcode
- of the auditsys() syscall. Available on Solaris 11 and illumos,
- removed in Solaris 12. */
+ of the auditsys() syscall. Available on Solaris 11.3 and illumos,
+ removed in Solaris 11.4. */
#include "scalar.h"
Modified: trunk/memcheck/tests/solaris/scalar_lwp_sigqueue_pid.c
==============================================================================
--- trunk/memcheck/tests/solaris/scalar_lwp_sigqueue_pid.c (original)
+++ trunk/memcheck/tests/solaris/scalar_lwp_sigqueue_pid.c Mon Jul 31 16:24:08 2017
@@ -1,5 +1,5 @@
/* Test for lwp_sigqueue syscall which accepts pid along the thread id.
- Available since Solaris 12.
+ Available since Solaris 11.4.
*/
#include "scalar.h"
|