Commit c56b59ac6525ad090d1968e50cc1fa2c70a84b0e

complement <complement @01b27279-081b-0410…d9d9e0fb0389.>
Tue Jan 29 07:38:18 CET 2008

Tree SHA1: ad80031
Parent SHA1: a5655c5 (STLport 5.1.5 released based on revision 3387.)
raw diff | raw patch

fixes for HP-UX

git-svn-id: https://stlport.svn.sourceforge.net/svnroot/stlport/branches/STLPORT_5_1/STLport@3427 01b27279-081b-0410-8cf9-d9d9e0fb0389

Diff rendering mode:
inline
side by side


4	4	INCLUDES :=
5	5
6	6	CXX := c++
	7	ifeq ($(OSNAME), hp-ux)
	8	CC := gcc -std=gnu99
	9	else
7	10	CC := gcc -ansi
	11	endif
8	12
9	13	ifdef TARGET_OS
10	14	CXX := ${TARGET_OS}-${CXX}
…	…
160	160	CFLAGS = $(PTHREAD) $(OPT)
161	161	# CXXFLAGS = $(PTHREAD) -nostdinc++ -fexceptions -fident $(OPT)
162	162	CXXFLAGS = $(PTHREAD) -fexceptions -fident $(OPT)
	163	ifneq ($(M_ARCH),ia64)
	164	release-static : OPT += -fno-reorder-blocks
	165	release-shared : OPT += -fno-reorder-blocks
	166	endif
163	167	endif
164	168
165	169	#ifeq ($(CXX_VERSION_MAJOR),3)


1	1	# Time-stamp: <05/09/09 21:05:18 ptr>
2		# $Id$
3	2
	3	ifeq ($(M_ARCH),ia64)
	4	SO := so
	5	else
4	6	SO := sl
	7	endif
5	8
6	9	ARCH := a
7	10	AR := ar


23	23	endif
24	24
25	25	ifndef TARGET_OS
	26	ifeq ($(OSNAME),hp-ux)
	27	release-shared: LDSEARCH = -L${STLPORT_LIB_DIR} -Wl,+b${STLPORT_LIB_DIR}
	28	dbg-shared: LDSEARCH = -L${STLPORT_LIB_DIR} -Wl,+b${STLPORT_LIB_DIR}
	29	stldbg-shared: LDSEARCH = -L${STLPORT_LIB_DIR} -Wl,+b${STLPORT_LIB_DIR}
	30	else
26	31	release-shared: LDSEARCH = -L${STLPORT_LIB_DIR} -Wl,-R${STLPORT_LIB_DIR}
27	32	dbg-shared: LDSEARCH = -L${STLPORT_LIB_DIR} -Wl,-R${STLPORT_LIB_DIR}
28	33	stldbg-shared: LDSEARCH = -L${STLPORT_LIB_DIR} -Wl,-R${STLPORT_LIB_DIR}
	34	endif
29	35	else
30	36	release-shared: LDSEARCH = -L${STLPORT_LIB_DIR}
31	37	dbg-shared: LDSEARCH = -L${STLPORT_LIB_DIR}


37	37	dbg-shared: LDFLAGS += -Wl,-rpath=${STLPORT_LIB_DIR}
38	38	stldbg-shared: LDFLAGS += -Wl,-rpath=${STLPORT_LIB_DIR}
39	39	endif
	40	ifeq ($(OSNAME), hp-ux)
	41	release-shared: LDFLAGS += -Wl,+b${STLPORT_LIB_DIR}
	42	dbg-shared: LDFLAGS += -Wl,+b${STLPORT_LIB_DIR}
	43	stldbg-shared: LDFLAGS += -Wl,+b${STLPORT_LIB_DIR}
	44	endif
40	45	endif


	1	2008-01-29 Petr Ovtchenkov <complement@users.sourceforge.net>
	2
	3	* build/Makefiles/gmake/gcc.mak, build/test/unit/gcc.mak:
	4	build on HP-UX PA-RISC and IA64, build on Solaris;
	5
	6	* build/test/eh/gcc.mak: ditto;
	7
	8	* build/Makefiles/gmake/hp-ux/targetsys.mak: cool, but HP-UX IA64
	9	use shared lib extention so, not sl as on PA-RISC;
	10
	11	* src/cxa.c: fix cxa_atexit problem for HP-UX with gcc, like on
	12	Solaris;
	13
	14	* stlport/wctype.h, stlport/stl/_cwctype.h: problem with wchars
	15	on HP-UX;
	16
	17	* src/num_get_float.cpp: no stdint.h on HP-UX; suggested by KBac.
	18
1	19	2008-01-19 Francois Dumont <dums@users.sourceforge.net>
2	20
3	21	* 5.1.5 released based on revision 3387.


6	6	# include <osreldate.h>
7	7	#endif
8	8
9		#if (defined(__FreeBSD__) && (__FreeBSD_version < 503001)) \|\| defined(__sun)
	9	#if (defined(__FreeBSD__) && (__FreeBSD_version < 503001)) \|\| defined(__sun) \|\| defined (__hpux)
10	10	/* Note: __cxa_finalize and __cxa_atexit present in libc in FreeBSD 5.3, but again absent in 6.0 */
11	11
12	12	#include <stdlib.h>
…	…
95	95	#ifdef __sun
96	96	static pthread_mutex_t lock =
97	97	{{0, 0, 0, PTHREAD_MUTEX_RECURSIVE, _MUTEX_MAGIC}, {{{0}}}, 0};
	98	#endif
	99	#ifdef __hpux
	100	static pthread_mutex_t lock = PTHREAD_MUTEX_RECURSIVE_INITIALIZER_NP;
	101	# ifdef __ia64
	102	void __dso_handle = (void ) &__dso_handle;
	103	# endif
98	104	#endif
99	105
100	106


22	22	#include <locale>
23	23	#include <istream>
24	24
25		#if defined (__GNUC__) && !defined (__sun) \|\| \
	25	#if defined (__GNUC__) && !defined (__sun) && !defined (__hpux) \|\| \
26	26	defined (__DMC__)
27	27	# include <stdint.h>
28	28	#endif


44	44	# include _STLP_NATIVE_C_HEADER(wctype.h)
45	45	# endif
46	46
47		# if defined (_STLP_IMPORT_VENDOR_CSTD)
	47	# if defined (_STLP_IMPORT_VENDOR_CSTD) && !defined (__hpux)
48	48
49	49	# if defined (_STLP_USE_GLIBC) && !(defined (_GLIBCPP_USE_WCHAR_T) \|\| defined (_GLIBCXX_USE_WCHAR_T)) \|\| \
50	50	defined (__sun) \|\| defined (__FreeBSD__) \|\| \


22	22
23	23	/* evc3 doesn't have wctype.h */
24	24	#if !defined(_STLP_WCE_EVC3) && !defined(N_PLAT_NLM)
	25	# if defined (__hpux)
	26	# include _STLP_NATIVE_C_HEADER(stdarg.h)
	27	# include _STLP_NATIVE_C_HEADER(wchar.h)
	28	# endif
25	29	# include _STLP_NATIVE_C_HEADER(wctype.h)
26	30	#endif
27	31

Commit c56b59ac6525ad090d1968e50cc1fa2c70a84b0e

Gitorious