diff --git a/flaim/Makefile b/flaim/Makefile
index e8176a9..18742ac 100644
--- a/flaim/Makefile
+++ b/flaim/Makefile
@@ -965,7 +965,7 @@ ifdef unix_target
 				# Must support 64 bit file sizes - even for 32 bit builds.
 
 				ccdefs += _LARGEFILE_SOURCE _FILE_OFFSET_BITS=64
-				ccflags += -xarch=generic
+				ccflags += -xarch=v8plus
 			endif
 		endif
 	endif
@@ -1047,7 +1047,7 @@ ifdef unix_target
 			ifeq ($(target_word_size),64)
 				link_flags += -xarch=generic64
 			else
-				link_flags += -xarch=generic
+				link_flags += -xarch=v8plus
 			endif
 		endif
 
diff --git a/ftk/Makefile b/ftk/Makefile
index 89c0716..e79d3e2 100644
--- a/ftk/Makefile
+++ b/ftk/Makefile
@@ -928,7 +928,7 @@ ifdef unix_target
 				# Must support 64 bit file sizes - even for 32 bit builds.
 
 				ccdefs += _LARGEFILE_SOURCE _FILE_OFFSET_BITS=64
-				ccflags += -xarch=generic
+				ccflags += -xarch=v8plus
 			endif
 		endif
 	endif
@@ -1008,7 +1008,7 @@ ifdef unix_target
 			ifeq ($(target_word_size),64)
 				link_flags += -xarch=generic64
 			else
-				link_flags += -xarch=generic
+				link_flags += -xarch=v8plus
 			endif
 		endif
 
diff --git a/ftk/src/ftkunix.cpp b/ftk/src/ftkunix.cpp
index 3ec25e5..19a8e5c 100644
--- a/ftk/src/ftkunix.cpp
+++ b/ftk/src/ftkunix.cpp
@@ -1189,6 +1189,14 @@ FLMUINT f_getFSBlockSize(
 	return( uiFSBlkSize);
 }
 
+/****************************************************************************
+Desc: Remove this error pragma if you really intend to run with
+		mutex-based atomics
+****************************************************************************/
+#if defined( FLM_SOLARIS) && !defined( FLM_SPARC_PLUS)
+	#error This Solaris build will use mutex-based atomics.
+#endif
+
 /****************************************************************************
 Desc:
 ****************************************************************************/
diff --git a/xflaim/Makefile b/xflaim/Makefile
index b74319b..4b402b6 100644
--- a/xflaim/Makefile
+++ b/xflaim/Makefile
@@ -989,7 +989,7 @@ ifdef unix_target
 				# Must support 64 bit file sizes - even for 32 bit builds.
 
 				ccdefs += _LARGEFILE_SOURCE _FILE_OFFSET_BITS=64
-				ccflags += -xarch=generic
+				ccflags += -xarch=v8plus
 			endif
 		endif
 	endif
@@ -1072,7 +1072,7 @@ ifdef unix_target
 			ifeq ($(target_word_size),64)
 				link_flags += -xarch=generic64
 			else
-				link_flags += -xarch=generic
+				link_flags += -xarch=v8plus
 			endif
 		endif