Merge pull request #38 from vsebe/v0.16.0-release.aix.xlc16

(v0.16.0) Update C and C++ flags to support AIX XL/C 16.1 Clang-based compiler
eclipse-openj9 · Sep 10, 2019 · d4c85c3 · d4c85c3
2 parents d49eff1 + 60f3efb
commit d4c85c3
Showing 1 changed file with 21 additions and 2 deletions.
diff --git a/omrmakefiles/rules.aix.mk b/omrmakefiles/rules.aix.mk
@@ -41,10 +41,29 @@ else
     GLOBAL_ASFLAGS += -a32 -mppc
 endif
 
-GLOBAL_CFLAGS += -q mbcs -qlanglvl=extended -qarch=ppc -qinfo=pro -qalias=noansi -qxflag=LTOL:LTOL0 -qsuppress=1506-1108
-GLOBAL_CXXFLAGS+=-q mbcs -qlanglvl=extended0x -qarch=ppc -qinfo=pro -qalias=noansi -qxflag=LTOL:LTOL0 -qsuppress=1506-1108
+GLOBAL_CFLAGS += -qarch=ppc -qalias=noansi -qxflag=LTOL:LTOL0 -qsuppress=1506-1108
+GLOBAL_CXXFLAGS+=-qlanglvl=extended0x -qarch=ppc -qalias=noansi -qxflag=LTOL:LTOL0 -qsuppress=1506-1108
 GLOBAL_CPPFLAGS+=-D_XOPEN_SOURCE_EXTENDED=1 -D_ALL_SOURCE -DRS6000 -DAIXPPC -D_LARGE_FILES
 
+ifeq (,$(findstring xlclang,$(notdir $(CC))))
+  # xlc options
+  GLOBAL_CFLAGS+=-q mbcs -qlanglvl=extended -qinfo=pro
+else
+  # xlclang options
+  GLOBAL_CFLAGS+=-qlanglvl=extended0x -qxlcompatmacros
+endif
+
+ifeq (,$(findstring xlclang++,$(notdir $(CXX))))
+  # xlc++ options
+  GLOBAL_CXXFLAGS+=-q mbcs -qinfo=pro
+else
+  # xlclang++ options
+  GLOBAL_CXXFLAGS+=-qxlcompatmacros -fno-exceptions
+  ifeq (0,$(OMR_RTTI))
+    GLOBAL_CXXFLAGS+=-fno-rtti
+  endif
+endif
+
 ###
 ### Optimization
 ###