diff --git a/CMakeLists.txt b/CMakeLists.txt
index 88408979..fee7e0e7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -227,10 +227,13 @@ endfunction()
 
 # example usage
 enable_cxx_compiler_flag_if_supported("-Wall")
-enable_cxx_compiler_flag_if_supported("-Werror")
 enable_cxx_compiler_flag_if_supported("-Wextra")
 enable_cxx_compiler_flag_if_supported("-Wpedantic")
 enable_cxx_compiler_flag_if_supported("-pedantic")
+if (NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "PGI")
+    enable_cxx_compiler_flag_if_supported("-Werror")
+endif (NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "PGI")
+
 # ---------------------------------------------------
 
 # The version number.
diff --git a/src/apex/apex_bfd.cpp b/src/apex/apex_bfd.cpp
index 43959e0d..1f45904a 100644
--- a/src/apex/apex_bfd.cpp
+++ b/src/apex/apex_bfd.cpp
@@ -52,6 +52,9 @@
 #include <demangle.h>
 #define DEFAULT_DEMANGLE_FLAGS DMGL_PARAMS | DMGL_ANSI | DMGL_VERBOSE | DMGL_TYPES
 #ifdef __PGI
+#ifndef DMGL_ARM
+#define DMGL_ARM         (1 << 11)      /* Use C++ ARM name mangling */
+#endif
 #define DEMANGLE_FLAGS DEFAULT_DEMANGLE_FLAGS | DMGL_ARM
 #else
 #define DEMANGLE_FLAGS DEFAULT_DEMANGLE_FLAGS
diff --git a/src/apex/apex_types.h b/src/apex/apex_types.h
index 668abe83..b2d3144d 100644
--- a/src/apex/apex_types.h
+++ b/src/apex/apex_types.h
@@ -316,8 +316,8 @@ inline unsigned int sc_nprocessors_onln()
 #elif defined(__FreeBSD__) || (defined(__APPLE__) && defined(__MACH__))
 #  define APEX_NATIVE_TLS __thread
 #else
-#  warning "Native thread local storage may not be supported for this platform"
-#  warning "Using: thread_local from C++11"
+// #warning "Native thread local storage may not be supported for this platform"
+// #warning "Using: thread_local from C++11"
 #  define APEX_NATIVE_TLS thread_local
 #endif