Attachment #13481 for issue #25252

View | Details | Raw Unified | Return to issue 25252
Collapse All | Expand All

Lines 117-125 Link Here

(-)vcl/unx/source/app/makefile.mk (-3 / +1 lines)
117	.ENDIF	117	.ENDIF
118		118
119	.IF "$(OS)$(CPU)" == "SOLARISS"	119	.IF "$(OS)$(CPU)" == "SOLARISS"
120	.IF "$(COM)"!="GCC"
121	SLOFILES+=$(SLO)$/getfpsols.obj	120	SLOFILES+=$(SLO)$/getfpsols.obj
122	.ENDIF # "$(COM)"!="GCC"
123	.ELIF "$(OS)$(CPU)" == "SOLARISI"	121	.ELIF "$(OS)$(CPU)" == "SOLARISI"
124	SLOFILES+=$(SLO)$/getfpsoli.obj	122	SLOFILES+=$(SLO)$/getfpsoli.obj
125	.ENDIF	123	.ENDIF
Lines 144-148 Link Here
144		142
145		143
146	$(SLO)$/%.obj: %.s	144	$(SLO)$/%.obj: %.s
147	CC -c -o $(@:s/.obj/.o/) $< && touch $@	145	$(CC) -c -o $(@:s/.obj/.o/) $< && touch $@
148		146




}
#endif

#if defined(SOLARIS)
extern "C" void* sal_getFP();
#elif defined(NETBSD) && defined(SPARC)
inline void* sal_getFP()
{
	volatile void* fp = NULL;
	__asm__ __volatile ("st %%fp, %0\n" : "=m"(fp) );
	return fp;
}
#else
extern "C" void* sal_getFP();
#endif
#elif (defined LINUX && defined INTEL) || defined FREEBSD
inline void* sal_getFP()
{

	ByteString aRet;
	char buffer[ 256 ];

/* a macro PC is defined under Solaris gcc *
 * see /usr/include/sys/reg.h              */
#ifdef PC
#undef PC
#endif
	void* PC = getPC( pFrame );
#if !defined(MACOSX)
	Dl_info aInfo;

Return to issue 25252

Lines 107-123 Link Here

(-)vcl/unx/source/app/stacktrace.cxx (-5 / +8 lines)
107	}	107	}
108	#endif	108	#endif
109		109
110	#if defined SOLARIS \|\| ( defined(NETBSD) && defined(SPARC) )	110	#if defined(SOLARIS)
111	#ifdef GCC	111	extern "C" void* sal_getFP();
		112	#elif defined(NETBSD) && defined(SPARC)
112	inline void* sal_getFP()	113	inline void* sal_getFP()
113	{	114	{
114	volatile void* fp = NULL;	115	volatile void* fp = NULL;
115	__asm__ __volatile ("st %%fp, %0\n" : "=m"(fp) );	116	__asm__ __volatile ("st %%fp, %0\n" : "=m"(fp) );
116	return fp;	117	return fp;
117	}	118	}
118	#else
119	extern "C" void* sal_getFP();
120	#endif
121	#elif (defined LINUX && defined INTEL) \|\| defined FREEBSD	119	#elif (defined LINUX && defined INTEL) \|\| defined FREEBSD
122	inline void* sal_getFP()	120	inline void* sal_getFP()
123	{	121	{
Lines 181-186 Link Here
181	ByteString aRet;	179	ByteString aRet;
182	char buffer[ 256 ];	180	char buffer[ 256 ];
183		181
		182	/* a macro PC is defined under Solaris gcc *
		183	* see /usr/include/sys/reg.h */
		184	#ifdef PC
		185	#undef PC
		186	#endif
184	void* PC = getPC( pFrame );	187	void* PC = getPC( pFrame );
185	#if !defined(MACOSX)	188	#if !defined(MACOSX)
186	Dl_info aInfo;	189	Dl_info aInfo;