Fix iOS issues caused by making symbols hidden by default

livecodefraser · livecodefraser · commit 717256d807a0 · 2015-05-25T17:18:26.000+01:00
diff --git a/engine/src/mbliphone.mm b/engine/src/mbliphone.mm
@@ -97,7 +97,7 @@ - (const char *)nativeCString
 	struct LibExport *exports;
 };
 
-void *load_module(const char *p_path)
+void *load_module(const char *p_path) __attribute__((__visibility__("default")))
 {
 	const char *t_last_component;
 	t_last_component = strrchr(p_path, '/');
@@ -135,7 +135,8 @@ - (const char *)nativeCString
 	return NULL;	
 }
 
-void *resolve_symbol(void *p_module, const char *p_symbol)
+void *resolve_symbol(void *p_module, const char *p_symbol) __attribute__((__visibility__("default")))
+
 {
 	LibInfo *t_lib;
 	t_lib = (LibInfo *)((uintptr_t)p_module & ~1);
diff --git a/engine/src/mbliphoneapp.mm b/engine/src/mbliphoneapp.mm
@@ -2009,7 +2009,7 @@ Exec_stat MCIPhoneHandleMessage(MCNameRef p_message, MCParameter *p_parameters)
 	return s;
 }
 
-int main(int argc, char *argv[], char *envp[])
+int main(int argc, char *argv[], char *envp[]) __attribute__((__visibility__("default")))
 {
 #if defined(_DEBUG) && defined(_VALGRIND)
 	if (argc < 2 ||  (argc >= 2 && strcmp(argv[1], "-valgrind") != 0))
diff --git a/revdb/src/dbmysqlapi.cpp b/revdb/src/dbmysqlapi.cpp
@@ -80,7 +80,7 @@ extern "C" {
 		__libexports
 	};
 	
-	__attribute((section("__DATA,__libs"))) volatile struct LibInfo *__libinfoptr_dbmysql = &__libinfo;
+	__attribute((section("__DATA,__libs"))) volatile struct LibInfo *__libinfoptr_dbmysql __attribute__((__visibility__("default"))) = &__libinfo;
 }
 #endif
 
diff --git a/revdb/src/dbsqliteapi.cpp b/revdb/src/dbsqliteapi.cpp
@@ -80,7 +80,7 @@ extern "C" {
 		__libexports
 	};
 	
-	__attribute((section("__DATA,__libs"))) volatile struct LibInfo *__libinfoptr_dbsqlite = &__libinfo;
+	__attribute((section("__DATA,__libs"))) volatile struct LibInfo *__libinfoptr_dbsqlite __attribute__((__visibility__("default"))) = &__libinfo;
 }
 #endif
 
diff --git a/revdb/src/revdb.cpp b/revdb/src/revdb.cpp
@@ -2423,6 +2423,6 @@ EXTERNAL_END_DECLARATIONS
 extern "C"
 {
 	extern struct LibInfo __libinfo;
-	__attribute((section("__DATA,__libs"))) volatile struct LibInfo *__libinfoptr_revdb = &__libinfo;
+	__attribute((section("__DATA,__libs"))) volatile struct LibInfo *__libinfoptr_revdb __attribute__((__visibility__("default"))) = &__libinfo;
 }
 #endif
diff --git a/revpdfprinter/src/revpdfprinter.cpp b/revpdfprinter/src/revpdfprinter.cpp
@@ -1406,7 +1406,7 @@ struct LibInfo __libinfo =
 	__libexports
 };
 
-__attribute((section("__DATA,__libs"))) volatile struct LibInfo *__libinfoptr_revpdfprinter = &__libinfo;
+__attribute((section("__DATA,__libs"))) volatile struct LibInfo *__libinfoptr_revpdfprinter __attribute__((__visibility__("default"))) = &__libinfo;
 }
 #endif
 
diff --git a/revxml/src/revxml.cpp b/revxml/src/revxml.cpp
@@ -3121,6 +3121,6 @@ BOOL WINAPI DllMain(HINSTANCE tInstance, DWORD dwReason, LPVOID lpReserved)
 extern "C"
 {
 	extern struct LibInfo __libinfo;
-	__attribute((section("__DATA,__libs"))) volatile struct LibInfo *__libinfoptr_revxml = &__libinfo;
+	__attribute((section("__DATA,__libs"))) volatile struct LibInfo *__libinfoptr_revxml __attribute__((__visibility__("default"))) = &__libinfo;
 }
 #endif
diff --git a/revzip/src/revzip.cpp b/revzip/src/revzip.cpp
@@ -1499,6 +1499,6 @@ BOOL APIENTRY DllMain( HMODULE hModule,
 extern "C"
 {
 extern struct LibInfo __libinfo;
-__attribute((section("__DATA,__libs"))) volatile struct LibInfo *__libinfoptr_revzip = &__libinfo;
+__attribute((section("__DATA,__libs"))) volatile struct LibInfo *__libinfoptr_revzip __attribute__((__visibility__("default"))) = &__libinfo;
 }
 #endif
diff --git a/util/build_libinfo.pl b/util/build_libinfo.pl
@@ -96,7 +96,7 @@ sub trim
 output "    &__libexternalname,";
 output "    __libexports";
 output "};";
-output "LibInfo *__libinfoptr_$name = &__libinfo;";
+output "LibInfo *__libinfoptr_$name __attribute__((__visibility__(\"default\"))) = &__libinfo;";
 
 sub output
 {

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ - (const char *)nativeCString`
`97`	`97`	`struct LibExport *exports;`
`98`	`98`	`};`
`99`	`99`
`100`		`-void load_module(const char p_path)`
	`100`	`+void load_module(const char p_path) __attribute__((__visibility__("default")))`
`101`	`101`	`{`
`102`	`102`	`const char *t_last_component;`
`103`	`103`	`t_last_component = strrchr(p_path, '/');`
`@@ -135,7 +135,8 @@ - (const char *)nativeCString`
`135`	`135`	`return NULL;`
`136`	`136`	`}`
`137`	`137`
`138`		`-void resolve_symbol(void p_module, const char *p_symbol)`
	`138`	`+void resolve_symbol(void p_module, const char *p_symbol) __attribute__((__visibility__("default")))`
	`139`	`+`
`139`	`140`	`{`
`140`	`141`	`LibInfo *t_lib;`
`141`	`142`	`t_lib = (LibInfo *)((uintptr_t)p_module & ~1);`
Original file line number	Diff line number	Diff line change
`@@ -2009,7 +2009,7 @@ Exec_stat MCIPhoneHandleMessage(MCNameRef p_message, MCParameter *p_parameters)`
`2009`	`2009`	`return s;`
`2010`	`2010`	`}`
`2011`	`2011`
`2012`		`-int main(int argc, char argv[], char envp[])`
	`2012`	`+int main(int argc, char argv[], char envp[]) __attribute__((__visibility__("default")))`
`2013`	`2013`	`{`
`2014`	`2014`	`#if defined(_DEBUG) && defined(_VALGRIND)`
`2015`	`2015`	`if (argc < 2 \|\| (argc >= 2 && strcmp(argv[1], "-valgrind") != 0))`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ extern "C" {`
`80`	`80`	`__libexports`
`81`	`81`	`};`
`82`	`82`
`83`		`- __attribute((section("__DATA,__libs"))) volatile struct LibInfo *__libinfoptr_dbmysql = &__libinfo;`
	`83`	`+ __attribute((section("__DATA,__libs"))) volatile struct LibInfo *__libinfoptr_dbmysql __attribute__((__visibility__("default"))) = &__libinfo;`
`84`	`84`	`}`
`85`	`85`	`#endif`
`86`	`86`
Original file line number	Diff line number	Diff line change
`@@ -2423,6 +2423,6 @@ EXTERNAL_END_DECLARATIONS`
`2423`	`2423`	`extern "C"`
`2424`	`2424`	`{`
`2425`	`2425`	`extern struct LibInfo __libinfo;`
`2426`		`- __attribute((section("__DATA,__libs"))) volatile struct LibInfo *__libinfoptr_revdb = &__libinfo;`
	`2426`	`+ __attribute((section("__DATA,__libs"))) volatile struct LibInfo *__libinfoptr_revdb __attribute__((__visibility__("default"))) = &__libinfo;`
`2427`	`2427`	`}`
`2428`	`2428`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -1406,7 +1406,7 @@ struct LibInfo __libinfo =`
`1406`	`1406`	`__libexports`
`1407`	`1407`	`};`
`1408`	`1408`
`1409`		`-__attribute((section("__DATA,__libs"))) volatile struct LibInfo *__libinfoptr_revpdfprinter = &__libinfo;`
	`1409`	`+__attribute((section("__DATA,__libs"))) volatile struct LibInfo *__libinfoptr_revpdfprinter __attribute__((__visibility__("default"))) = &__libinfo;`
`1410`	`1410`	`}`
`1411`	`1411`	`#endif`
`1412`	`1412`
Original file line number	Diff line number	Diff line change
`@@ -3121,6 +3121,6 @@ BOOL WINAPI DllMain(HINSTANCE tInstance, DWORD dwReason, LPVOID lpReserved)`
`3121`	`3121`	`extern "C"`
`3122`	`3122`	`{`
`3123`	`3123`	`extern struct LibInfo __libinfo;`
`3124`		`- __attribute((section("__DATA,__libs"))) volatile struct LibInfo *__libinfoptr_revxml = &__libinfo;`
	`3124`	`+ __attribute((section("__DATA,__libs"))) volatile struct LibInfo *__libinfoptr_revxml __attribute__((__visibility__("default"))) = &__libinfo;`
`3125`	`3125`	`}`
`3126`	`3126`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -1499,6 +1499,6 @@ BOOL APIENTRY DllMain( HMODULE hModule,`
`1499`	`1499`	`extern "C"`
`1500`	`1500`	`{`
`1501`	`1501`	`extern struct LibInfo __libinfo;`
`1502`		`-__attribute((section("__DATA,__libs"))) volatile struct LibInfo *__libinfoptr_revzip = &__libinfo;`
	`1502`	`+__attribute((section("__DATA,__libs"))) volatile struct LibInfo *__libinfoptr_revzip __attribute__((__visibility__("default"))) = &__libinfo;`
`1503`	`1503`	`}`
`1504`	`1504`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ sub trim`
`96`	`96`	`output " &__libexternalname,";`
`97`	`97`	`output " __libexports";`
`98`	`98`	`output "};";`
`99`		`-output "LibInfo *__libinfoptr_$name = &__libinfo;";`
	`99`	`+output "LibInfo *__libinfoptr_$name __attribute__((__visibility__(\"default\"))) = &__libinfo;";`
`100`	`100`
`101`	`101`	`sub output`
`102`	`102`	`{`