AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-1748 fix AIX non multithreaded build

Browse Source 
X-SVN-Rev: 7909
This commit is contained in:
Steven R. Loomis 2002-03-08 00:25:53 +00:00
parent 2f2600cf84
commit 1d4f1aac65
6 changed files with 204 additions and 209 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
icu4c/source/config/mh-aix
View File

@ -3,7 +3,7 @@
## Copyright (c) 1999-2000, International Business Machines Corporation and
## others. All Rights Reserved.
##
## $Id: mh-aix,v 1.25 2002/01/04 23:48:42 yves-oss Exp $
## $Id: mh-aix,v 1.26 2002/03/08 00:25:53 srl Exp $
## Commands to generate dependency files
GEN_DEPS.c= $(CC) -E -M $(DEFS) $(CPPFLAGS)
@ -16,13 +16,13 @@ COMPILE.cc= $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) -qroconst -c
## Commands to link
## We need to use the C++ linker, even when linking C programs, since
## our libraries contain C++ code (C++ static init not called)
#LINK.c= $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
#LINK.c= $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
LINK.c= $(CXX) -brtl $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS)
LINK.cc= $(CXX) -brtl $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS)
## Commands to make a shared library
SHLIB.c= makeC++SharedLib_r -p 5000 -brtl
SHLIB.cc= makeC++SharedLib_r -p 5000 -brtl
SHLIB.c= $(AIX_SHLIB) -p 5000 -brtl
SHLIB.cc= $(AIX_SHLIB) -p 5000 -brtl
## Compiler switch to embed a runtime search path
LD_RPATH= -I

6
icu4c/source/config/mh-aix-va
View File

@ -3,7 +3,7 @@
## Copyright (c) 1999-2000, International Business Machines Corporation and
## others. All Rights Reserved.
##
## $Id: mh-aix-va,v 1.18 2002/01/04 23:48:42 yves-oss Exp $
## $Id: mh-aix-va,v 1.19 2002/03/08 00:25:53 srl Exp $
## Commands to generate dependency files
GEN_DEPS.c= $(CC) -E -M $(DEFS) $(CPPFLAGS)
@ -23,8 +23,8 @@ LINK.cc= $(CXX) -brtl -bh:5 $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS)
## -G means -berok -brtl -bnortllib -bnosymbolic -bnoautoexp
## -bh:8 means halt on errors or worse. We don't display warnings about
## duplicate inline symbols.
SHLIB.c= xlC_r -qmkshrobj -G -brtl
SHLIB.cc= xlC_r -qmkshrobj -G -brtl -bh:5
SHLIB.c= $(CXX) -qmkshrobj -G -brtl
SHLIB.cc= $(CXX) -qmkshrobj -G -brtl -bh:5
## Compiler switch to embed a runtime search path
LD_RPATH= -I

356
icu4c/source/configure vendored
View File

File diff suppressed because it is too large Load Diff

12
icu4c/source/configure.in
View File

@ -4,7 +4,7 @@ dnl Copyright (c) 1999-2000, International Business Machines Corporation and
dnl others. All Rights Reserved.
dnl Stephen F. Booth, heavily modified by Yves and others
dnl $Id: configure.in,v 1.156 2002/02/20 22:28:44 grhoten-oss Exp $
dnl $Id: configure.in,v 1.157 2002/03/08 00:25:51 srl Exp $
dnl Process this file with autoconf to produce a configure script
AC_INIT(common/unicode/utypes.h)
@ -876,6 +876,16 @@ if test "${FORCE_LIBS}" != ""; then
LIBS=${FORCE_LIBS}
fi
if test "${AIX_SHLIB}" != ""; then
echo " *** setting AIX_SHLIB (AIX only) to ${AIX_SHLIB}]" 1>&6
else
AIX_SHLIB=makeC++SharedLib_r
fi
AC_SUBST(AIX_SHLIB)
dnl SPECIAL handling for HPUX 10 and also '11 & --enable-hpuxcma=true'
if test $hpuxcma = true; then
CPPFLAGS="${CPPFLAGS} -D_PTHREADS_DRAFT_4 -DHPUX_CMA"

3
icu4c/source/icudefs.mk.in
View File

@ -84,6 +84,7 @@ ICULIBSUFFIX=@ICULIBSUFFIX@
CC = @CC@
CXX = @CXX@
AIX_SHLIB = @AIX_SHLIB@
# Echo w/o newline
@ -121,7 +122,7 @@ INSTALL-S = $(INSTALL_PROGRAM)
INSTALL-L = $(INSTALL_DATA)
# Link commands to link to ICU libs
LIBICUDT= -L$(top_builddir)/data -L$(top_builddir)/stubdata -l$(ICUPREFIX)data$(ICULIBSUFFIX)
LIBICUDT= -L$(top_builddir)/data -L$(top_builddir)/stubdata -l$(ICUDATA_NAME)$(ICULIBSUFFIX)
LIBICUUC= -L$(top_builddir)/common -l$(ICUPREFIX)uc$(ICULIBSUFFIX) $(LIBICUDT)
LIBICUI18N= -L$(top_builddir)/i18n -l$(ICUPREFIX)i18n$(ICULIBSUFFIX)
LIBICULE= -L$(top_builddir)/layout -l$(ICUPREFIX)le$(ICULIBSSUFFIX)

28
icu4c/source/runConfigureICU
View File

@ -4,6 +4,7 @@
# Only supported platforms are recognized
me=`basename $0`
OPTS=
usage()
{
@ -27,7 +28,9 @@ Options: -h, --help Print this message and exit
The following names can be supplied as the argument for platform:
AIX4.3xlC Use IBM's xlC on AIX 4.3
AIX4.3xlC_nothreads Use IBM's xlC on AIX 4.3 with no multithreading
AIX4.3VA Use IBM's Visual Age xlC_r compiler on AIX 4.3
AIX4.3VA_nothreads Use IBM's Visual Age xlC_r compiler on AIX 4.3 with no multithreading
ALPHA/LINUXGCC Use GCC on Alpha/Linux systems
ALPHA/LINUXCCC Use Compaq C compiler on Alpha/Linux systems
FreeBSD Use the GNU C++ compiler on Free BSD
@ -119,6 +122,16 @@ case $platform in
RELEASE_CFLAGS="-O -qmaxmem=-1"
RELEASE_CXXFLAGS="-O -qmaxmem=-1"
;;
AIX4.3xlC_nothreads)
THE_OS=AIX
THE_COMP="xlC"
CC=/usr/ibmcxx/bin/xlc; export CC
CXX=/usr/ibmcxx/bin/xlC; export CXX
AIX_SHLIB=/usr/ibmcxx/bin/makeC++SharedLib; export AIX_SHLIB
RELEASE_CFLAGS="-O -qmaxmem=-1"
RELEASE_CXXFLAGS="-O -qmaxmem=-1"
OPTS="$OPTS --enable-threads=no"
;;
AIX4.3VA)
THE_OS=AIX
THE_COMP="xlC_r"
@ -129,6 +142,17 @@ case $platform in
#CPPFLAGS=-I/usr/lpp/xlC/include; export CPPFLAGS
#LDFLAGS=-L/usr/lpp/xlC/lib; export LDFLAGS
;;
AIX4.3VA_nothreads)
THE_OS=AIX
THE_COMP="xlC"
CC=/usr/vacpp/bin/xlc; export CC
CXX=/usr/vacpp/bin/xlC; export CXX
OPTS="$OPTS --enable-threads=no"
#RELEASE_CFLAGS=-O2
#RELEASE_CXXFLAGS=-O2
#CPPFLAGS=-I/usr/lpp/xlC/include; export CPPFLAGS
#LDFLAGS=-L/usr/lpp/xlC/lib; export LDFLAGS
;;
SOLARISX86)
THE_OS="SOLARIS X86"
THE_COMP="Sun's CC"
@ -265,9 +289,9 @@ fi
# Run configure
echo "Running ./configure $@ for $THE_OS using $THE_COMP compiler"
echo "Running ./configure $OPTS $@ for $THE_OS using $THE_COMP compiler"
echo
$configure $@
$configure $OPTS $@
echo
echo If the result of the above commands looks okay to you, go to the directory
echo source in the ICU distribution to build ICU. Please remember that ICU needs