Browse Source

XL: Fix the use of the -qhalt flag for varying OSs

The valid settings to pass to the IBM XL compiler for the -qhalt flag
vary widely by language and platform.  Based on existing documentation,
the following table shows which error levels are valid to pass to
-qhalt= since -qhalt=e is not always available.

OS       |  xlc  |  xlC  |   xlf   |
---------|-------|------------------
AIX      | iwes  | iw s  | ilwesu  |
BlueGene | iwes  | iwes  | ilwesu  |
OS X     | iwesu | iwesu | ilwesu  |
Linux    |  w    |  w    | ilwesu  |
Chuck Atkins 8 years ago
parent
commit
f320907b3d

+ 1 - 2
Modules/Compiler/XL-C.cmake

@@ -4,5 +4,4 @@ string(APPEND CMAKE_C_FLAGS_RELEASE_INIT " -DNDEBUG")
 string(APPEND CMAKE_C_FLAGS_MINSIZEREL_INIT " -DNDEBUG")
 
 # -qthreaded     = Ensures that all optimizations will be thread-safe
-# -qhalt=e       = Halt on error messages (rather than just severe errors)
-string(APPEND CMAKE_C_FLAGS_INIT " -qthreaded -qhalt=e")
+string(APPEND CMAKE_C_FLAGS_INIT " -qthreaded")

+ 1 - 2
Modules/Compiler/XL-CXX.cmake

@@ -4,8 +4,7 @@ string(APPEND CMAKE_CXX_FLAGS_RELEASE_INIT " -DNDEBUG")
 string(APPEND CMAKE_CXX_FLAGS_MINSIZEREL_INIT " -DNDEBUG")
 
 # -qthreaded     = Ensures that all optimizations will be thread-safe
-# -qhalt=e       = Halt on error messages (rather than just severe errors)
-string(APPEND CMAKE_CXX_FLAGS_INIT " -qthreaded -qhalt=e")
+string(APPEND CMAKE_CXX_FLAGS_INIT " -qthreaded")
 
 set(CMAKE_CXX_COMPILE_OBJECT
   "<CMAKE_CXX_COMPILER> -+ <DEFINES> <INCLUDES> <FLAGS> -o <OBJECT> -c <SOURCE>")

+ 3 - 0
Modules/Platform/AIX-XL-C.cmake

@@ -1,2 +1,5 @@
 include(Platform/AIX-XL)
 __aix_compiler_xl(C)
+
+# -qhalt=e       = Halt on error messages (rather than just severe errors)
+string(APPEND CMAKE_C_FLAGS_INIT " -qhalt=e")

+ 3 - 0
Modules/Platform/AIX-XL-CXX.cmake

@@ -1,2 +1,5 @@
 include(Platform/AIX-XL)
 __aix_compiler_xl(CXX)
+
+# -qhalt=s       = Halt on severe error messages
+string(APPEND CMAKE_CXX_FLAGS_INIT " -qhalt=s")

+ 3 - 0
Modules/Platform/BlueGeneP-dynamic-XL-C.cmake

@@ -3,3 +3,6 @@
 
 
 __BlueGeneP_set_dynamic_flags(XL C)
+
+# -qhalt=e       = Halt on error messages (rather than just severe errors)
+string(APPEND CMAKE_C_FLAGS_INIT " -qhalt=e")

+ 3 - 0
Modules/Platform/BlueGeneP-dynamic-XL-CXX.cmake

@@ -3,3 +3,6 @@
 
 
 __BlueGeneP_set_dynamic_flags(XL CXX)
+
+# -qhalt=s       = Halt on severe error messages
+string(APPEND CMAKE_CXX_FLAGS_INIT " -qhalt=s")

+ 3 - 0
Modules/Platform/BlueGeneP-static-XL-C.cmake

@@ -3,3 +3,6 @@
 
 
 __BlueGeneP_set_static_flags(XL C)
+
+# -qhalt=e       = Halt on error messages (rather than just severe errors)
+string(APPEND CMAKE_C_FLAGS_INIT " -qhalt=e")

+ 3 - 0
Modules/Platform/BlueGeneP-static-XL-CXX.cmake

@@ -3,3 +3,6 @@
 
 
 __BlueGeneP_set_static_flags(XL CXX)
+
+# -qhalt=s       = Halt on severe error messages
+string(APPEND CMAKE_CXX_FLAGS_INIT " -qhalt=s")

+ 3 - 0
Modules/Platform/BlueGeneQ-dynamic-XL-C.cmake

@@ -3,3 +3,6 @@
 
 
 __BlueGeneQ_setup_dynamic(XL C)
+
+# -qhalt=e       = Halt on error messages (rather than just severe errors)
+string(APPEND CMAKE_C_FLAGS_INIT " -qhalt=e")

+ 3 - 0
Modules/Platform/BlueGeneQ-dynamic-XL-CXX.cmake

@@ -3,3 +3,6 @@
 
 
 __BlueGeneQ_setup_dynamic(XL CXX)
+
+# -qhalt=s       = Halt on severe error messages
+string(APPEND CMAKE_CXX_FLAGS_INIT " -qhalt=s")

+ 3 - 0
Modules/Platform/BlueGeneQ-static-XL-C.cmake

@@ -3,3 +3,6 @@
 
 
 __BlueGeneQ_setup_static(XL C)
+
+# -qhalt=e       = Halt on error messages (rather than just severe errors)
+string(APPEND CMAKE_C_FLAGS_INIT " -qhalt=e")

+ 3 - 0
Modules/Platform/BlueGeneQ-static-XL-CXX.cmake

@@ -3,3 +3,6 @@
 
 
 __BlueGeneQ_setup_static(XL CXX)
+
+# -qhalt=s       = Halt on severe error messages
+string(APPEND CMAKE_CXX_FLAGS_INIT " -qhalt=s")

+ 3 - 0
Modules/Platform/Darwin-XL-C.cmake

@@ -3,3 +3,6 @@ set(CMAKE_SHARED_MODULE_CREATE_C_FLAGS "-bundle")
 
 # Enable shared library versioning.
 set(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-install_name")
+
+# -qhalt=e       = Halt on error messages (rather than just severe errors)
+string(APPEND CMAKE_C_FLAGS_INIT " -qhalt=e")

+ 3 - 0
Modules/Platform/Darwin-XL-CXX.cmake

@@ -3,3 +3,6 @@ set(CMAKE_SHARED_MODULE_CREATE_CXX_FLAGS "-bundle")
 
 # Enable shared library versioning.
 set(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG "-Wl,-install_name")
+
+# -qhalt=e       = Halt on error messages (rather than just severe errors)
+string(APPEND CMAKE_C_FLAGS_INIT " -qhalt=e")