From 835aa6b9db133800e9f91b7061b84dc3ad39eb2e Mon Sep 17 00:00:00 2001 From: Michael Scire Date: Wed, 18 Nov 2020 15:07:10 -0800 Subject: [PATCH] exo: fix building on release --- exosphere/loader_stub/Makefile | 3 ++- exosphere/mariko_fatal/Makefile | 1 + exosphere/program/Makefile | 2 +- exosphere/program/rebootstub/Makefile | 1 + exosphere/program/sc7fw/Makefile | 1 + exosphere/program/source/secmon_exception_handler.cpp | 3 +++ exosphere/warmboot/Makefile | 1 + 7 files changed, 10 insertions(+), 2 deletions(-) diff --git a/exosphere/loader_stub/Makefile b/exosphere/loader_stub/Makefile index a350be583..e924eca46 100644 --- a/exosphere/loader_stub/Makefile +++ b/exosphere/loader_stub/Makefile @@ -24,6 +24,7 @@ export VPATH := $(foreach dir,$(SOURCES),$(CURDIR)/$(dir)) $(CURDIR)/include \ CFILES := $(call FIND_SOURCE_FILES,$(SOURCES),c) CPPFILES := $(call FIND_SOURCE_FILES,$(SOURCES),cpp) SFILES := $(call FIND_SOURCE_FILES,$(SOURCES),s) +BINFILES := #--------------------------------------------------------------------------------- # use CXX for linking C++ projects, CC for standard C @@ -40,7 +41,7 @@ endif #--------------------------------------------------------------------------------- export OFILES_SRC := $(CPPFILES:.cpp=.o) $(CFILES:.c=.o) $(SFILES:.s=.o) -export OFILES := $(OFILES_BIN) $(OFILES_SRC) program.lz4.o boot_code.lz4.o +export OFILES := $(OFILES_SRC) program.lz4.o boot_code.lz4.o export INCLUDE := $(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \ $(foreach dir,$(LIBDIRS),-I$(dir)/include) \ diff --git a/exosphere/mariko_fatal/Makefile b/exosphere/mariko_fatal/Makefile index cbe4860cf..c1a6e3abf 100644 --- a/exosphere/mariko_fatal/Makefile +++ b/exosphere/mariko_fatal/Makefile @@ -24,6 +24,7 @@ export VPATH := $(foreach dir,$(SOURCES),$(CURDIR)/$(dir)) $(CURDIR)/include \ CFILES := $(call FIND_SOURCE_FILES,$(SOURCES),c) CPPFILES := $(call FIND_SOURCE_FILES,$(SOURCES),cpp) SFILES := $(call FIND_SOURCE_FILES,$(SOURCES),s) +BINFILES := #--------------------------------------------------------------------------------- # use CXX for linking C++ projects, CC for standard C diff --git a/exosphere/program/Makefile b/exosphere/program/Makefile index 750b6690f..0f029acc0 100644 --- a/exosphere/program/Makefile +++ b/exosphere/program/Makefile @@ -40,7 +40,7 @@ endif #--------------------------------------------------------------------------------- export OFILES_SRC := $(CPPFILES:.cpp=.o) $(CFILES:.c=.o) $(SFILES:.s=.o) -export OFILES := $(OFILES_BIN) $(OFILES_SRC) rebootstub.bin.o sc7fw.bin.o +export OFILES := $(OFILES_SRC) rebootstub.bin.o sc7fw.bin.o export INCLUDE := $(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \ $(foreach dir,$(LIBDIRS),-I$(dir)/include) \ diff --git a/exosphere/program/rebootstub/Makefile b/exosphere/program/rebootstub/Makefile index aed4fa813..67a33cd70 100644 --- a/exosphere/program/rebootstub/Makefile +++ b/exosphere/program/rebootstub/Makefile @@ -24,6 +24,7 @@ export VPATH := $(foreach dir,$(SOURCES),$(CURDIR)/$(dir)) $(CURDIR)/include \ CFILES := $(call FIND_SOURCE_FILES,$(SOURCES),c) CPPFILES := $(call FIND_SOURCE_FILES,$(SOURCES),cpp) SFILES := $(call FIND_SOURCE_FILES,$(SOURCES),s) +BINFILES := #--------------------------------------------------------------------------------- # use CXX for linking C++ projects, CC for standard C diff --git a/exosphere/program/sc7fw/Makefile b/exosphere/program/sc7fw/Makefile index aed4fa813..67a33cd70 100644 --- a/exosphere/program/sc7fw/Makefile +++ b/exosphere/program/sc7fw/Makefile @@ -24,6 +24,7 @@ export VPATH := $(foreach dir,$(SOURCES),$(CURDIR)/$(dir)) $(CURDIR)/include \ CFILES := $(call FIND_SOURCE_FILES,$(SOURCES),c) CPPFILES := $(call FIND_SOURCE_FILES,$(SOURCES),cpp) SFILES := $(call FIND_SOURCE_FILES,$(SOURCES),s) +BINFILES := #--------------------------------------------------------------------------------- # use CXX for linking C++ projects, CC for standard C diff --git a/exosphere/program/source/secmon_exception_handler.cpp b/exosphere/program/source/secmon_exception_handler.cpp index dbf84ebd6..82f6bc31e 100644 --- a/exosphere/program/source/secmon_exception_handler.cpp +++ b/exosphere/program/source/secmon_exception_handler.cpp @@ -27,6 +27,9 @@ namespace ams::secmon { } void ExceptionHandlerImpl(uintptr_t lr, uintptr_t sp) { + /* On release config, we won't actually use the passed parameters. */ + AMS_UNUSED(lr, sp); + /* Ensure that previous logs have been flushed. */ AMS_LOG_FLUSH(); diff --git a/exosphere/warmboot/Makefile b/exosphere/warmboot/Makefile index fe070ac3e..38f82fa70 100644 --- a/exosphere/warmboot/Makefile +++ b/exosphere/warmboot/Makefile @@ -24,6 +24,7 @@ export VPATH := $(foreach dir,$(SOURCES),$(CURDIR)/$(dir)) $(CURDIR)/include \ CFILES := $(call FIND_SOURCE_FILES,$(SOURCES),c) CPPFILES := $(call FIND_SOURCE_FILES,$(SOURCES),cpp) SFILES := $(call FIND_SOURCE_FILES,$(SOURCES),s) +BINFILES := #--------------------------------------------------------------------------------- # use CXX for linking C++ projects, CC for standard C