Merge pull request #140 from marsupial/pause

Fixes for building with clang.
PixarAnimationStudios · Jan 28, 2017 · 88f609f · 88f609f
2 parents adcc58f + 37911d7
commit 88f609f
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/cmake/defaults/gccclangshareddefaults.cmake b/cmake/defaults/gccclangshareddefaults.cmake
@@ -43,7 +43,13 @@ _disable_warning("deprecated")
 _disable_warning("deprecated-declarations")
 
 # Suppress unused typedef warnings emanating from boost.
-_disable_warning("unused-local-typedefs")
+if (NOT CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR
+    NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.6)
+    if (NOT CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang" OR
+        NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.1)
+            _disable_warning("unused-local-typedefs")
+    endif()
+endif()
 
 if (${PXR_MAYA_TBB_BUG_WORKAROUND})
     set(_PXR_GCC_CLANG_SHARED_CXX_FLAGS "${_PXR_GCC_CLANG_SHARED_CXX_FLAGS} -Wl,-Bsymbolic")

diff --git a/pxr/base/lib/arch/attributes.h b/pxr/base/lib/arch/attributes.h
@@ -271,7 +271,7 @@ PXR_NAMESPACE_OPEN_SCOPE
     Arch_ConstructorInit _arch_constructor_init;
     }
 
-#elif defined(ARCH_COMPILER_GCC)
+#elif defined(ARCH_COMPILER_GCC) || defined(ARCH_COMPILER_CLANG)
 
     // The used attribute is required to prevent these apparently unused
     // functions from being removed by the linker.

diff --git a/pxr/base/lib/arch/nap.cpp b/pxr/base/lib/arch/nap.cpp
@@ -80,7 +80,8 @@ ArchThreadYield()
 void
 ArchThreadPause()
 {
-#if defined (ARCH_CPU_INTEL) && defined(ARCH_COMPILER_GCC)
+#if defined (ARCH_CPU_INTEL) && (defined(ARCH_COMPILER_GCC) || \
+                                 defined(ARCH_COMPILER_CLANG))
     __asm__ __volatile__ ("pause");
 #elif defined(ARCH_OS_WINDOWS)
     YieldProcessor();

diff --git a/pxr/base/lib/tf/testenv/SIGFPE.cpp b/pxr/base/lib/tf/testenv/SIGFPE.cpp
@@ -45,8 +45,9 @@ main(int argc, char **argv)
     // as we leave them off by default.
     TfInstallTerminateAndCrashHandlers();
 
-    int a = 1;
-    int b = 0;
+    // Avoid compiler doing the constant math expression
+    volatile int a = 1;
+    volatile int b = 0;
     int c = a/b;
     printf("%d",c);
 }