Skip to content

Commit

Permalink
exo: fix for newer binutils
Browse files Browse the repository at this point in the history
  • Loading branch information
SciresM committed Apr 29, 2021
1 parent 0767d9f commit d05e8fb
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 26 deletions.
5 changes: 1 addition & 4 deletions exosphere/loader_stub/loader_stub.specs
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
%rename link old_link

*link:
%(old_link) -T %:getenv(TOPDIR /loader_stub.ld) --gc-sections --nmagic -nostdlib -nostartfiles

*startfile:
crti%O%s crtbegin%O%s
%(old_link) -T %:getenv(TOPDIR /loader_stub.ld) --gc-sections --nmagic
5 changes: 1 addition & 4 deletions exosphere/mariko_fatal/mariko_fatal.specs
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
%rename link old_link

*link:
%(old_link) -T %:getenv(TOPDIR /mariko_fatal.ld) --gc-sections --nmagic -nostdlib -nostartfiles

*startfile:
crti%O%s crtbegin%O%s
%(old_link) -T %:getenv(TOPDIR /mariko_fatal.ld) --gc-sections --nmagic
2 changes: 1 addition & 1 deletion exosphere/program/program.specs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%rename link old_link

*link:
%(old_link) -T %:getenv(TOPDIR /program.ld) --gc-sections --nmagic -nostdlib -nostartfiles
%(old_link) -T %:getenv(TOPDIR /program.ld) --gc-sections --nmagic
5 changes: 1 addition & 4 deletions exosphere/program/rebootstub/rebootstub.specs
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
%rename link old_link

*link:
%(old_link) -T %:getenv(TOPDIR /rebootstub.ld) --gc-sections --nmagic -nostdlib -nostartfiles

*startfile:
crti%O%s crtbegin%O%s
%(old_link) -T %:getenv(TOPDIR /rebootstub.ld) --gc-sections --nmagic
5 changes: 1 addition & 4 deletions exosphere/program/sc7fw/sc7fw.specs
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
%rename link old_link

*link:
%(old_link) -T %:getenv(TOPDIR /sc7fw.ld) --gc-sections --nmagic -nostdlib -nostartfiles

*startfile:
crti%O%s crtbegin%O%s
%(old_link) -T %:getenv(TOPDIR /sc7fw.ld) --gc-sections --nmagic
5 changes: 1 addition & 4 deletions exosphere/sdmmc_test/sdmmc_test.specs
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
%rename link old_link

*link:
%(old_link) -T %:getenv(TOPDIR /sdmmc_test.ld) --gc-sections --nmagic -nostdlib -nostartfiles

*startfile:
crti%O%s crtbegin%O%s
%(old_link) -T %:getenv(TOPDIR /sdmmc_test.ld) --gc-sections --nmagic
5 changes: 1 addition & 4 deletions exosphere/warmboot/warmboot.specs
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
%rename link old_link

*link:
%(old_link) -T %:getenv(TOPDIR /warmboot.ld) --gc-sections --nmagic -nostdlib -nostartfiles

*startfile:
crti%O%s crtbegin%O%s
%(old_link) -T %:getenv(TOPDIR /warmboot.ld) --gc-sections --nmagic
2 changes: 1 addition & 1 deletion libraries/config/templates/exosphere.mk
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ CXXFLAGS := $(CFLAGS) $(ATMOSPHERE_CXXFLAGS) -fno-use-cxa-atexit
ASFLAGS := $(ATMOSPHERE_ASFLAGS) $(SETTINGS)
endif

export LDFLAGS = -specs=$(TOPDIR)/$(notdir $(TOPDIR)).specs -fno-asynchronous-unwind-tables -fno-unwind-tables -fno-exceptions -fno-rtti -fno-use-cxa-atexit -nostdlib -nostartfiles -g $(SETTINGS) -Wl,-Map,$(notdir $*.map) -Wl,-z,relro,-z,now
export LDFLAGS = -specs=$(TOPDIR)/$(notdir $(TOPDIR)).specs -nostdlib -nostartfiles -fno-asynchronous-unwind-tables -fno-unwind-tables -fno-exceptions -fno-rtti -fno-use-cxa-atexit -nostdlib -nostartfiles -g $(SETTINGS) -Wl,-Map,$(notdir $*.map) -Wl,-z,relro,-z,now

export CXXWRAPS := -Wl,--wrap,__cxa_pure_virtual \
-Wl,--wrap,__cxa_throw \
Expand Down

0 comments on commit d05e8fb

Please sign in to comment.