summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorcadmic <cadmic24@gmail.com>2024-08-19 09:16:04 -0700
committerGitHub <noreply@github.com>2024-08-19 18:16:04 +0200
commitf5fd8daffb02bafff5869f181a13da48b0f3ae0e (patch)
tree32f2804fbc4f7e23f966c0778f6d41903c3ae9dd /spec
parent46a5fa919b7bb261c3a11b93fe502c6720619b52 (diff)
Use incremental link for z_message/z_game_over data shenanigans (#2051)
Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
Diffstat (limited to 'spec')
-rw-r--r--spec10
1 files changed, 4 insertions, 6 deletions
diff --git a/spec b/spec
index 2edafc4fb..9d2bc053a 100644
--- a/spec
+++ b/spec
@@ -641,12 +641,10 @@ beginseg
include "$(BUILD_DIR)/src/code/fmodf.o"
include "$(BUILD_DIR)/src/code/__osMemset.o"
include "$(BUILD_DIR)/src/code/__osMemmove.o"
- // For some reason, the data sections of these files are placed here near the
- // rodata sections of the other files
- include_data_only_within_rodata "$(BUILD_DIR)/src/code/z_message.o"
- include_data_only_within_rodata "$(BUILD_DIR)/src/code/z_game_over.o"
- include_no_data "$(BUILD_DIR)/src/code/z_message.o"
- include_no_data "$(BUILD_DIR)/src/code/z_game_over.o"
+ // For some reason, the data sections of z_message and z_game_over are
+ // placed near the rodata sections of other files, so we first build this
+ // combined object before the final link.
+ include "$(BUILD_DIR)/src/code/z_message_z_game_over.o"
include "$(BUILD_DIR)/src/code/z_construct.o"
include "$(BUILD_DIR)/data/audio_tables.rodata.o"
include "$(BUILD_DIR)/src/audio/tables/samplebank_table.o"