diff --git a/ftk/Makefile b/ftk/Makefile index 87ab69a..9b7a6c6 100644 --- a/ftk/Makefile +++ b/ftk/Makefile @@ -556,7 +556,7 @@ endif # -- Other targets and options -- -ifneq (,$(findstring genericsparc,$(MAKECMDGOALS))) +ifneq (,$(findstring sparcgeneric,$(MAKECMDGOALS))) generic_sparc = yes endif @@ -946,8 +946,10 @@ ifdef unix_target # Must support 64 bit file sizes - even for 32 bit builds. ccdefs += _LARGEFILE_SOURCE _FILE_OFFSET_BITS=64 + ifdef generic_sparc ccflags += -xarch=generic + ccdefs += FLM_SPARC_GENERIC else ccflags += -xarch=v8plus endif @@ -1785,8 +1787,8 @@ linux: solaris: $(ec)$(gprintf) "" -.PHONY : genericsparc -genericsparc: +.PHONY : sparcgeneric +sparcgeneric: $(ec)$(gprintf) "" .PHONY : osx diff --git a/ftk/src/ftk.h b/ftk/src/ftk.h index fb59c23..10d2605 100644 --- a/ftk/src/ftk.h +++ b/ftk/src/ftk.h @@ -141,7 +141,7 @@ #define FLM_SPARC #define FLM_BIG_ENDIAN #define FLM_STRICT_ALIGNMENT - #if !defined ( FLM_GENERIC_SPARC) + #if !defined ( FLM_SPARC_GENERIC) #if defined( __sparcv8plus) || defined( __sparcv9) || defined( __sparcv9__) || \ defined( __sparc_v8__) || defined( __sparc_v9__) || defined( __arch64__) #define FLM_SPARC_PLUS @@ -162,7 +162,7 @@ #if defined( sparc) || defined( __sparc) || defined( __sparc__) #define FLM_SPARC #define FLM_BIG_ENDIAN - #if !defined ( FLM_GENERIC_SPARC) + #if !defined ( FLM_SPARC_GENERIC) #if defined( __sparcv8plus) || defined( __sparcv9) #define FLM_SPARC_PLUS #endif diff --git a/ftk/src/ftkunix.cpp b/ftk/src/ftkunix.cpp index b0f61d6..a8944fb 100644 --- a/ftk/src/ftkunix.cpp +++ b/ftk/src/ftkunix.cpp @@ -1307,7 +1307,7 @@ FLMUINT f_getFSBlockSize( /**************************************************************************** Desc: ****************************************************************************/ -#if defined( FLM_SPARC) && !defined( FLM_GENERIC_SPARC) && !defined( FLM_SPARC_PLUS) +#if defined( FLM_SPARC) && !defined( FLM_SPARC_GENERIC) && !defined( FLM_SPARC_PLUS) #error This build will use mutex-based atomics. #endif