From faad4ccdd35698c6b59c19415594b9b5c983f0a7 Mon Sep 17 00:00:00 2001
From: Michael Ow <mow@svn.icu-project.org>
Date: Mon, 8 Oct 2012 20:48:04 +0000
Subject: [PATCH] ICU-9213 Update runConfigureICU and mh-os390

X-SVN-Rev: 32558
---
 icu4c/source/config/mh-os390 | 11 ++++++-----
 icu4c/source/runConfigureICU |  8 ++++----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/icu4c/source/config/mh-os390 b/icu4c/source/config/mh-os390
index b4da484db26..4c36656857f 100644
--- a/icu4c/source/config/mh-os390
+++ b/icu4c/source/config/mh-os390
@@ -42,9 +42,9 @@ IEEE390=1#M#
 endif
 
 ifeq (${IEEE390}, 1)
-ICU_IEEE          = -Wc,'float(ieee)'
+ICU_IEEE          = -Wc,'FLOAT(IEEE)'
 else
-ICU_IEEE          = -DIEEE_754=0#M#
+ICU_IEEE          = -Wc,'FLOAT(IEEE)' -DIEEE_754=0#M#
 endif
 
 ## Additional flags when building libraries and with threads
@@ -66,8 +66,9 @@ SHAREDLIBCXXFLAGS	= -Wc,expo
 # The DLL option must be used by the callee and caller code when using shared libraries.
 # NOCSECT might be used as an optimization option.
 # -+ means accept any file extension as a C++ file. By default only .C is accepted.
-CFLAGS          += -Wc,'langlvl(extended),ros,rent,dll' $(ICU_IEEE)
-CXXFLAGS        += -Wc,'langlvl(extended),ros,dll' $(ICU_IEEE) -+
+CFLAGS          += -Wc,DLL,ROS,RENT,'ARCH(7)','LOC(POSIX)',NOANSIALIAS,'CHARS(SIGNED)','LANGLVL(EXTENDED)' $(ICU_IEEE)
+CXXFLAGS        += -Wc,DLL,ROS,RTTI,'ARCH(7)','LOC(POSIX)',NOANSIALIAS,'CHARS(SIGNED)','LANGLVL(EXTENDED)' $(ICU_IEEE) -+
+DEFS            += -D_XOPEN_SOURCE=600
 ARFLAGS         = -cr
 
 # _MSE_PROTOS usually interacts with _XOPEN_SOURCE. It affects some standard
@@ -81,7 +82,7 @@ ifeq (${OS390_XPLINK}, 1)
 # GOFF is is the strategic object module format for S/390. It is required for XPLINK.
 # NOTEMPINC could be used if ICU starts using templates.
 ICU_XPLINK_C      = -Wc,'xplink(backchain,storeargs),goff'
-ICU_XPLINK_CXX    = -Wc,'xplink(backchain,storeargs),goff'
+ICU_XPLINK_CXX    = -Wc,'xplink(backchain,storeargs),goff' -Wc,'NOTEMPINC'
 ICU_XPLINK_L      = -Wl,xplink
 #SH# fi
 endif
diff --git a/icu4c/source/runConfigureICU b/icu4c/source/runConfigureICU
index 432f9fb3677..fa745cbd211 100755
--- a/icu4c/source/runConfigureICU
+++ b/icu4c/source/runConfigureICU
@@ -307,10 +307,10 @@ case $platform in
     zOS)
         THE_OS="z/OS (OS/390)"
         THE_COMP="z/OS C/C++"
-        CC=cc; export CC
-        CXX=cxx; export CXX
-        RELEASE_CFLAGS="-2 -Wc,'inline(auto,noreport,500,4000)'"
-        RELEASE_CXXFLAGS="-2 -Wc,'inline(auto,noreport,500,4000)'"
+        CC=xlc; export CC
+        CXX=xlC; export CXX
+        RELEASE_CFLAGS="-O2 -Wc,'inline(AUTO,NOREPORT,1000,8000)'"
+        RELEASE_CXXFLAGS="-O2 -Wc,'inline(AUTO,NOREPORT,1000,8000)'"
         ;;
     zOSV1R2)
         THE_OS="z/OS 1.2"
-- 
2.40.0