diff --git a/.github/workflows/build_ios.yml b/.github/workflows/build_ios.yml
index b3fd0672d..075579316 100644
--- a/.github/workflows/build_ios.yml
+++ b/.github/workflows/build_ios.yml
@@ -21,7 +21,7 @@ jobs:
         id: compile
         run: |
           cd misc/ios
-          sudo xcode-select -s /Applications/Xcode_14.1.app/Contents/Developer
+          sudo xcode-select -s /Applications/Xcode_15.0.1.app/Contents/Developer
           xcodebuild -sdk iphoneos -configuration Release CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO
           cd build/Release-iphoneos
           mkdir Payload
diff --git a/Makefile b/Makefile
index 609406e49..d713fb90b 100644
--- a/Makefile
+++ b/Makefile
@@ -79,7 +79,8 @@ ifeq ($(PLAT),mingw)
 endif
 
 ifeq ($(PLAT),linux)
-	LIBS    =  -lX11 -lXi -lpthread -lGL -ldl
+	# -lm may be needed for __builtin_sqetf (in cases where it isn't replaced by a CPU instruction intrinsic)
+	LIBS    =  -lX11 -lXi -lpthread -lGL -ldl -lm
 	BUILD_DIR = build/linux
 
 	# Detect MCST LCC, where -O3 is about equivalent to -O1
diff --git a/src/gba/AsmFuncs.S b/src/gba/AsmFuncs.S
index 1423e0fd6..05bdfc4fe 100644
--- a/src/gba/AsmFuncs.S
+++ b/src/gba/AsmFuncs.S
@@ -32,8 +32,8 @@
 #define R_VAL r2 // r2 = value to fill
 
 BEG_ARM_FUNC(fastset_256_bytes)
-	// Spill callee saved registers + LR onto stack
-	stmfd sp!, {r4-r9, lr}
+	// Spill callee saved registers
+	stmfd sp!, {r4-r9}
 
 	// Clone 'value' for 'store multi CPU registers' loop
 	mov	r3, R_VAL
@@ -56,8 +56,9 @@ fastset_loop:
 	stmltia R_CUR!, {r2-r9}
 	blt fastset_loop
 
-	// Restore saved CPU registers + set PC to LR
-	ldmfd  sp!, {r4-r9, pc}
+	// Restore saved CPU registers
+	ldmfd  sp!, {r4-r9}
+	bx lr
 END_FUNC(fastset_256_bytes)