Commit 0ddb4e02f92b84c812c38b0bf14a1981daa5502a

Petr Ovtchenkov (Committer)
Thu Oct 09 08:33:25 CEST 2008
Rick Weisner <rick.weisner @s…n.com> (Author)
Thu Oct 09 08:33:25 CEST 2008

Tree SHA1: 8bc0ef1
Parent SHA1: 4ecbb01 (SunPro's CC on 64-bit Solaris 10 and 11)
raw diff | raw patch

Fixes for 32-bit Solaris 10, 11, SunPro CC (SunStudio 12)

This fix build for 32-bit Solaris, IA32 arch.

Diff rendering mode:
inline
side by side


1	1	# -- makefile -- Time-stamp: <04/08/23 23:07:35 ptr>
2	2
3	3	#OPT += -xcode=pic32
4		OPT += -m64 -KPIC
	4	#OPT += -m64 -KPIC
	5	OPT += -KPIC
5	6
6	7	dbg-shared: LDFLAGS += -G -Qoption ld -z,initfirst -h$(SO_NAME_DBGxx) ${LDSEARCH} ${NOSTDLIB}
7	8	stldbg-shared: LDFLAGS += -G -Qoption ld -z,initfirst -h$(SO_NAME_STLDBGxx) ${LDSEARCH} ${NOSTDLIB}


2	2
3	3	SRCROOT := ../..
4	4	COMPILER_NAME := CC
5		OPT= -m64 -xO2
	5	#OPT= -m64 -xO2
	6	OPT= -xO2
6	7
7	8	ALL_TAGS := release-shared stldbg-shared
8	9	STLPORT_DIR := ../../..


1		2008-10-08 Petr Ovtchenkov <complement@users.sourceforge.net>
	1	2008-10-09 Petr Ovtchenkov <complement@users.sourceforge.net>
2	2
3		* Repository: support 64-bit Solaris 10 and 11 with SunPro's
4		CC; derived from patch #2152319, thanks Rick Weisner.
	3	* Repository: support 32-bit and 64-bit Solaris 10 and 11
	4	with SunPro's CC (SunStudio 12); derived from patch #2152319,
	5	thanks Rick Weisner.
5	6
6	7	2008-10-07 Petr Ovtchenkov <complement@users.sourceforge.net>
7	8


24	24
25	25	#ifndef _STLP_STDIO_FILE_H
26	26	#define _STLP_STDIO_FILE_H
	27	# if defined(__SunOS_5_10) \|\| defined(__SunOS_5_11)
	28	# if !defined(__amd64) && !defined(__sparcv9)
	29	# include <stdio.h>
	30	# endif
	31	# endif
27	32
28	33	// This file provides a low-level interface between the internal
29	34	// representation of struct FILE, from the C stdio library, and
…	…
124	124	typedef unsigned char* _File_ptr_type;
125	125	#endif
126	126
	127	#if (defined(__SunOS_5_10) \|\| defined(__SunOS_5_11)) && (!defined(__amd64) && !defined(__sparcv9))
	128	inline int _FILE_fd(const FILE __f) { return fileno((FILE )__f); }
	129	#else
127	130	inline int _FILE_fd(const FILE *__f) { return __f->_file; }
	131	#endif
128	132	inline char* _FILE_I_begin(const FILE __f) { return (char) __f->_base; }
129	133	inline char* _FILE_I_next(const FILE __f) { return (char) __f->_ptr; }
130	134	inline char* _FILE_I_end(const FILE *__f)


25	25	#endif
26	26
27	27	#if defined(SunOS_5_11) \|\| defined(__SunOS_5_10)
28		#include <stdlib.h>
	28	# if defined(__amd64) \|\| defined(__sparcv9)
	29	# include <stdlib.h>
	30	# endif
29	31	#endif
30	32
31	33	#include <fstream>


23	23
24	24	#ifndef _STLP_INTERNAL_THREADS_H
25	25	#define _STLP_INTERNAL_THREADS_H
	26
26	27	#if defined(__SunOS_5_11) \|\| defined(__SunOS_5_10)
27		typedef unsigned long size_t;
	28	# include <sys/types.h>
28	29	#endif
29	30
30	31	// Supported threading models are native SGI, pthreads, uithreads
…	…
193	193	# elif defined(_STLP_AMD_SOLARIS_THREADS)
194	194	# include <atomic.h>
195	195
196		inline __stl_atomic_t stlp_atomic_increment(volatile __stl_atomic_t* __ptr) { atomic_inc_ulong(__ptr); return(*__ptr);}
	196	inline __stl_atomic_t stlp_atomic_increment(volatile __stl_atomic_t* __ptr) { atomic_inc_ulong((unsigned long)__ptr); return(__ptr);}
197	197	# define _STLP_ATOMIC_INCREMENT(__pvalue1) stlp_atomic_increment(__pvalue1)
198	198
199		inline __stl_atomic_t stlp_atomic_decrement(volatile __stl_atomic_t* __ptr) { atomic_dec_ulong(__ptr); return(*__ptr);}
	199	inline __stl_atomic_t stlp_atomic_decrement(volatile __stl_atomic_t* __ptr) { atomic_dec_ulong((unsigned long )__ptr); return(__ptr);}
200	200	# define _STLP_ATOMIC_DECREMENT(__pvalue1) stlp_atomic_decrement(__pvalue1)
201	201
202		inline __stl_atomic_t stlp_atomic_exchange(volatile __stl_atomic_t* __target, __stl_atomic_t __val) {atomic_swap_ulong(__target,__val); return *__target;}
	202	inline __stl_atomic_t stlp_atomic_exchange(volatile __stl_atomic_t* __target, __stl_atomic_t __val) {atomic_swap_ulong((unsigned long )__target,(unsigned long)__val); return __target;}
203	203	# define _STLP_ATOMIC_EXCHANGE(__pvalue1, __value2) stlp_atomic_exchange(__pvalue1,__value2)
204	204
205	205	# elif defined (_STLP_UITHREADS)

Commit 0ddb4e02f92b84c812c38b0bf14a1981daa5502a

Gitorious