ICU-6963 Make icu resolve symbols internally.

X-SVN-Rev: 26320
This commit is contained in:
Michael Ow 2009-07-14 16:50:23 +00:00
parent 23e9fb042f
commit 4f6fd26142
11 changed files with 48 additions and 23 deletions

View file

@ -1,7 +1,7 @@
/*
*******************************************************************************
*
* Copyright (C) 2003-2004, International Business Machines
* Copyright (C) 2003-2009, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@ -126,7 +126,7 @@ U_CDECL_END
* to at least the specified level.
* @internal
*/
#define UTRACE_LEVEL(level) (utrace_level>=(level))
#define UTRACE_LEVEL(level) (utrace_getLevel()>=(level))
/**
* Flag bit in utraceFnNumber, the local variable added to each function
@ -156,7 +156,7 @@ U_CDECL_END
*/
#define UTRACE_ENTRY(fnNumber) \
int32_t utraceFnNumber=(fnNumber); \
if(utrace_level>=UTRACE_INFO) { \
if(utrace_getLevel()>=UTRACE_INFO) { \
utrace_entry(fnNumber); \
utraceFnNumber |= UTRACE_TRACED_ENTRY; \
}
@ -174,7 +174,7 @@ U_CDECL_END
*/
#define UTRACE_ENTRY_OC(fnNumber) \
int32_t utraceFnNumber=(fnNumber); \
if(utrace_level>=UTRACE_OPEN_CLOSE) { \
if(utrace_getLevel()>=UTRACE_OPEN_CLOSE) { \
utrace_entry(fnNumber); \
utraceFnNumber |= UTRACE_TRACED_ENTRY; \
}

View file

@ -19,9 +19,12 @@ GEN_DEPS.cc= $(CXX) -E -MM $(DEFS) $(CPPFLAGS)
LINK.c= $(AIX_PREDELETE) $(CXX) $(CXXFLAGS) $(LDFLAGS)
LINK.cc= $(AIX_PREDELETE) $(CXX) $(CXXFLAGS) $(LDFLAGS)
## Shared library options
LD_SOOPTIONS= -Wl,-bsymbolic
## Commands to make a shared library
SHLIB.c= $(AIX_PREDELETE) $(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-bexpall
SHLIB.cc= $(AIX_PREDELETE) $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -Wl,-bexpall
SHLIB.c= $(AIX_PREDELETE) $(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-bexpall $(LD_SOOPTIONS)
SHLIB.cc= $(AIX_PREDELETE) $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -Wl,-bexpall $(LD_SOOPTIONS)
## Compiler switch to embed a runtime search path
LD_RPATH= -I

View file

@ -1,6 +1,6 @@
## -*-makefile-*-
## Linux-specific setup
## Copyright (c) 1999-2006, International Business Machines Corporation and
## Copyright (c) 1999-2009, International Business Machines Corporation and
## others. All Rights Reserved.
## Commands to generate dependency files
@ -27,6 +27,10 @@ LD_RPATH_PRE= -Wl,-rpath,
## Compiler switch to embed a library name
LD_SONAME = -Wl,-soname -Wl,$(notdir $(MIDDLE_SO_TARGET))
## Shared library options
LD_SOOPTIONS= -Wl,-Bsymbolic
## Shared object suffix
SO = so
## Non-shared intermediate object suffix

View file

@ -1,6 +1,6 @@
## -*-makefile-*-
## BSD-specific setup (FreeBSD, OpenBSD, NetBSD, *BSD)
## Copyright (c) 1999-2006, International Business Machines Corporation and
## Copyright (c) 1999-2009, International Business Machines Corporation and
## others. All Rights Reserved.
## Commands to generate dependency files
@ -23,6 +23,9 @@ LD_RPATH_PRE= -Wl,-rpath,
## Compiler switch to embed a library name
LD_SONAME = -Wl,-soname -Wl,$(notdir $(MIDDLE_SO_TARGET))
## Shared library options
LD_SOOPTIONS= -Wl,-Bsymbolic
## Shared object suffix
SO = so
## Non-shared intermediate object suffix

View file

@ -1,6 +1,6 @@
## -*-makefile-*-
## Cygwin-specific setup
## Copyright (c) 2001-2008, International Business Machines Corporation and
## Copyright (c) 2001-2009, International Business Machines Corporation and
## others. All Rights Reserved.
## Commands to generate dependency files
@ -29,11 +29,14 @@ LIBCPPFLAGS =
LINK.c= $(CXX) $(CXXFLAGS) $(LDFLAGS)
#LINK.cc= $(CXX) $(CXXFLAGS) $(LDFLAGS)
## Shared library options
LD_SOOPTIONS= -Wl,-Bsymbolic
## Commands to make a shared library
# $(subst) won't work in shell script. #M# at the end omits these
# lines from the shell script (Make only)
SHLIB.c= $(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,--enable-auto-import -Wl,--out-implib=$(subst cyg,lib,$@).$(A)#M#
SHLIB.cc= $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -Wl,--enable-auto-import -Wl,--out-implib=$(subst cyg,lib,$@).$(A)#M#
SHLIB.c= $(CC) $(CFLAGS) $(LDFLAGS) -shared $(LD_SOOPTIONS) -Wl,--enable-auto-import -Wl,--out-implib=$(subst cyg,lib,$@).$(A)#M#
SHLIB.cc= $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(LD_SOOPTIONS) -Wl,--enable-auto-import -Wl,--out-implib=$(subst cyg,lib,$@).$(A)#M#
# the #SH# lines don't go through further postprocessing.
# so, they must be valid shell script starting from column 4
#SH#SHLIB_c="$(CC) $(CFLAGS) $(LDFLAGS) -shared "

View file

@ -1,7 +1,7 @@
## -*-makefile-*-
## Darwin-specific setup (Darwin is the Mac OS X developer preview, successor
## to Rhapsody, aka Mac OS X Server)
## Copyright (c) 1999-2008 International Business Machines Corporation and
## Copyright (c) 1999-2009 International Business Machines Corporation and
## others. All Rights Reserved.
## Flags for position independent code
@ -21,8 +21,8 @@ COMPILE.c= $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) -fno-common -c
COMPILE.cc= $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) -fno-common -c
## Commands to make a shared library
SHLIB.c= $(CC) -dynamiclib -dynamic $(CFLAGS) $(LDFLAGS)
SHLIB.cc= $(CXX) -dynamiclib -dynamic $(CXXFLAGS) $(LDFLAGS)
SHLIB.c= $(CC) -dynamiclib -dynamic $(CFLAGS) $(LDFLAGS) $(LD_SOOPTIONS)
SHLIB.cc= $(CXX) -dynamiclib -dynamic $(CXXFLAGS) $(LDFLAGS) $(LD_SOOPTIONS)
## Compiler switches to embed a library name and version information
LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(notdir $(MIDDLE_SO_TARGET))

View file

@ -47,10 +47,13 @@ LDFLAGS += -Wl,+s $(LD_DEFAULTPATH)
LINK.c= $(CXX) $(CXXFLAGS) $(LDFLAGS)
LINK.cc= $(CXX) $(CXXFLAGS) $(LDFLAGS)
## Shared library options
LD_SOOPTIONS= -Bprotected_def
## Commands to make a shared library
#SHLIB.c= $(LD) $(LDFLAGS) -b
SHLIB.c= $(CXX) $(CXXFLAGS) $(LDFLAGS) -b
SHLIB.cc= $(CXX) $(CXXFLAGS) $(LDFLAGS) -b
SHLIB.c= $(CXX) $(CXXFLAGS) $(LDFLAGS) -b $(LD_SOOPTIONS)
SHLIB.cc= $(CXX) $(CXXFLAGS) $(LDFLAGS) -b $(LD_SOOPTIONS)
## Compiler switch to embed a runtime search path
LD_RPATH= -Wl,+b,

View file

@ -1,6 +1,6 @@
## -*-makefile-*-
## HPUX/gcc specific setup
## Copyright (c) 1999-2004, International Business Machines Corporation and
## Copyright (c) 1999-2009, International Business Machines Corporation and
## others. All Rights Reserved.
## Commands to generate dependency files
@ -24,9 +24,12 @@ DEFS += -D_HPUX_SOURCE -D_POSIX_C_SOURCE=199506L
LINK.c= $(CXX) $(DEFS) $(LDFLAGS) -Wl,+s $(LD_DEFAULTPATH)
LINK.cc= $(CXX) $(DEFS) $(LDFLAGS) -Wl,+s $(LD_DEFAULTPATH)
## Shared library options
LD_SOOPTIONS= -Wl,-Bsymbolic
## Commands to make a shared library
SHLIB.c= $(CC) $(DEFS) $(CFLAGS) $(LDFLAGS) $(SHAREDLIBCXXFLAGS) -shared -Wl,+s $(LD_DEFAULTPATH)
SHLIB.cc= $(CXX) $(DEFS) $(CXXFLAGS) $(LDFLAGS) $(SHAREDLIBCXXFLAGS) -shared -Wl,+s $(LD_DEFAULTPATH)
SHLIB.c= $(CC) $(DEFS) $(CFLAGS) $(LDFLAGS) $(SHAREDLIBCXXFLAGS) -shared -Wl,+s $(LD_DEFAULTPATH) $(LD_SOOPTIONS)
SHLIB.cc= $(CXX) $(DEFS) $(CXXFLAGS) $(LDFLAGS) $(SHAREDLIBCXXFLAGS) -shared -Wl,+s $(LD_DEFAULTPATH) $(LD_SOOPTIONS)
## Compiler switch to embed a runtime search path
LD_RPATH= -Wl,+b,

View file

@ -1,6 +1,6 @@
## -*-makefile-*-
## Linux-specific setup
## Copyright (c) 1999-2008, International Business Machines Corporation and
## Copyright (c) 1999-2009, International Business Machines Corporation and
## others. All Rights Reserved.
## Commands to generate dependency files
@ -29,6 +29,9 @@ LDFLAGSICUDT=-nodefaultlibs -nostdlib
#SH# # We can't depend on MIDDLE_SO_TARGET being set.
#SH# LD_SONAME=
## Shared library options
LD_SOOPTIONS= -Wl,-Bsymbolic
## Shared object suffix
SO = so
## Non-shared intermediate object suffix

View file

@ -1,6 +1,6 @@
## -*-makefile-*-
## Solaris-specific setup using gcc
## Copyright (c) 1999-2006, International Business Machines Corporation and
## Copyright (c) 1999-2009, International Business Machines Corporation and
## others. All Rights Reserved.
## Flags for position independent code
@ -25,6 +25,9 @@ LD_RPATH_PRE=
## Compiler switch to embed a library name
LD_SONAME = -h $(notdir $(MIDDLE_SO_TARGET))
## Shared library options
LD_SOOPTIONS= -Wl,-Bsymbolic
## The type of assembly needed when pkgdata is used for generating shared libraries.
## Only use this when not on x86 Solaris.
ifeq (strip $(GENCCODE_ASSEMBLY),)

View file

@ -160,8 +160,8 @@ LINK.c= $(CC) $(CFLAGS) $(LDFLAGS)
LINK.cc= $(CXX) $(CXXFLAGS) $(LDFLAGS)
# Commands to make a shared library
SHLIB.c= $(CC) $(CFLAGS) $(LDFLAGS) -shared
SHLIB.cc= $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared
SHLIB.c= $(CC) $(CFLAGS) $(LDFLAGS) -shared $(LD_SOOPTIONS)
SHLIB.cc= $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(LD_SOOPTIONS)
# Environment variable to set a runtime search path
LDLIBRARYPATH_ENVVAR = LD_LIBRARY_PATH