[v2,12/13] libgloss: mips: UHI linker scripts fail to link with _isr_vec_count=1

Message ID 20250402141228.1973965-13-jovan.dmitrovic@htecgroup.com
State New
Headers
Series A series of updates related to MIPS |

Commit Message

Jovan Dmitrovic April 2, 2025, 2:14 p.m. UTC
  From: Faraz Shahbazker <fshahbazker@wavecomp.com>

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.
---
 libgloss/mips/uhi32.ld     | 4 ++--
 libgloss/mips/uhi64_64.ld  | 4 ++--
 libgloss/mips/uhi64_n32.ld | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)
  

Patch

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.  */