Fix linker issue

Linker complained about ___a4_init not being defined. It was referred to by __restore_a4(). But __restore_a4() is only needed in -fbaserel builds (which is currently not enabled). Apparently, the linker would previously define __a4_init regardless of the linking method, but now removed it from non-base-relative builds, thus leading to 'missing symbol __a4_init' errors. Fix the issue by making __restore_a4() only being defined when 'FBASEREL' is defined. There might be an actual compiler-defined preprocessor symbol indicating -fbaserel builds, but I couldn't find it. FBASEREL can be searched and replaced later on, if deemed necessary.
mheyer32 · Oct 3, 2023 · 0292930 · 0292930
1 parent 26f0377
commit 0292930
Show file tree

Hide file tree

Showing 21 changed files with 62 additions and 0 deletions.
diff --git a/source/Library/libinit.c b/source/Library/libinit.c
@@ -60,10 +60,13 @@ __stdargs void exit(int status)
 }
 #endif
 
+#ifdef FBASEREL
 void __restore_a4(void)
 {
 	__asm volatile("\tlea ___a4_init, a4");
 }
+#endif
+
 
 /****************************************************************************/
 

diff --git a/source/Modules/about/init/libinit.c b/source/Modules/about/init/libinit.c
@@ -55,10 +55,13 @@ __stdargs void exit(int status)
 }
 #endif
 
+#ifdef FBASEREL
 void __restore_a4(void)
 {
 	__asm volatile("\tlea ___a4_init, a4");
 }
+#endif
+
 
 /****************************************************************************/
 

diff --git a/source/Modules/cleanup/init/libinit.c b/source/Modules/cleanup/init/libinit.c
@@ -55,10 +55,13 @@ __stdargs void exit(int status)
 }
 #endif
 
+#ifdef FBASEREL
 void __restore_a4(void)
 {
 	__asm volatile("\tlea ___a4_init, a4");
 }
+#endif
+
 
 /****************************************************************************/
 

diff --git a/source/Modules/configopus/init/libinit.c b/source/Modules/configopus/init/libinit.c
@@ -55,10 +55,13 @@ __stdargs void exit(int status)
 }
 #endif
 
+#ifdef FBASEREL
 void __restore_a4(void)
 {
 	__asm volatile("\tlea ___a4_init, a4");
 }
+#endif
+
 
 /****************************************************************************/
 

diff --git a/source/Modules/diskcopy/init/libinit.c b/source/Modules/diskcopy/init/libinit.c
@@ -55,10 +55,13 @@ __stdargs void exit(int status)
 }
 #endif
 
+#ifdef FBASEREL
 void __restore_a4(void)
 {
 	__asm volatile("\tlea ___a4_init, a4");
 }
+#endif
+
 
 /****************************************************************************/
 

diff --git a/source/Modules/diskinfo/init/libinit.c b/source/Modules/diskinfo/init/libinit.c
@@ -55,10 +55,12 @@ __stdargs void exit(int status)
 }
 #endif
 
+#ifdef FBASEREL
 void __restore_a4(void)
 {
 	__asm volatile("\tlea ___a4_init, a4");
 }
+#endif
 
 /****************************************************************************/
 

diff --git a/source/Modules/filetype/init/libinit.c b/source/Modules/filetype/init/libinit.c
@@ -55,10 +55,13 @@ __stdargs void exit(int status)
 }
 #endif
 
+#ifdef FBASEREL
 void __restore_a4(void)
 {
 	__asm volatile("\tlea ___a4_init, a4");
 }
+#endif
+
 
 /****************************************************************************/
 

diff --git a/source/Modules/fixicons/init/libinit.c b/source/Modules/fixicons/init/libinit.c
@@ -55,10 +55,13 @@ __stdargs void exit(int status)
 }
 #endif
 
+#ifdef FBASEREL
 void __restore_a4(void)
 {
 	__asm volatile("\tlea ___a4_init, a4");
 }
+#endif
+
 
 /****************************************************************************/
 

diff --git a/source/Modules/format/init/libinit.c b/source/Modules/format/init/libinit.c
@@ -55,10 +55,13 @@ __stdargs void exit(int status)
 }
 #endif
 
+#ifdef FBASEREL
 void __restore_a4(void)
 {
 	__asm volatile("\tlea ___a4_init, a4");
 }
+#endif
+
 
 /****************************************************************************/
 

diff --git a/source/Modules/ftp/init/libinit.c b/source/Modules/ftp/init/libinit.c
@@ -55,10 +55,13 @@ __stdargs void exit(int status)
 }
 #endif
 
+#ifdef FBASEREL
 void __restore_a4(void)
 {
 	__asm volatile("\tlea ___a4_init, a4");
 }
+#endif
+
 
 /****************************************************************************/
 

diff --git a/source/Modules/icon/init/libinit.c b/source/Modules/icon/init/libinit.c
@@ -57,10 +57,13 @@ void __stdargs exit(int __status)
 }
 #endif
 
+#ifdef FBASEREL
 void __restore_a4(void)
 {
 	__asm volatile("\tlea ___a4_init, a4");
 }
+#endif
+
 
 /****************************************************************************/
 

diff --git a/source/Modules/join/init/libinit.c b/source/Modules/join/init/libinit.c
@@ -57,10 +57,13 @@ __stdargs void exit(int status)
 }
 #endif
 
+#ifdef FBASEREL
 void __restore_a4(void)
 {
 	__asm volatile("\tlea ___a4_init, a4");
 }
+#endif
+
 
 /****************************************************************************/
 

diff --git a/source/Modules/listerformat/init/libinit.c b/source/Modules/listerformat/init/libinit.c
@@ -57,10 +57,13 @@ __stdargs void exit(int status)
 }
 #endif
 
+#ifdef FBASEREL
 void __restore_a4(void)
 {
 	__asm volatile("\tlea ___a4_init, a4");
 }
+#endif
+
 
 /****************************************************************************/
 

diff --git a/source/Modules/misc/init/libinit.c b/source/Modules/misc/init/libinit.c
@@ -51,10 +51,13 @@ int _start(void)  // must be first for 68k library
 }
 #endif
 
+#ifdef FBASEREL
 void __restore_a4(void)
 {
 	__asm volatile("\tlea ___a4_init, a4");
 }
+#endif
+
 
 /****************************************************************************/
 

diff --git a/source/Modules/pathformat/init/libinit.c b/source/Modules/pathformat/init/libinit.c
@@ -51,10 +51,13 @@ int _start(void)  // must be first for 68k library
 }
 #endif
 
+#ifdef FBASEREL
 void __restore_a4(void)
 {
 	__asm volatile("\tlea ___a4_init, a4");
 }
+#endif
+
 
 /****************************************************************************/
 

diff --git a/source/Modules/play/init/libinit.c b/source/Modules/play/init/libinit.c
@@ -55,10 +55,13 @@ __stdargs void exit(int status)
 }
 #endif
 
+#ifdef FBASEREL
 void __restore_a4(void)
 {
 	__asm volatile("\tlea ___a4_init, a4");
 }
+#endif
+
 
 /****************************************************************************/
 

diff --git a/source/Modules/print/init/libinit.c b/source/Modules/print/init/libinit.c
@@ -57,10 +57,13 @@ __stdargs void exit(int status)
 }
 #endif
 
+#ifdef FBASEREL
 void __restore_a4(void)
 {
 	__asm volatile("\tlea ___a4_init, a4");
 }
+#endif
+
 
 /****************************************************************************/
 

diff --git a/source/Modules/read/init/libinit.c b/source/Modules/read/init/libinit.c
@@ -57,10 +57,13 @@ __stdargs void exit(int status)
 }
 #endif
 
+#ifdef FBASEREL
 void __restore_a4(void)
 {
 	__asm volatile("\tlea ___a4_init, a4");
 }
+#endif
+
 
 /****************************************************************************/
 

diff --git a/source/Modules/show/init/libinit.c b/source/Modules/show/init/libinit.c
@@ -57,10 +57,13 @@ __stdargs void exit(int status)
 }
 #endif
 
+#ifdef FBASEREL
 void __restore_a4(void)
 {
 	__asm volatile("\tlea ___a4_init, a4");
 }
+#endif
+
 
 /****************************************************************************/
 

diff --git a/source/Modules/themes/init/libinit.c b/source/Modules/themes/init/libinit.c
@@ -57,10 +57,13 @@ __stdargs void exit(int status)
 }
 #endif
 
+#ifdef FBASEREL
 void __restore_a4(void)
 {
 	__asm volatile("\tlea ___a4_init, a4");
 }
+#endif
+
 
 /****************************************************************************/
 

diff --git a/source/Modules/xadopus/init/libinit.c b/source/Modules/xadopus/init/libinit.c
@@ -55,10 +55,13 @@ __stdargs void exit(int status)
 }
 #endif
 
+#ifdef FBASEREL
 void __restore_a4(void)
 {
 	__asm volatile("\tlea ___a4_init, a4");
 }
+#endif
+
 
 /****************************************************************************/