Added a fix for programs that have been compiled with old toolchains and

are used together with shared libs produced by newer toolchains .. they
might not have the __gmon_start__ symbol defined (e.g. neocal or hancom on
a glibc 2.3.1 iPAQ with the latest libjpeg62)

1 files changed, 6 insertions, 0 deletions

diff --git a/core/launcher/libpreload/preload.cpp b/core/launcher/libpreload/preload.cpp
index 10d8313..cc1baac 100644
--- a/core/launcher/libpreload/preload.cpp
+++ b/core/launcher/libpreload/preload.cpp
@@ -1,89 +1,95 @@
 
 #define _GNU_SOURCE
 //#define private public
 //#define protected public
 
 #include <qwsdecoration_qws.h>
 #include <qcommonstyle.h>
 
 //#include <qapplication.h>
 //#include <qfont.h>
 
 //class QStyle;
 class QApplication;
 class QFont;
 //class QWSDecoration;
 
 #include <dlfcn.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
 
 
 typedef void ( *qapp_setstyle_t ) ( QStyle * );
 typedef void ( *qapp_setdeco_t ) ( QWSDecoration * ); 
 typedef void ( *qapp_setfont_t ) ( const QFont &, bool, const char * ); 
 
 
 static int *opie_block_style_p = 0;
 
 extern "C" {
 
+extern void __gmon_start ( ) __attribute(( weak ));
+
+extern void __gmon_start__ ( ) 
+{
+}
+
 static void *resolve_symbol ( const char *sym )
 {
 	void *adr = ::dlsym ( RTLD_NEXT, sym );
 
 	if ( !adr )
 		::fprintf ( stderr, "PANIC: Could not resolve symbol \"%s\"\n", sym );
 		
 	return adr;
 }
 
 extern void setStyle__12QApplicationP6QStyle ( QStyle *style )
 {
 	static qapp_setstyle_t qsetstyle = 0;
 
 	if ( !qsetstyle )
 		qsetstyle = (qapp_setstyle_t) resolve_symbol ( "setStyle__12QApplicationP6QStyle" );
 
 	if ( !opie_block_style_p )
 		opie_block_style_p = (int *) resolve_symbol ( "opie_block_style" );
 	
 	if ( !qsetstyle || ( opie_block_style_p && ( *opie_block_style_p & 0x01 )))
 		delete style;
 	else
 		( *qsetstyle ) ( style );
 }
 
 extern void setFont__12QApplicationRC5QFontbPCc ( const QFont &fnt, bool informWidgets, const char * className )
 {
 	static qapp_setfont_t qsetfont = 0;
 
 	if ( !qsetfont )
 		qsetfont = (qapp_setfont_t) resolve_symbol ( "setFont__12QApplicationRC5QFontbPCc" );
 
 	if ( !opie_block_style_p )
 		opie_block_style_p = (int *) resolve_symbol ( "opie_block_style" );
 	
 	if ( qsetfont && !( opie_block_style_p && ( *opie_block_style_p & 0x02 )))
 		( *qsetfont ) ( fnt, informWidgets, className );
 }
 	
 
 extern void qwsSetDecoration__12QApplicationP13QWSDecoration ( QWSDecoration *deco )
 {
 	static qapp_setdeco_t qsetdeco = 0;
 
 	if ( !qsetdeco )
 		qsetdeco = (qapp_setdeco_t) resolve_symbol ( "qwsSetDecoration__12QApplicationP13QWSDecoration" );
 
 	if ( !opie_block_style_p )
 		opie_block_style_p = (int *) resolve_symbol ( "opie_block_style" );
 	
 	if ( !qsetdeco || ( opie_block_style_p && ( *opie_block_style_p & 0x04 )))
 		delete deco;
 	else
 		( *qsetdeco ) ( deco );
 }
 
 }