use tinythread fallback on sparc

Author: jjallaire

R/build.R

@@ -37,7 +37,7 @@ tbbCxxFlags <- function() {
 # Return the linker flags requried for TBB on this platform
 tbbLdFlags <- function() {
    # on Windows and Solaris we need to explicitly link against tbb.dll
-   if (Sys.info()['sysname'] %in% c("Windows", "SunOS")) {
+   if ((Sys.info()['sysname'] %in% c("Windows", "SunOS")) && !isSparc()) {
       tbb <- tbbLibPath()
       paste("-L", asBuildPath(dirname(tbb)), " -ltbb -ltbbmalloc", sep = "")
    } else {
@@ -54,7 +54,7 @@ tbbLibPath <- function(suffix = "") {
       "Windows" = paste("tbb", suffix, ".dll", sep = ""),
       "SunOS" = paste("libtbb", suffix, ".so", sep = "")
    )
-   if (sysname %in% names(tbbSupported)) {
+   if ((sysname %in% names(tbbSupported)) && !isSparc()) {
       libDir <- "lib/"
       if (sysname == "Windows")
          libDir <- paste(libDir, .Platform$r_arch, "/", sep="")
@@ -65,6 +65,9 @@ tbbLibPath <- function(suffix = "") {
    }
 }
 
+isSparc <- function() {
+   Sys.info()['sysname'] == "SunOS" && Sys.info()[["machine"]] != "i86pc"
+}
 
 # Helper function to ape the behavior of the R build system
 # when providing paths to libraries

inst/include/RcppParallel.h

@@ -10,7 +10,7 @@
 // compatibility with CRAN packages not previously configured
 // to link to TBB in Makevars.win)
 #ifndef RCPP_PARALLEL_USE_TBB
-#if defined(__APPLE__) || defined(__gnu_linux__) || ((defined(__sun) && defined(__SVR4)))
+#if defined(__APPLE__) || defined(__gnu_linux__) || ((defined(__sun) && defined(__SVR4) && !defined(__sparc)))
 #define RCPP_PARALLEL_USE_TBB 1
 #include "RcppParallel/TBB.h"
 #else

src/Makevars

@@ -17,7 +17,10 @@ else
     USE_TBB=Linux
   endif
   ifeq ($(UNAME), SunOS)
-    USE_TBB=SunOS
+    SUNOS_ARCH = $(shell uname -p)
+    ifeq ($(SUNOS_ARCH), i386)
+      USE_TBB=SunOS
+    endif
   endif
 
 endif
@@ -49,12 +52,9 @@ endif
 
 # For Solaris detect if this is 32-bit R on x86 and if so forward that to TBB
 ifeq ($(USE_TBB),  SunOS)
-   SUNOS_ARCH = $(shell uname -p)
-   ifeq ($(SUNOS_ARCH), i386)
-      R_32BIT = $(shell ${R_HOME}/bin/Rscript -e 'cat(.Machine$$sizeof.pointer == 4)')
-      ifeq ($(R_32BIT), TRUE)
-         MAKE_ARGS += arch=ia32
-      endif
+   R_32BIT = $(shell ${R_HOME}/bin/Rscript -e 'cat(.Machine$$sizeof.pointer == 4)')
+   ifeq ($(R_32BIT), TRUE)
+      MAKE_ARGS += arch=ia32
    endif
 endif
 

src/tbb/build/SunOS.gcc.inc

@@ -63,13 +63,9 @@ ifeq (ia32,$(arch))
     LIB_LINK_FLAGS += -m32
 endif 
 
-# for some gcc versions on Solaris, -m64 may imply V9, but perhaps not everywhere (TODO: verify).
-# RcppParallel: CRAN uses 32-bit SPARC so we force that here
 ifeq (sparc,$(arch))
-    CPLUS_FLAGS += -mcpu=v9 -m32
-    LIB_LINK_FLAGS += -mcpu=v9 -m32
-#   CPLUS_FLAGS    += -mcpu=v9 -m64
-#   LIB_LINK_FLAGS += -mcpu=v9 -m64
+    CPLUS_FLAGS    += -mcpu=v9 -m64
+    LIB_LINK_FLAGS += -mcpu=v9 -m64
 endif 
 
 #------------------------------------------------------------------------------