[PATCH 20/21] mips: libgloss: UHI linker scripts fail to link with _isr_vec_count=1
Aleksandar Rikalo <[email protected]>
| Newsgroups | gmane.comp.lib.newlib |
|---|---|
| Message-ID | <[email protected]> |
From: Faraz Shahbazker <[email protected]> This _isr_vec_count=1 is prevalent in MIPS Open FGPA examples. Looks like forcing _isr_vec_007 in to the link was a mistake and we always intended to only include the top-level _isr_vec symbol. This change has been reverted on multiple internal branches, but someone still ended up carried forward on the master. Signed-off-by: Faraz Shahbazker <[email protected]> Signed-off-by: Aleksandar Rikalo <[email protected]> --- libgloss/mips/examples/romable_predef_xip/Makefile | 2 +- libgloss/mips/uhi32.ld | 4 ++-- libgloss/mips/uhi64_64.ld | 4 ++-- libgloss/mips/uhi64_n32.ld | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libgloss/mips/examples/romable_predef_xip/Makefile b/libgloss/mips/examples/romable_predef_xip/Makefile index 995b93ef6..80318649a 100644 --- a/libgloss/mips/examples/romable_predef_xip/Makefile +++ b/libgloss/mips/examples/romable_predef_xip/Makefile @@ -81,7 +81,7 @@ CFLAGS += -g -O1 $(DEFINES) LDFLAGS += -g -Wl,--defsym,__getargs=0 -Wl,--defsym,__exception_handle_verbose=0 LDFLAGS += -Wl,--defsym,__register_excpt_boot=0 -Wl,--defsym,__exception_entry=0 LDFLAGS += -Wl,--defsym,__register_excpt_handler=0 -LDFLAGS += -Wl,--defsym,__isr_vec_007=0 -Wl,--defsym,__uhi_break=0 +LDFLAGS += -Wl,--defsym,__uhi_break=0 LDFLAGS += -Wl,--defsym,__ebase_size=0 -Wl,--defsym,__isr_vec_count=0 LDFLAGS += -Wl,--defsym,__xip=1 LDFLAGS += -nostartfiles -nostdlib diff --git a/libgloss/mips/uhi32.ld b/libgloss/mips/uhi32.ld index ae3536ead..320880d9d 100644 --- a/libgloss/mips/uhi32.ld +++ b/libgloss/mips/uhi32.ld @@ -21,8 +21,8 @@ EXTERN(__exception_entry) * informative */ EXTERN(__exception_handle_verbose) -/* Force ISRs 0-7 to be included in the link */ -EXTERN(__isr_vec_007) +/* Force ISRs to be included in the link */ +EXTERN(__isr_vec_) /* Require the UHI getargs support */ EXTERN(__getargs) /* Include the breakpoint exception handler. */ diff --git a/libgloss/mips/uhi64_64.ld b/libgloss/mips/uhi64_64.ld index e6c3bee89..ce34f72cb 100644 --- a/libgloss/mips/uhi64_64.ld +++ b/libgloss/mips/uhi64_64.ld @@ -21,8 +21,8 @@ EXTERN(__exception_entry) * informative */ EXTERN(__exception_handle_verbose) -/* Force ISRs 0-7 to be included in the link */ -EXTERN(__isr_vec_007) +/* Force ISRs to be included in the link */ +EXTERN(__isr_vec) /* Require the UHI getargs support */ EXTERN(__getargs) /* Include the breakpoint exception handler. */ diff --git a/libgloss/mips/uhi64_n32.ld b/libgloss/mips/uhi64_n32.ld index 25cdd06ca..e604fb4cf 100644 --- a/libgloss/mips/uhi64_n32.ld +++ b/libgloss/mips/uhi64_n32.ld @@ -21,8 +21,8 @@ EXTERN(__exception_entry) * informative */ EXTERN(__exception_handle_verbose) -/* Force ISRs 0-7 to be included in the link */ -EXTERN(__isr_vec_007) +/* Force ISRs to be included in the link */ +EXTERN(__isr_vec) /* Require the UHI getargs support */ EXTERN(__getargs) /* Include the breakpoint exception handler. */ -- 2.25.1