From af25e732c178b00668bbf442e3a82936e6a681a0 Mon Sep 17 00:00:00 2001 From: Derek Hensley Date: Tue, 20 Aug 2024 19:58:42 -0600 Subject: [PATCH] FIXUPS -> MODERN_LD --- Makefile | 12 ++++++------ README.md | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index d820ec9..401c3d4 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,8 @@ COMPARE ?= 1 -FIXUPS ?= 0 +MODERN_LD ?= 0 MODERN_GCC ?= 0 -ifneq ($(FIXUPS),0) +ifneq ($(MODERN_LD),0) COMPARE := 0 endif @@ -24,7 +24,7 @@ endif ifneq ($(MODERN_GCC),0) COMPILER := modern_gcc COMPARE := 0 -FIXUPS := 0 +MODERN_LD := 0 endif BASE_DIR := extracted/$(VERSION)/$(TARGET) @@ -188,7 +188,7 @@ ifneq ($(COMPARE),0) echo "Object file $(@F:.marker=.o) is not in the current archive" \ ) endif -ifneq ($(FIXUPS),0) +ifneq ($(MODERN_LD),0) tools/set_o32abi_bit.py $(WORKING_DIR)/$(@:.marker=.o) $(CROSS)strip $(WORKING_DIR)/$(@:.marker=.o) -N asdasdasdasd $(CROSS)objcopy --remove-section .mdebug $(WORKING_DIR)/$(@:.marker=.o) @@ -207,7 +207,7 @@ ifneq ($(COMPARE),0) echo "Object file $(@F:.marker=.o) is not in the current archive" \ ) endif -ifneq ($(FIXUPS),0) +ifneq ($(MODERN_LD),0) tools/set_o32abi_bit.py $(WORKING_DIR)/$(@:.marker=.o) $(CROSS)strip $(WORKING_DIR)/$(@:.marker=.o) -N asdasdasdasd $(CROSS)objcopy --remove-section .mdebug $(WORKING_DIR)/$(@:.marker=.o) @@ -230,7 +230,7 @@ ifneq ($(COMPARE),0) echo "Object file $(@F:.marker=.o) is not in the current archive" \ ) endif -ifneq ($(FIXUPS),0) +ifneq ($(MODERN_LD),0) tools/set_o32abi_bit.py $(WORKING_DIR)/$(@:.marker=.o) $(CROSS)strip $(WORKING_DIR)/$(@:.marker=.o) -N asdasdasdasd $(CROSS)objcopy --remove-section .mdebug $(WORKING_DIR)/$(@:.marker=.o) diff --git a/README.md b/README.md index 78714d4..8128718 100644 --- a/README.md +++ b/README.md @@ -64,15 +64,15 @@ If building without an target archive, than you can use `COMPARE=0` like the the note that running setup without `COMPARE=0` and no archive will result in an error, and only needs to be run once instead of per target flag combination -If building for use with modern linkers, than you can use `FIXUPS=1` like the the following: +If building for use with modern linkers, than you can use `MODERN_LD=1` like the following: -- `make VERSION=L TARGET=libgultra_rom FIXUPS=1 setup` -- `make VERSION=L TARGET=libgultra_rom FIXUPS=1` +- `make VERSION=L TARGET=libgultra_rom MODERN_LD=1 setup` +- `make VERSION=L TARGET=libgultra_rom MODERN_LD=1` -note that running with `FIXUPS=1` will automatically set `COMPARE=0`. +note that running with `MODERN_LD=1` will automatically set `COMPARE=0`. It is also possible to build archives using modern gcc by using `MODERN_GCC=1` like the following: - `make VERSION=L TARGET=libgultra_rom MODERN_GCC=1` -note that running with `MODERN_GCC=1` will automatically set `COMPARE=0` and `FIXUPS=0`. +note that running with `MODERN_GCC=1` will automatically set `COMPARE=0` and `MODERN_LD=0`.