src/cxx_supportlib/vendor-modified/boost/predef/architecture/sparc.h in passenger-6.0.8 vs src/cxx_supportlib/vendor-modified/boost/predef/architecture/sparc.h in passenger-6.0.9

- old
+ new

@@ -22,30 +22,42 @@ | `+__sparc__+` | {predef_detection} | `+__sparc+` | {predef_detection} | `+__sparcv9+` | 9.0.0 +| `+__sparc_v9__+` | 9.0.0 | `+__sparcv8+` | 8.0.0 +| `+__sparc_v8__+` | 8.0.0 |=== */ // end::reference[] #define BOOST_ARCH_SPARC BOOST_VERSION_NUMBER_NOT_AVAILABLE #if defined(__sparc__) || defined(__sparc) # undef BOOST_ARCH_SPARC -# if !defined(BOOST_ARCH_SPARC) && defined(__sparcv9) +# if !defined(BOOST_ARCH_SPARC) && (defined(__sparcv9) || defined(__sparc_v9__) # define BOOST_ARCH_SPARC BOOST_VERSION_NUMBER(9,0,0) # endif -# if !defined(BOOST_ARCH_SPARC) && defined(__sparcv8) +# if !defined(BOOST_ARCH_SPARC) && (defined(__sparcv8) || defined(__sparc_v8__) # define BOOST_ARCH_SPARC BOOST_VERSION_NUMBER(8,0,0) # endif # if !defined(BOOST_ARCH_SPARC) # define BOOST_ARCH_SPARC BOOST_VERSION_NUMBER_AVAILABLE # endif #endif #if BOOST_ARCH_SPARC # define BOOST_ARCH_SPARC_AVAILABLE +#endif + +#if BOOST_ARCH_SPARC +# if BOOST_ARCH_SPARC >= BOOST_VERSION_NUMBER(9,0,0) +# undef BOOST_ARCH_WORD_BITS_64 +# define BOOST_ARCH_WORD_BITS_64 BOOST_VERSION_NUMBER_AVAILABLE +# else +# undef BOOST_ARCH_WORD_BITS_32 +# define BOOST_ARCH_WORD_BITS_32 BOOST_VERSION_NUMBER_AVAILABLE +# endif #endif #define BOOST_ARCH_SPARC_NAME "SPARC" #endif