Fix Solaris compilation

As detailed in Issue #57642, the `test-suite` doesn't compile on Solaris.

This patch fixes the compilation issues as explained there.

Tested on `amd64-pc-solaris2.11` (8 failures, all `fpcmp-target: Comparison
failed`), `sparcv9-sun-solaris2.11` (11 failures, same `fpcmp-target`
errors), and `x86_64-pc-linux-gnu` (no regressions).

Differential Revision: https://reviews.llvm.org/D133579

Author: rorth

MicroBenchmarks/ImageProcessing/Dither/main.cpp

@@ -69,7 +69,7 @@ void BENCHMARK_ORDERED_DITHER(benchmark::State &state) {
   int height = state.range(0);
   int width = state.range(0);
   int m = state.range(1);
-  int n = pow(m, 2);
+  int n = pow((double)m, 2);
   int *outputImage = (int *)malloc(sizeof(int) * height * width);
   int *temp = (int *)malloc(sizeof(int) * height * width);
 

MicroBenchmarks/libs/benchmark/test/benchmark_setup_teardown_test.cc

@@ -10,19 +10,19 @@
 
 // Test that Setup() and Teardown() are called exactly once
 // for each benchmark run (single-threaded).
-namespace single {
+namespace singlethreaded {
 static int setup_call = 0;
 static int teardown_call = 0;
-}  // namespace single
+}  // namespace singlethreaded
 static void DoSetup1(const benchmark::State& state) {
-  ++single::setup_call;
+  ++singlethreaded::setup_call;
 
   // Setup/Teardown should never be called with any thread_idx != 0.
   assert(state.thread_index() == 0);
 }
 
 static void DoTeardown1(const benchmark::State& state) {
-  ++single::teardown_call;
+  ++singlethreaded::teardown_call;
   assert(state.thread_index() == 0);
 }
 
@@ -134,8 +134,8 @@ int main(int argc, char** argv) {
   assert(ret > 0);
 
   // Setup/Teardown is called once for each arg group (1,3,5,7).
-  assert(single::setup_call == 4);
-  assert(single::teardown_call == 4);
+  assert(singlethreaded::setup_call == 4);
+  assert(singlethreaded::teardown_call == 4);
 
   // 3 group of threads calling this function (3,5,10).
   assert(concurrent::setup_call.load(std::memory_order_relaxed) == 3);

MultiSource/Applications/ClamAV/libclamav_readdb.c

@@ -1069,7 +1069,7 @@ static int dirent_compare(const struct dirent *a, const struct dirent *b) {
 	int ret = strcmp(a->d_name, b->d_name);
 	if (ret != 0)
 		return ret;
-#ifdef _AIX
+#if defined(_AIX) || (defined(__sun__) && defined(__svr4__))
        struct stat a_stat;
        struct stat b_stat;
        stat(a->d_name, &a_stat);

MultiSource/Applications/oggenc/oggenc.c

@@ -8,6 +8,7 @@
  * Portions from Vorbize, (c) Kenneth Arnold <[email protected]>
  * and libvorbis examples, (c) Monty <[email protected]>
  */
+#include <alloca.h>
 #include <assert.h>
 #include <ctype.h>
 #include <errno.h>
@@ -23,8 +24,8 @@
 #include <sys/types.h>
 #include <time.h>
 #include <unistd.h>
-#ifdef __XS1B__
 #include <stdint.h>
+#ifdef __XS1B__
 #include "xcoretestsuite.h"
 #endif
 
@@ -129,9 +130,9 @@ extern int _getopt_internal (int ___argc, char *const *___argv,
 
 /* these are filled in by configure */
 typedef int16_t ogg_int16_t;
-typedef u_int16_t ogg_uint16_t;
+typedef uint16_t ogg_uint16_t;
 typedef int32_t ogg_int32_t;
-typedef u_int32_t ogg_uint32_t;
+typedef uint32_t ogg_uint32_t;
 typedef int64_t ogg_int64_t;
 
 typedef struct {

MultiSource/Applications/viterbi/read_dmatrix.c

@@ -1,4 +1,5 @@
 #include <stdio.h>
+#include <string.h>
 #include <memory.h>
 
 #include "common.h"

MultiSource/Benchmarks/DOE-ProxyApps-C++/CLAMR/fmemopen.c

@@ -15,7 +15,7 @@
 // limitations under the License.
 //
 
-#if !defined(__linux__) && !defined(__NetBSD__)
+#if !defined(__linux__) && !defined(__NetBSD__) && !(defined(__sun__) && defined(__svr4__))
 
 #include <stdio.h>
 #include <stdlib.h>

MultiSource/Benchmarks/McCat/05-eks/main.c

@@ -32,12 +32,12 @@
 /*  contains the eigenvalues for each of the matrixes.                  */
 /*                                                                      */
 /************************************************************************/
+#include <stdio.h>
+#include <string.h>
 #include "main.h"
 #include "QRfact.h"
 #include "Triang.h"
 #include "Jacobi.h"
-#include <stdio.h>
-#include <string.h>
 Matrix A,Q,U;
 
 int comp(const double *a,const double *b)

MultiSource/Benchmarks/MiBench/consumer-lame/rtp.c

@@ -4,6 +4,7 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
+#include <alloca.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <arpa/inet.h>

MultiSource/Benchmarks/MiBench/office-ispell/term.c

@@ -72,7 +72,7 @@ static char Rcs_Id[] =
 #include "msgs.h"
 #include <signal.h>
 
-#if defined(__GLIBC__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__)
+#if defined(__GLIBC__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__) || (defined(__sun__) && defined(__svr4__))
 /* Use termios under at least glibc */
 #include <termios.h>
 #define USE_TERMIOS

SingleSource/Regression/C/gcc-c-torture/execute/CMakeLists.txt

@@ -193,12 +193,6 @@ file(GLOB TestRequiresLibM CONFIGURE_DEPENDS
   complex-5.c  # -lm needed on FreeBSD
 )
 
-# Tests that require newnlib Nano IO (--undefined=_printf_float ldflag)
-file(GLOB TestRequiresNanoIO CONFIGURE_DEPENDS
-  920501-8.c
-  930513-1.c
-)
-
 ##
 ## Architecture-specific Test Blacklists
 ##
@@ -369,10 +363,6 @@ foreach(File ${TestFiles})
     list(APPEND MaybeCFlags "-fwrapv")
   endif()
 
-  if(${File} IN_LIST TestRequiresNanoIO)
-    list(APPEND MaybeLDFlags "-Wl,-u,_printf_float")
-  endif()
-
   # Add Test Target
   gcc_torture_execute_test(${File}
                            PREFIX "GCC-C-execute"

litsupport/modules/hash.py

@@ -10,8 +10,8 @@ def compute(context):
         return
     executable = context.executable
     try:
-        # Darwin's "strip" doesn't support these arguments.
-        if platform.system() != 'Darwin':
+        # Darwin's and Solaris' "strip" don't support these arguments.
+        if platform.system() != 'Darwin' and platfor.system() != 'SunOS':
             stripped_executable = executable + '.stripped'
             testplan.check_call([context.config.strip_tool,
                                  '--remove-section=.comment',

tools/timeit.c

@@ -333,7 +333,7 @@ static int execute_target_process(char * const argv[]) {
   if (g_target_data_size_limit != ~(rlim_t) 0) {
     set_resource_limit(RLIMIT_DATA, g_target_data_size_limit);
   }
-#if !defined(__APPLE__)
+#if defined(RLIMIT_RSS) && !defined(__APPLE__)
   // On Apple platforms, RLIMIT_RSS is mapped to RLIMIT_AS and setting RLIMIT_AS
   // to a value smaller than the current virtual memory size will fail, This is
   // incompatible with the current usage in timeit and can cause issues on
@@ -352,9 +352,11 @@ static int execute_target_process(char * const argv[]) {
   if (g_target_file_count_limit != ~(rlim_t) 0) {
     set_resource_limit(RLIMIT_NOFILE, g_target_file_count_limit);
   }
+#ifdef RLIMIT_NPROC
   if (g_target_subprocess_count_limit != ~(rlim_t) 0) {
     set_resource_limit(RLIMIT_NPROC, g_target_subprocess_count_limit);
   }
+#endif
 
   /* Honor the desired target execute directory. */
   if (g_target_exec_directory) {