From d05e8fb23aa8e8c7b5ff067fd5fb68e98648e06b Mon Sep 17 00:00:00 2001 From: Michael Scire Date: Thu, 29 Apr 2021 01:04:26 -0700 Subject: [PATCH] exo: fix for newer binutils --- exosphere/loader_stub/loader_stub.specs | 5 +---- exosphere/mariko_fatal/mariko_fatal.specs | 5 +---- exosphere/program/program.specs | 2 +- exosphere/program/rebootstub/rebootstub.specs | 5 +---- exosphere/program/sc7fw/sc7fw.specs | 5 +---- exosphere/sdmmc_test/sdmmc_test.specs | 5 +---- exosphere/warmboot/warmboot.specs | 5 +---- libraries/config/templates/exosphere.mk | 2 +- 8 files changed, 8 insertions(+), 26 deletions(-) diff --git a/exosphere/loader_stub/loader_stub.specs b/exosphere/loader_stub/loader_stub.specs index 03984762f..261cffccd 100644 --- a/exosphere/loader_stub/loader_stub.specs +++ b/exosphere/loader_stub/loader_stub.specs @@ -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 \ No newline at end of file diff --git a/exosphere/mariko_fatal/mariko_fatal.specs b/exosphere/mariko_fatal/mariko_fatal.specs index e9b2e9fdf..71d294c07 100644 --- a/exosphere/mariko_fatal/mariko_fatal.specs +++ b/exosphere/mariko_fatal/mariko_fatal.specs @@ -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 \ No newline at end of file diff --git a/exosphere/program/program.specs b/exosphere/program/program.specs index 22b789960..7d174b721 100644 --- a/exosphere/program/program.specs +++ b/exosphere/program/program.specs @@ -1,4 +1,4 @@ %rename link old_link *link: -%(old_link) -T %:getenv(TOPDIR /program.ld) --gc-sections --nmagic -nostdlib -nostartfiles \ No newline at end of file +%(old_link) -T %:getenv(TOPDIR /program.ld) --gc-sections --nmagic \ No newline at end of file diff --git a/exosphere/program/rebootstub/rebootstub.specs b/exosphere/program/rebootstub/rebootstub.specs index 4e41b1615..59b3762e3 100644 --- a/exosphere/program/rebootstub/rebootstub.specs +++ b/exosphere/program/rebootstub/rebootstub.specs @@ -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 \ No newline at end of file diff --git a/exosphere/program/sc7fw/sc7fw.specs b/exosphere/program/sc7fw/sc7fw.specs index 13455dc90..6275fb4d3 100644 --- a/exosphere/program/sc7fw/sc7fw.specs +++ b/exosphere/program/sc7fw/sc7fw.specs @@ -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 \ No newline at end of file diff --git a/exosphere/sdmmc_test/sdmmc_test.specs b/exosphere/sdmmc_test/sdmmc_test.specs index 72d846e06..fdf28d6e6 100644 --- a/exosphere/sdmmc_test/sdmmc_test.specs +++ b/exosphere/sdmmc_test/sdmmc_test.specs @@ -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 \ No newline at end of file diff --git a/exosphere/warmboot/warmboot.specs b/exosphere/warmboot/warmboot.specs index 45d00560d..67747462e 100644 --- a/exosphere/warmboot/warmboot.specs +++ b/exosphere/warmboot/warmboot.specs @@ -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 \ No newline at end of file diff --git a/libraries/config/templates/exosphere.mk b/libraries/config/templates/exosphere.mk index d597c390c..6cfa8aaf0 100644 --- a/libraries/config/templates/exosphere.mk +++ b/libraries/config/templates/exosphere.mk @@ -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 \