automatic import of golangopeneuler24.03_LTS_SP1

7 files changed, 143 insertions, 139 deletions

diff --git a/.gitignore b/.gitignore
index 691f81d..550fa0f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /go1.23.7.src.tar.gz
+/go1.24.2.src.tar.gz
diff --git a/0001-fix-asan_test-test-case-failure.patch b/0001-fix-asan_test-test-case-failure.patch
index 7be7622..770f8ee 100644
--- a/0001-fix-asan_test-test-case-failure.patch
+++ b/0001-fix-asan_test-test-case-failure.patch
@@ -1,34 +1,41 @@
-From 1faef79341243aa0c8eafedc6d5d9c10e039fdf4 Mon Sep 17 00:00:00 2001
+From a6bc103443fd9b222cb6bc4865ca17a168f9419d Mon Sep 17 00:00:00 2001
 From: hanchao <hanchao63@huawei.com>
-Date: Thu, 20 Feb 2025 10:15:20 +0800
+Date: Thu, 17 Apr 2025 20:42:00 +0800
 Subject: [PATCH] fix asan_test test case failure
 
-gcc has merged some patches which caused skip failure, now in repairing
+Co-authored-by: Suyun <ziyu.oerv@isrc.iscas.ac.cn>
 ---
  src/cmd/cgo/internal/testsanitizers/asan_test.go | 3 +++
  1 file changed, 3 insertions(+)
 
 diff --git a/src/cmd/cgo/internal/testsanitizers/asan_test.go b/src/cmd/cgo/internal/testsanitizers/asan_test.go
-index 7db3562..b2cd19b 100644
+index 19810aafb6..43be6c9cb8 100644
 --- a/src/cmd/cgo/internal/testsanitizers/asan_test.go
 +++ b/src/cmd/cgo/internal/testsanitizers/asan_test.go
-@@ -15,6 +15,8 @@ import (
+@@ -17,6 +17,7 @@ import (
  )
  
  func TestASAN(t *testing.T) {
 +	t.Skipf("gcc has merged some patches which caused skip failure, now in repairing")
-+
- 	testenv.MustHaveGoBuild(t)
- 	testenv.MustHaveCGO(t)
- 	goos, err := goEnv("GOOS")
-@@ -106,6 +108,7 @@ func TestASAN(t *testing.T) {
+ 	config := mustHaveASAN(t)
+ 
+ 	t.Parallel()
+@@ -83,6 +84,7 @@ func TestASAN(t *testing.T) {
  }
  
  func TestASANLinkerX(t *testing.T) {
 +	t.Skipf("gcc has merged some patches which caused skip failure, now in repairing")
- 	testenv.MustHaveGoBuild(t)
- 	testenv.MustHaveCGO(t)
  	// Test ASAN with linker's -X flag (see issue 56175).
+ 	config := mustHaveASAN(t)
+ 
+@@ -108,6 +110,7 @@ func TestASANLinkerX(t *testing.T) {
+ 
+ // Issue 66966.
+ func TestASANFuzz(t *testing.T) {
++	t.Skipf("gcc has merged some patches which caused skip failure, now in repairing")
+ 	config := mustHaveASAN(t)
+ 
+ 	t.Parallel()
 -- 
-2.33.0
+2.49.0
 
diff --git a/1000-all-implement-plugin-build-mode-for-riscv64.patch b/1000-all-implement-plugin-build-mode-for-riscv64.patch
index be28f8f..5b30f76 100644
--- a/1000-all-implement-plugin-build-mode-for-riscv64.patch
+++ b/1000-all-implement-plugin-build-mode-for-riscv64.patch
@@ -1,4 +1,4 @@
-From 3adb57d3e689f0c3da7a26df52e9218afb18d94f Mon Sep 17 00:00:00 2001
+From cdc95607940b2acb66cb184dec08d4cc8a469042 Mon Sep 17 00:00:00 2001
 From: Meng Zhuo <mengzhuo1203@gmail.com>
 Date: Thu, 12 Sep 2024 20:15:56 +0800
 Subject: [PATCH] all: implement plugin build mode for riscv64
@@ -18,10 +18,10 @@ TryBot-Bypass: Joel Sing <joel@sing.id.au>
  5 files changed, 152 insertions(+), 3 deletions(-)
 
 diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go
-index 0ffcabe416..b1e3929113 100644
+index b137c7db7990bd..6199dbbb93cdcc 100644
 --- a/src/cmd/dist/test.go
 +++ b/src/cmd/dist/test.go
-@@ -1659,7 +1659,7 @@ func buildModeSupported(compiler, buildmode, goos, goarch string) bool {
+@@ -1767,7 +1767,7 @@ func buildModeSupported(compiler, buildmode, goos, goarch string) bool {
  
  	case "plugin":
  		switch platform {
@@ -31,10 +31,10 @@ index 0ffcabe416..b1e3929113 100644
  			"darwin/amd64", "darwin/arm64",
  			"freebsd/amd64":
 diff --git a/src/cmd/internal/obj/riscv/obj.go b/src/cmd/internal/obj/riscv/obj.go
-index 2055f4836e..44a2246e1f 100644
+index 3a4ab556f7df2b..c41d99c0c7a659 100644
 --- a/src/cmd/internal/obj/riscv/obj.go
 +++ b/src/cmd/internal/obj/riscv/obj.go
-@@ -177,6 +177,127 @@ func progedit(ctxt *obj.Link, p *obj.Prog, newprog obj.ProgAlloc) {
+@@ -157,6 +157,127 @@ func progedit(ctxt *obj.Link, p *obj.Prog, newprog obj.ProgAlloc) {
  			p.From.Offset = 0
  		}
  	}
@@ -163,7 +163,7 @@ index 2055f4836e..44a2246e1f 100644
  
  // addrToReg extracts the register from an Addr, handling special Addr.Names.
 diff --git a/src/cmd/link/internal/riscv64/asm.go b/src/cmd/link/internal/riscv64/asm.go
-index 6a4dd01240..a9583d21aa 100644
+index 8e5d5be41ec0dd..527f09e17c7dba 100644
 --- a/src/cmd/link/internal/riscv64/asm.go
 +++ b/src/cmd/link/internal/riscv64/asm.go
 @@ -20,7 +20,26 @@ import (
@@ -195,10 +195,10 @@ index 6a4dd01240..a9583d21aa 100644
  func findHI20Reloc(ldr *loader.Loader, s loader.Sym, val int64) *loader.Reloc {
  	outer := ldr.OuterSym(s)
 diff --git a/src/internal/platform/supported.go b/src/internal/platform/supported.go
-index a774247e6b..bad1a6c9c4 100644
+index e864c37d6897d4..702a255e4cd928 100644
 --- a/src/internal/platform/supported.go
 +++ b/src/internal/platform/supported.go
-@@ -207,7 +207,7 @@ func BuildModeSupported(compiler, buildmode, goos, goarch string) bool {
+@@ -208,7 +208,7 @@ func BuildModeSupported(compiler, buildmode, goos, goarch string) bool {
  
  	case "plugin":
  		switch platform {
@@ -208,10 +208,10 @@ index a774247e6b..bad1a6c9c4 100644
  			"darwin/amd64", "darwin/arm64",
  			"freebsd/amd64":
 diff --git a/src/runtime/asm_riscv64.s b/src/runtime/asm_riscv64.s
-index 491635b1cf..231564aca2 100644
+index ef654a3a229e09..71b32304d7b0ae 100644
 --- a/src/runtime/asm_riscv64.s
 +++ b/src/runtime/asm_riscv64.s
-@@ -542,6 +542,15 @@ TEXT runtime·goexit(SB),NOSPLIT|NOFRAME|TOPFRAME,$0-0
+@@ -541,6 +541,15 @@ TEXT runtime·goexit(SB),NOSPLIT|NOFRAME|TOPFRAME,$0-0
  	// traceback from goexit1 must hit code range of goexit
  	MOV	ZERO, ZERO	// NOP
  
@@ -227,6 +227,3 @@ index 491635b1cf..231564aca2 100644
  // func cgocallback(fn, frame unsafe.Pointer, ctxt uintptr)
  // See cgocall.go for more details.
  TEXT ·cgocallback(SB),NOSPLIT,$24-24
--- 
-2.48.1.windows.1
-
diff --git a/1001-cmd-link-cmd-internal-add-R_GOT_PCREL_ITYPE_RELOC-fo.patch b/1001-cmd-link-cmd-internal-add-R_GOT_PCREL_ITYPE_RELOC-fo.patch
index bc42caf..cbd691b 100644
--- a/1001-cmd-link-cmd-internal-add-R_GOT_PCREL_ITYPE_RELOC-fo.patch
+++ b/1001-cmd-link-cmd-internal-add-R_GOT_PCREL_ITYPE_RELOC-fo.patch
@@ -1,4 +1,4 @@
-From 94dcbbcb6dc39b6a3c7c686580cab81be567dc7f Mon Sep 17 00:00:00 2001
+From 371ee1469cf30ecdbc8d1b55cf307a310ff3d630 Mon Sep 17 00:00:00 2001
 From: Meng Zhuo <mengzhuo1203@gmail.com>
 Date: Thu, 12 Sep 2024 20:03:59 +0800
 Subject: [PATCH] cmd/link,cmd/internal: add R_GOT_PCREL_ITYPE_RELOC for
@@ -24,17 +24,17 @@ Reviewed-by: Cherry Mui <cherryyz@google.com>
 LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
 ---
  src/cmd/internal/obj/riscv/cpu.go           |  5 ++
- src/cmd/internal/obj/riscv/obj.go           |  9 +++-
+ src/cmd/internal/obj/riscv/obj.go           |  9 ++-
  src/cmd/internal/objabi/reloctype.go        |  4 ++
- src/cmd/internal/objabi/reloctype_string.go | 55 +++++++++++----------
+ src/cmd/internal/objabi/reloctype_string.go | 61 +++++++++++----------
  src/cmd/link/internal/riscv64/asm.go        | 19 +++++--
- 5 files changed, 59 insertions(+), 33 deletions(-)
+ 5 files changed, 62 insertions(+), 36 deletions(-)
 
 diff --git a/src/cmd/internal/obj/riscv/cpu.go b/src/cmd/internal/obj/riscv/cpu.go
-index 43ed3bc1f0..a7e2c49a42 100644
+index 69a85166968648..2b75ed38a62611 100644
 --- a/src/cmd/internal/obj/riscv/cpu.go
 +++ b/src/cmd/internal/obj/riscv/cpu.go
-@@ -283,6 +283,11 @@ const (
+@@ -317,6 +317,11 @@ const (
  	// it is the first instruction in an AUIPC + S-type pair that needs a
  	// R_RISCV_PCREL_STYPE relocation.
  	NEED_PCREL_STYPE_RELOC
@@ -47,10 +47,10 @@ index 43ed3bc1f0..a7e2c49a42 100644
  
  // RISC-V mnemonics, as defined in the "opcodes" and "opcodes-pseudo" files
 diff --git a/src/cmd/internal/obj/riscv/obj.go b/src/cmd/internal/obj/riscv/obj.go
-index 44a2246e1f..96772a85f0 100644
+index 381dc085608644..54c34af2f4a97c 100644
 --- a/src/cmd/internal/obj/riscv/obj.go
 +++ b/src/cmd/internal/obj/riscv/obj.go
-@@ -365,11 +365,15 @@ func markRelocs(p *obj.Prog) {
+@@ -215,11 +215,15 @@ func markRelocs(p *obj.Prog) {
  			switch p.From.Name {
  			case obj.NAME_EXTERN, obj.NAME_STATIC:
  				p.Mark |= NEED_PCREL_ITYPE_RELOC
@@ -66,7 +66,7 @@ index 44a2246e1f..96772a85f0 100644
  			}
  		case p.From.Type == obj.TYPE_REG && p.To.Type == obj.TYPE_MEM:
  			switch p.To.Name {
-@@ -2323,7 +2327,7 @@ func instructionsForMOV(p *obj.Prog) []*instruction {
+@@ -2203,7 +2207,7 @@ func instructionsForMOV(p *obj.Prog) []*instruction {
  			// MOV c(Rs), Rd -> L $c, Rs, Rd
  			inss = instructionsForLoad(p, movToLoad(p.As), addrToReg(p.From))
  
@@ -75,7 +75,7 @@ index 44a2246e1f..96772a85f0 100644
  			if p.From.Sym.Type == objabi.STLSBSS {
  				return instructionsForTLSLoad(p)
  			}
-@@ -2707,6 +2711,9 @@ func assemble(ctxt *obj.Link, cursym *obj.LSym, newprog obj.ProgAlloc) {
+@@ -2631,6 +2635,9 @@ func assemble(ctxt *obj.Link, cursym *obj.LSym, newprog obj.ProgAlloc) {
  			} else if p.Mark&NEED_PCREL_STYPE_RELOC == NEED_PCREL_STYPE_RELOC {
  				rt = objabi.R_RISCV_PCREL_STYPE
  				addr = &p.To
@@ -86,7 +86,7 @@ index 44a2246e1f..96772a85f0 100644
  				break
  			}
 diff --git a/src/cmd/internal/objabi/reloctype.go b/src/cmd/internal/objabi/reloctype.go
-index 8b9927d6eb..587c792742 100644
+index 9106b085ea7d02..8e9bee508224b2 100644
 --- a/src/cmd/internal/objabi/reloctype.go
 +++ b/src/cmd/internal/objabi/reloctype.go
 @@ -291,6 +291,10 @@ const (
@@ -101,16 +101,10 @@ index 8b9927d6eb..587c792742 100644
  	// address.
  	R_RISCV_PCREL_HI20
 diff --git a/src/cmd/internal/objabi/reloctype_string.go b/src/cmd/internal/objabi/reloctype_string.go
-index 6d8cbb5dd2..6a9abe6796 100644
+index fd0e401db1e277..2d8a9554eb5c94 100644
 --- a/src/cmd/internal/objabi/reloctype_string.go
 +++ b/src/cmd/internal/objabi/reloctype_string.go
-@@ -1,4 +1,4 @@
--// Code generated by "stringer -type=RelocType"; DO NOT EDIT.
-+// Code generated by "stringer -type=RelocType .\reloctype.go"; DO NOT EDIT.
- 
- package objabi
- 
-@@ -75,35 +75,36 @@ func _() {
+@@ -75,39 +75,40 @@ func _() {
  	_ = x[R_RISCV_TLS_IE-65]
  	_ = x[R_RISCV_TLS_LE-66]
  	_ = x[R_RISCV_GOT_HI20-67]
@@ -130,14 +124,18 @@ index 6d8cbb5dd2..6a9abe6796 100644
 -	_ = x[R_LOONG64_TLS_IE_LO-81]
 -	_ = x[R_LOONG64_GOT_HI-82]
 -	_ = x[R_LOONG64_GOT_LO-83]
--	_ = x[R_JMPLOONG64-84]
--	_ = x[R_ADDRMIPSU-85]
--	_ = x[R_ADDRMIPSTLS-86]
--	_ = x[R_ADDRCUOFF-87]
--	_ = x[R_WASMIMPORT-88]
--	_ = x[R_XCOFFREF-89]
--	_ = x[R_PEIMAGEOFF-90]
--	_ = x[R_INITORDER-91]
+-	_ = x[R_LOONG64_ADD64-84]
+-	_ = x[R_LOONG64_SUB64-85]
+-	_ = x[R_JMP16LOONG64-86]
+-	_ = x[R_JMP21LOONG64-87]
+-	_ = x[R_JMPLOONG64-88]
+-	_ = x[R_ADDRMIPSU-89]
+-	_ = x[R_ADDRMIPSTLS-90]
+-	_ = x[R_ADDRCUOFF-91]
+-	_ = x[R_WASMIMPORT-92]
+-	_ = x[R_XCOFFREF-93]
+-	_ = x[R_PEIMAGEOFF-94]
+-	_ = x[R_INITORDER-95]
 +	_ = x[R_RISCV_GOT_PCREL_ITYPE-68]
 +	_ = x[R_RISCV_PCREL_HI20-69]
 +	_ = x[R_RISCV_PCREL_LO12_I-70]
@@ -155,29 +153,33 @@ index 6d8cbb5dd2..6a9abe6796 100644
 +	_ = x[R_LOONG64_TLS_IE_LO-82]
 +	_ = x[R_LOONG64_GOT_HI-83]
 +	_ = x[R_LOONG64_GOT_LO-84]
-+	_ = x[R_JMPLOONG64-85]
-+	_ = x[R_ADDRMIPSU-86]
-+	_ = x[R_ADDRMIPSTLS-87]
-+	_ = x[R_ADDRCUOFF-88]
-+	_ = x[R_WASMIMPORT-89]
-+	_ = x[R_XCOFFREF-90]
-+	_ = x[R_PEIMAGEOFF-91]
-+	_ = x[R_INITORDER-92]
++	_ = x[R_LOONG64_ADD64-85]
++	_ = x[R_LOONG64_SUB64-86]
++	_ = x[R_JMP16LOONG64-87]
++	_ = x[R_JMP21LOONG64-88]
++	_ = x[R_JMPLOONG64-89]
++	_ = x[R_ADDRMIPSU-90]
++	_ = x[R_ADDRMIPSTLS-91]
++	_ = x[R_ADDRCUOFF-92]
++	_ = x[R_WASMIMPORT-93]
++	_ = x[R_XCOFFREF-94]
++	_ = x[R_PEIMAGEOFF-95]
++	_ = x[R_INITORDER-96]
  }
  
--const _RelocType_name = "R_ADDRR_ADDRPOWERR_ADDRARM64R_ADDRMIPSR_ADDROFFR_SIZER_CALLR_CALLARMR_CALLARM64R_CALLINDR_CALLPOWERR_CALLMIPSR_CONSTR_PCRELR_TLS_LER_TLS_IER_GOTOFFR_PLT0R_PLT1R_PLT2R_USEFIELDR_USETYPER_USEIFACER_USEIFACEMETHODR_USENAMEDMETHODR_METHODOFFR_KEEPR_POWER_TOCR_GOTPCRELR_JMPMIPSR_DWARFSECREFR_DWARFFILEREFR_ARM64_TLS_LER_ARM64_TLS_IER_ARM64_GOTPCRELR_ARM64_GOTR_ARM64_PCRELR_ARM64_PCREL_LDST8R_ARM64_PCREL_LDST16R_ARM64_PCREL_LDST32R_ARM64_PCREL_LDST64R_ARM64_LDST8R_ARM64_LDST16R_ARM64_LDST32R_ARM64_LDST64R_ARM64_LDST128R_POWER_TLS_LER_POWER_TLS_IER_POWER_TLSR_POWER_TLS_IE_PCREL34R_POWER_TLS_LE_TPREL34R_ADDRPOWER_DSR_ADDRPOWER_GOTR_ADDRPOWER_GOT_PCREL34R_ADDRPOWER_PCRELR_ADDRPOWER_TOCRELR_ADDRPOWER_TOCREL_DSR_ADDRPOWER_D34R_ADDRPOWER_PCREL34R_RISCV_JALR_RISCV_JAL_TRAMPR_RISCV_CALLR_RISCV_PCREL_ITYPER_RISCV_PCREL_STYPER_RISCV_TLS_IER_RISCV_TLS_LER_RISCV_GOT_HI20R_RISCV_PCREL_HI20R_RISCV_PCREL_LO12_IR_RISCV_PCREL_LO12_SR_RISCV_BRANCHR_RISCV_RVC_BRANCHR_RISCV_RVC_JUMPR_PCRELDBLR_LOONG64_ADDR_HIR_LOONG64_ADDR_LOR_LOONG64_TLS_LE_HIR_LOONG64_TLS_LE_LOR_CALLLOONG64R_LOONG64_TLS_IE_HIR_LOONG64_TLS_IE_LOR_LOONG64_GOT_HIR_LOONG64_GOT_LOR_JMPLOONG64R_ADDRMIPSUR_ADDRMIPSTLSR_ADDRCUOFFR_WASMIMPORTR_XCOFFREFR_PEIMAGEOFFR_INITORDER"
-+const _RelocType_name = "R_ADDRR_ADDRPOWERR_ADDRARM64R_ADDRMIPSR_ADDROFFR_SIZER_CALLR_CALLARMR_CALLARM64R_CALLINDR_CALLPOWERR_CALLMIPSR_CONSTR_PCRELR_TLS_LER_TLS_IER_GOTOFFR_PLT0R_PLT1R_PLT2R_USEFIELDR_USETYPER_USEIFACER_USEIFACEMETHODR_USENAMEDMETHODR_METHODOFFR_KEEPR_POWER_TOCR_GOTPCRELR_JMPMIPSR_DWARFSECREFR_DWARFFILEREFR_ARM64_TLS_LER_ARM64_TLS_IER_ARM64_GOTPCRELR_ARM64_GOTR_ARM64_PCRELR_ARM64_PCREL_LDST8R_ARM64_PCREL_LDST16R_ARM64_PCREL_LDST32R_ARM64_PCREL_LDST64R_ARM64_LDST8R_ARM64_LDST16R_ARM64_LDST32R_ARM64_LDST64R_ARM64_LDST128R_POWER_TLS_LER_POWER_TLS_IER_POWER_TLSR_POWER_TLS_IE_PCREL34R_POWER_TLS_LE_TPREL34R_ADDRPOWER_DSR_ADDRPOWER_GOTR_ADDRPOWER_GOT_PCREL34R_ADDRPOWER_PCRELR_ADDRPOWER_TOCRELR_ADDRPOWER_TOCREL_DSR_ADDRPOWER_D34R_ADDRPOWER_PCREL34R_RISCV_JALR_RISCV_JAL_TRAMPR_RISCV_CALLR_RISCV_PCREL_ITYPER_RISCV_PCREL_STYPER_RISCV_TLS_IER_RISCV_TLS_LER_RISCV_GOT_HI20R_RISCV_GOT_PCREL_ITYPER_RISCV_PCREL_HI20R_RISCV_PCREL_LO12_IR_RISCV_PCREL_LO12_SR_RISCV_BRANCHR_RISCV_RVC_BRANCHR_RISCV_RVC_JUMPR_PCRELDBLR_LOONG64_ADDR_HIR_LOONG64_ADDR_LOR_LOONG64_TLS_LE_HIR_LOONG64_TLS_LE_LOR_CALLLOONG64R_LOONG64_TLS_IE_HIR_LOONG64_TLS_IE_LOR_LOONG64_GOT_HIR_LOONG64_GOT_LOR_JMPLOONG64R_ADDRMIPSUR_ADDRMIPSTLSR_ADDRCUOFFR_WASMIMPORTR_XCOFFREFR_PEIMAGEOFFR_INITORDER"
+-const _RelocType_name = "R_ADDRR_ADDRPOWERR_ADDRARM64R_ADDRMIPSR_ADDROFFR_SIZER_CALLR_CALLARMR_CALLARM64R_CALLINDR_CALLPOWERR_CALLMIPSR_CONSTR_PCRELR_TLS_LER_TLS_IER_GOTOFFR_PLT0R_PLT1R_PLT2R_USEFIELDR_USETYPER_USEIFACER_USEIFACEMETHODR_USENAMEDMETHODR_METHODOFFR_KEEPR_POWER_TOCR_GOTPCRELR_JMPMIPSR_DWARFSECREFR_DWARFFILEREFR_ARM64_TLS_LER_ARM64_TLS_IER_ARM64_GOTPCRELR_ARM64_GOTR_ARM64_PCRELR_ARM64_PCREL_LDST8R_ARM64_PCREL_LDST16R_ARM64_PCREL_LDST32R_ARM64_PCREL_LDST64R_ARM64_LDST8R_ARM64_LDST16R_ARM64_LDST32R_ARM64_LDST64R_ARM64_LDST128R_POWER_TLS_LER_POWER_TLS_IER_POWER_TLSR_POWER_TLS_IE_PCREL34R_POWER_TLS_LE_TPREL34R_ADDRPOWER_DSR_ADDRPOWER_GOTR_ADDRPOWER_GOT_PCREL34R_ADDRPOWER_PCRELR_ADDRPOWER_TOCRELR_ADDRPOWER_TOCREL_DSR_ADDRPOWER_D34R_ADDRPOWER_PCREL34R_RISCV_JALR_RISCV_JAL_TRAMPR_RISCV_CALLR_RISCV_PCREL_ITYPER_RISCV_PCREL_STYPER_RISCV_TLS_IER_RISCV_TLS_LER_RISCV_GOT_HI20R_RISCV_PCREL_HI20R_RISCV_PCREL_LO12_IR_RISCV_PCREL_LO12_SR_RISCV_BRANCHR_RISCV_RVC_BRANCHR_RISCV_RVC_JUMPR_PCRELDBLR_LOONG64_ADDR_HIR_LOONG64_ADDR_LOR_LOONG64_TLS_LE_HIR_LOONG64_TLS_LE_LOR_CALLLOONG64R_LOONG64_TLS_IE_HIR_LOONG64_TLS_IE_LOR_LOONG64_GOT_HIR_LOONG64_GOT_LOR_LOONG64_ADD64R_LOONG64_SUB64R_JMP16LOONG64R_JMP21LOONG64R_JMPLOONG64R_ADDRMIPSUR_ADDRMIPSTLSR_ADDRCUOFFR_WASMIMPORTR_XCOFFREFR_PEIMAGEOFFR_INITORDER"
++const _RelocType_name = "R_ADDRR_ADDRPOWERR_ADDRARM64R_ADDRMIPSR_ADDROFFR_SIZER_CALLR_CALLARMR_CALLARM64R_CALLINDR_CALLPOWERR_CALLMIPSR_CONSTR_PCRELR_TLS_LER_TLS_IER_GOTOFFR_PLT0R_PLT1R_PLT2R_USEFIELDR_USETYPER_USEIFACER_USEIFACEMETHODR_USENAMEDMETHODR_METHODOFFR_KEEPR_POWER_TOCR_GOTPCRELR_JMPMIPSR_DWARFSECREFR_DWARFFILEREFR_ARM64_TLS_LER_ARM64_TLS_IER_ARM64_GOTPCRELR_ARM64_GOTR_ARM64_PCRELR_ARM64_PCREL_LDST8R_ARM64_PCREL_LDST16R_ARM64_PCREL_LDST32R_ARM64_PCREL_LDST64R_ARM64_LDST8R_ARM64_LDST16R_ARM64_LDST32R_ARM64_LDST64R_ARM64_LDST128R_POWER_TLS_LER_POWER_TLS_IER_POWER_TLSR_POWER_TLS_IE_PCREL34R_POWER_TLS_LE_TPREL34R_ADDRPOWER_DSR_ADDRPOWER_GOTR_ADDRPOWER_GOT_PCREL34R_ADDRPOWER_PCRELR_ADDRPOWER_TOCRELR_ADDRPOWER_TOCREL_DSR_ADDRPOWER_D34R_ADDRPOWER_PCREL34R_RISCV_JALR_RISCV_JAL_TRAMPR_RISCV_CALLR_RISCV_PCREL_ITYPER_RISCV_PCREL_STYPER_RISCV_TLS_IER_RISCV_TLS_LER_RISCV_GOT_HI20R_RISCV_GOT_PCREL_ITYPER_RISCV_PCREL_HI20R_RISCV_PCREL_LO12_IR_RISCV_PCREL_LO12_SR_RISCV_BRANCHR_RISCV_RVC_BRANCHR_RISCV_RVC_JUMPR_PCRELDBLR_LOONG64_ADDR_HIR_LOONG64_ADDR_LOR_LOONG64_TLS_LE_HIR_LOONG64_TLS_LE_LOR_CALLLOONG64R_LOONG64_TLS_IE_HIR_LOONG64_TLS_IE_LOR_LOONG64_GOT_HIR_LOONG64_GOT_LOR_LOONG64_ADD64R_LOONG64_SUB64R_JMP16LOONG64R_JMP21LOONG64R_JMPLOONG64R_ADDRMIPSUR_ADDRMIPSTLSR_ADDRCUOFFR_WASMIMPORTR_XCOFFREFR_PEIMAGEOFFR_INITORDER"
  
--var _RelocType_index = [...]uint16{0, 6, 17, 28, 38, 47, 53, 59, 68, 79, 88, 99, 109, 116, 123, 131, 139, 147, 153, 159, 165, 175, 184, 194, 210, 226, 237, 243, 254, 264, 273, 286, 300, 314, 328, 344, 355, 368, 387, 407, 427, 447, 460, 474, 488, 502, 517, 531, 545, 556, 578, 600, 614, 629, 652, 669, 687, 708, 723, 742, 753, 770, 782, 801, 820, 834, 848, 864, 882, 902, 922, 936, 954, 970, 980, 997, 1014, 1033, 1052, 1065, 1084, 1103, 1119, 1135, 1147, 1158, 1171, 1182, 1194, 1204, 1216, 1227}
-+var _RelocType_index = [...]uint16{0, 6, 17, 28, 38, 47, 53, 59, 68, 79, 88, 99, 109, 116, 123, 131, 139, 147, 153, 159, 165, 175, 184, 194, 210, 226, 237, 243, 254, 264, 273, 286, 300, 314, 328, 344, 355, 368, 387, 407, 427, 447, 460, 474, 488, 502, 517, 531, 545, 556, 578, 600, 614, 629, 652, 669, 687, 708, 723, 742, 753, 770, 782, 801, 820, 834, 848, 864, 887, 905, 925, 945, 959, 977, 993, 1003, 1020, 1037, 1056, 1075, 1088, 1107, 1126, 1142, 1158, 1170, 1181, 1194, 1205, 1217, 1227, 1239, 1250}
+-var _RelocType_index = [...]uint16{0, 6, 17, 28, 38, 47, 53, 59, 68, 79, 88, 99, 109, 116, 123, 131, 139, 147, 153, 159, 165, 175, 184, 194, 210, 226, 237, 243, 254, 264, 273, 286, 300, 314, 328, 344, 355, 368, 387, 407, 427, 447, 460, 474, 488, 502, 517, 531, 545, 556, 578, 600, 614, 629, 652, 669, 687, 708, 723, 742, 753, 770, 782, 801, 820, 834, 848, 864, 882, 902, 922, 936, 954, 970, 980, 997, 1014, 1033, 1052, 1065, 1084, 1103, 1119, 1135, 1150, 1165, 1179, 1193, 1205, 1216, 1229, 1240, 1252, 1262, 1274, 1285}
++var _RelocType_index = [...]uint16{0, 6, 17, 28, 38, 47, 53, 59, 68, 79, 88, 99, 109, 116, 123, 131, 139, 147, 153, 159, 165, 175, 184, 194, 210, 226, 237, 243, 254, 264, 273, 286, 300, 314, 328, 344, 355, 368, 387, 407, 427, 447, 460, 474, 488, 502, 517, 531, 545, 556, 578, 600, 614, 629, 652, 669, 687, 708, 723, 742, 753, 770, 782, 801, 820, 834, 848, 864, 887, 905, 925, 945, 959, 977, 993, 1003, 1020, 1037, 1056, 1075, 1088, 1107, 1126, 1142, 1158, 1173, 1188, 1202, 1216, 1228, 1239, 1252, 1263, 1275, 1285, 1297, 1308}
  
  func (i RelocType) String() string {
  	i -= 1
 diff --git a/src/cmd/link/internal/riscv64/asm.go b/src/cmd/link/internal/riscv64/asm.go
-index a9583d21aa..81644ea3b6 100644
+index a3f50dc54fe22d..8e5d5be41ec0dd 100644
 --- a/src/cmd/link/internal/riscv64/asm.go
 +++ b/src/cmd/link/internal/riscv64/asm.go
-@@ -189,8 +189,11 @@ func genSymsLate(ctxt *ld.Link, ldr *loader.Loader) {
+@@ -170,8 +170,11 @@ func genSymsLate(ctxt *ld.Link, ldr *loader.Loader) {
  		relocs := ldr.Relocs(s)
  		for ri := 0; ri < relocs.Count(); ri++ {
  			r := relocs.At(ri)
@@ -190,8 +192,8 @@ index a9583d21aa..81644ea3b6 100644
 +				r.Type() != objabi.R_RISCV_GOT_PCREL_ITYPE {
  				continue
  			}
- 			if r.Off() == 0 && ldr.SymType(s) == sym.STEXT {
-@@ -252,7 +255,11 @@ func elfreloc1(ctxt *ld.Link, out *ld.OutBuf, ldr *loader.Loader, s loader.Sym,
+ 			if r.Off() == 0 && ldr.SymType(s).IsText() {
+@@ -233,7 +236,11 @@ func elfreloc1(ctxt *ld.Link, out *ld.OutBuf, ldr *loader.Loader, s loader.Sym,
  		out.Write64(uint64(elf.R_RISCV_JAL) | uint64(elfsym)<<32)
  		out.Write64(uint64(r.Xadd))
  
@@ -204,7 +206,7 @@ index a9583d21aa..81644ea3b6 100644
  		// Find the text symbol for the AUIPC instruction targeted
  		// by this relocation.
  		relocs := ldr.Relocs(s)
-@@ -281,6 +288,8 @@ func elfreloc1(ctxt *ld.Link, out *ld.OutBuf, ldr *loader.Loader, s loader.Sym,
+@@ -262,6 +269,8 @@ func elfreloc1(ctxt *ld.Link, out *ld.OutBuf, ldr *loader.Loader, s loader.Sym,
  			hiRel, loRel = elf.R_RISCV_PCREL_HI20, elf.R_RISCV_PCREL_LO12_S
  		case objabi.R_RISCV_TLS_IE:
  			hiRel, loRel = elf.R_RISCV_TLS_GOT_HI20, elf.R_RISCV_PCREL_LO12_I
@@ -213,7 +215,7 @@ index a9583d21aa..81644ea3b6 100644
  		}
  		out.Write64(uint64(sectoff))
  		out.Write64(uint64(hiRel) | uint64(elfsym)<<32)
-@@ -445,7 +454,7 @@ func archreloc(target *ld.Target, ldr *loader.Loader, syms *ld.ArchSyms, r loade
+@@ -426,7 +435,7 @@ func archreloc(target *ld.Target, ldr *loader.Loader, syms *ld.ArchSyms, r loade
  		case objabi.R_RISCV_JAL, objabi.R_RISCV_JAL_TRAMP:
  			return val, 1, true
  
@@ -222,7 +224,7 @@ index a9583d21aa..81644ea3b6 100644
  			return val, 2, true
  		}
  
-@@ -645,7 +654,7 @@ func extreloc(target *ld.Target, ldr *loader.Loader, r loader.Reloc, s loader.Sy
+@@ -626,7 +635,7 @@ func extreloc(target *ld.Target, ldr *loader.Loader, r loader.Reloc, s loader.Sy
  	case objabi.R_RISCV_JAL, objabi.R_RISCV_JAL_TRAMP:
  		return ld.ExtrelocSimple(ldr, r), true
  
@@ -231,6 +233,3 @@ index a9583d21aa..81644ea3b6 100644
  		return ld.ExtrelocViaOuterSym(ldr, r, s), true
  	}
  	return loader.ExtReloc{}, false
--- 
-2.48.1.windows.1
-
diff --git a/1002-cmd-compile-don-t-merge-symbols-on-riscv64-when-dyna.patch b/1002-cmd-compile-don-t-merge-symbols-on-riscv64-when-dyna.patch
index 010f3ea..4819b92 100644
--- a/1002-cmd-compile-don-t-merge-symbols-on-riscv64-when-dyna.patch
+++ b/1002-cmd-compile-don-t-merge-symbols-on-riscv64-when-dyna.patch
@@ -1,4 +1,4 @@
-From f11737fca5ac7ec43bbd25c07bae6faa6319cddc Mon Sep 17 00:00:00 2001
+From 215de81513286c010951624243c2923f7dc79675 Mon Sep 17 00:00:00 2001
 From: Meng Zhuo <mengzhuo1203@gmail.com>
 Date: Thu, 12 Sep 2024 19:46:20 +0800
 Subject: [PATCH] cmd/compile: don't merge symbols on riscv64 when dynamic
@@ -21,10 +21,10 @@ Reviewed-by: Cherry Mui <cherryyz@google.com>
  2 files changed, 115 insertions(+), 121 deletions(-)
 
 diff --git a/src/cmd/compile/internal/ssa/_gen/RISCV64.rules b/src/cmd/compile/internal/ssa/_gen/RISCV64.rules
-index c2df433315..00d0d91b46 100644
+index 9ae96043810cfd..a69df619a576c6 100644
 --- a/src/cmd/compile/internal/ssa/_gen/RISCV64.rules
 +++ b/src/cmd/compile/internal/ssa/_gen/RISCV64.rules
-@@ -271,65 +271,29 @@
+@@ -270,65 +270,29 @@
  
  // We need to fold MOVaddr into the LD/MOVDstore ops so that the live variable analysis
  // knows what variables are being read/written by the ops.
@@ -114,10 +114,10 @@ index c2df433315..00d0d91b46 100644
  // Similarly, fold ADDI into MOVaddr to avoid confusing live variable analysis
  // with OffPtr -> ADDI.
 diff --git a/src/cmd/compile/internal/ssa/rewriteRISCV64.go b/src/cmd/compile/internal/ssa/rewriteRISCV64.go
-index f033b25bdd..9243702508 100644
+index aa44ab311e92af..3a044b5c9d2602 100644
 --- a/src/cmd/compile/internal/ssa/rewriteRISCV64.go
 +++ b/src/cmd/compile/internal/ssa/rewriteRISCV64.go
-@@ -3870,8 +3870,10 @@ func rewriteValueRISCV64_OpRISCV64FSUBS(v *Value) bool {
+@@ -4008,8 +4008,10 @@ func rewriteValueRISCV64_OpRISCV64FSUBS(v *Value) bool {
  func rewriteValueRISCV64_OpRISCV64MOVBUload(v *Value) bool {
  	v_1 := v.Args[1]
  	v_0 := v.Args[0]
@@ -129,7 +129,7 @@ index f033b25bdd..9243702508 100644
  	// result: (MOVBUload [off1+off2] {mergeSym(sym1,sym2)} base mem)
  	for {
  		off1 := auxIntToInt32(v.AuxInt)
-@@ -3883,7 +3885,7 @@ func rewriteValueRISCV64_OpRISCV64MOVBUload(v *Value) bool {
+@@ -4021,7 +4023,7 @@ func rewriteValueRISCV64_OpRISCV64MOVBUload(v *Value) bool {
  		sym2 := auxToSym(v_0.Aux)
  		base := v_0.Args[0]
  		mem := v_1
@@ -138,7 +138,7 @@ index f033b25bdd..9243702508 100644
  			break
  		}
  		v.reset(OpRISCV64MOVBUload)
-@@ -4177,8 +4179,10 @@ func rewriteValueRISCV64_OpRISCV64MOVBUreg(v *Value) bool {
+@@ -4315,8 +4317,10 @@ func rewriteValueRISCV64_OpRISCV64MOVBUreg(v *Value) bool {
  func rewriteValueRISCV64_OpRISCV64MOVBload(v *Value) bool {
  	v_1 := v.Args[1]
  	v_0 := v.Args[0]
@@ -150,7 +150,7 @@ index f033b25bdd..9243702508 100644
  	// result: (MOVBload [off1+off2] {mergeSym(sym1,sym2)} base mem)
  	for {
  		off1 := auxIntToInt32(v.AuxInt)
-@@ -4190,7 +4194,7 @@ func rewriteValueRISCV64_OpRISCV64MOVBload(v *Value) bool {
+@@ -4328,7 +4332,7 @@ func rewriteValueRISCV64_OpRISCV64MOVBload(v *Value) bool {
  		sym2 := auxToSym(v_0.Aux)
  		base := v_0.Args[0]
  		mem := v_1
@@ -159,7 +159,7 @@ index f033b25bdd..9243702508 100644
  			break
  		}
  		v.reset(OpRISCV64MOVBload)
-@@ -4303,8 +4307,10 @@ func rewriteValueRISCV64_OpRISCV64MOVBstore(v *Value) bool {
+@@ -4441,8 +4445,10 @@ func rewriteValueRISCV64_OpRISCV64MOVBstore(v *Value) bool {
  	v_2 := v.Args[2]
  	v_1 := v.Args[1]
  	v_0 := v.Args[0]
@@ -171,7 +171,7 @@ index f033b25bdd..9243702508 100644
  	// result: (MOVBstore [off1+off2] {mergeSym(sym1,sym2)} base val mem)
  	for {
  		off1 := auxIntToInt32(v.AuxInt)
-@@ -4317,7 +4323,7 @@ func rewriteValueRISCV64_OpRISCV64MOVBstore(v *Value) bool {
+@@ -4455,7 +4461,7 @@ func rewriteValueRISCV64_OpRISCV64MOVBstore(v *Value) bool {
  		base := v_0.Args[0]
  		val := v_1
  		mem := v_2
@@ -180,7 +180,7 @@ index f033b25bdd..9243702508 100644
  			break
  		}
  		v.reset(OpRISCV64MOVBstore)
-@@ -4471,9 +4477,11 @@ func rewriteValueRISCV64_OpRISCV64MOVBstore(v *Value) bool {
+@@ -4609,9 +4615,11 @@ func rewriteValueRISCV64_OpRISCV64MOVBstore(v *Value) bool {
  func rewriteValueRISCV64_OpRISCV64MOVBstorezero(v *Value) bool {
  	v_1 := v.Args[1]
  	v_0 := v.Args[0]
@@ -195,7 +195,7 @@ index f033b25bdd..9243702508 100644
  	for {
  		off1 := auxIntToInt32(v.AuxInt)
  		sym1 := auxToSym(v.Aux)
-@@ -4482,20 +4490,20 @@ func rewriteValueRISCV64_OpRISCV64MOVBstorezero(v *Value) bool {
+@@ -4620,20 +4628,20 @@ func rewriteValueRISCV64_OpRISCV64MOVBstorezero(v *Value) bool {
  		}
  		off2 := auxIntToInt32(v_0.AuxInt)
  		sym2 := auxToSym(v_0.Aux)
@@ -221,7 +221,7 @@ index f033b25bdd..9243702508 100644
  	for {
  		off1 := auxIntToInt32(v.AuxInt)
  		sym := auxToSym(v.Aux)
-@@ -4503,7 +4511,7 @@ func rewriteValueRISCV64_OpRISCV64MOVBstorezero(v *Value) bool {
+@@ -4641,7 +4649,7 @@ func rewriteValueRISCV64_OpRISCV64MOVBstorezero(v *Value) bool {
  			break
  		}
  		off2 := auxIntToInt64(v_0.AuxInt)
@@ -230,7 +230,7 @@ index f033b25bdd..9243702508 100644
  		mem := v_1
  		if !(is32Bit(int64(off1) + off2)) {
  			break
-@@ -4511,7 +4519,7 @@ func rewriteValueRISCV64_OpRISCV64MOVBstorezero(v *Value) bool {
+@@ -4649,7 +4657,7 @@ func rewriteValueRISCV64_OpRISCV64MOVBstorezero(v *Value) bool {
  		v.reset(OpRISCV64MOVBstorezero)
  		v.AuxInt = int32ToAuxInt(off1 + int32(off2))
  		v.Aux = symToAux(sym)
@@ -239,7 +239,7 @@ index f033b25bdd..9243702508 100644
  		return true
  	}
  	return false
-@@ -4519,8 +4527,10 @@ func rewriteValueRISCV64_OpRISCV64MOVBstorezero(v *Value) bool {
+@@ -4657,8 +4665,10 @@ func rewriteValueRISCV64_OpRISCV64MOVBstorezero(v *Value) bool {
  func rewriteValueRISCV64_OpRISCV64MOVDload(v *Value) bool {
  	v_1 := v.Args[1]
  	v_0 := v.Args[0]
@@ -251,7 +251,7 @@ index f033b25bdd..9243702508 100644
  	// result: (MOVDload [off1+off2] {mergeSym(sym1,sym2)} base mem)
  	for {
  		off1 := auxIntToInt32(v.AuxInt)
-@@ -4532,7 +4542,7 @@ func rewriteValueRISCV64_OpRISCV64MOVDload(v *Value) bool {
+@@ -4670,7 +4680,7 @@ func rewriteValueRISCV64_OpRISCV64MOVDload(v *Value) bool {
  		sym2 := auxToSym(v_0.Aux)
  		base := v_0.Args[0]
  		mem := v_1
@@ -260,7 +260,7 @@ index f033b25bdd..9243702508 100644
  			break
  		}
  		v.reset(OpRISCV64MOVDload)
-@@ -4599,8 +4609,10 @@ func rewriteValueRISCV64_OpRISCV64MOVDstore(v *Value) bool {
+@@ -4737,8 +4747,10 @@ func rewriteValueRISCV64_OpRISCV64MOVDstore(v *Value) bool {
  	v_2 := v.Args[2]
  	v_1 := v.Args[1]
  	v_0 := v.Args[0]
@@ -272,7 +272,7 @@ index f033b25bdd..9243702508 100644
  	// result: (MOVDstore [off1+off2] {mergeSym(sym1,sym2)} base val mem)
  	for {
  		off1 := auxIntToInt32(v.AuxInt)
-@@ -4613,7 +4625,7 @@ func rewriteValueRISCV64_OpRISCV64MOVDstore(v *Value) bool {
+@@ -4751,7 +4763,7 @@ func rewriteValueRISCV64_OpRISCV64MOVDstore(v *Value) bool {
  		base := v_0.Args[0]
  		val := v_1
  		mem := v_2
@@ -281,7 +281,7 @@ index f033b25bdd..9243702508 100644
  			break
  		}
  		v.reset(OpRISCV64MOVDstore)
-@@ -4665,9 +4677,11 @@ func rewriteValueRISCV64_OpRISCV64MOVDstore(v *Value) bool {
+@@ -4803,9 +4815,11 @@ func rewriteValueRISCV64_OpRISCV64MOVDstore(v *Value) bool {
  func rewriteValueRISCV64_OpRISCV64MOVDstorezero(v *Value) bool {
  	v_1 := v.Args[1]
  	v_0 := v.Args[0]
@@ -296,7 +296,7 @@ index f033b25bdd..9243702508 100644
  	for {
  		off1 := auxIntToInt32(v.AuxInt)
  		sym1 := auxToSym(v.Aux)
-@@ -4676,20 +4690,20 @@ func rewriteValueRISCV64_OpRISCV64MOVDstorezero(v *Value) bool {
+@@ -4814,20 +4828,20 @@ func rewriteValueRISCV64_OpRISCV64MOVDstorezero(v *Value) bool {
  		}
  		off2 := auxIntToInt32(v_0.AuxInt)
  		sym2 := auxToSym(v_0.Aux)
@@ -322,7 +322,7 @@ index f033b25bdd..9243702508 100644
  	for {
  		off1 := auxIntToInt32(v.AuxInt)
  		sym := auxToSym(v.Aux)
-@@ -4697,7 +4711,7 @@ func rewriteValueRISCV64_OpRISCV64MOVDstorezero(v *Value) bool {
+@@ -4835,7 +4849,7 @@ func rewriteValueRISCV64_OpRISCV64MOVDstorezero(v *Value) bool {
  			break
  		}
  		off2 := auxIntToInt64(v_0.AuxInt)
@@ -331,7 +331,7 @@ index f033b25bdd..9243702508 100644
  		mem := v_1
  		if !(is32Bit(int64(off1) + off2)) {
  			break
-@@ -4705,7 +4719,7 @@ func rewriteValueRISCV64_OpRISCV64MOVDstorezero(v *Value) bool {
+@@ -4843,7 +4857,7 @@ func rewriteValueRISCV64_OpRISCV64MOVDstorezero(v *Value) bool {
  		v.reset(OpRISCV64MOVDstorezero)
  		v.AuxInt = int32ToAuxInt(off1 + int32(off2))
  		v.Aux = symToAux(sym)
@@ -340,7 +340,7 @@ index f033b25bdd..9243702508 100644
  		return true
  	}
  	return false
-@@ -4713,8 +4727,10 @@ func rewriteValueRISCV64_OpRISCV64MOVDstorezero(v *Value) bool {
+@@ -4851,8 +4865,10 @@ func rewriteValueRISCV64_OpRISCV64MOVDstorezero(v *Value) bool {
  func rewriteValueRISCV64_OpRISCV64MOVHUload(v *Value) bool {
  	v_1 := v.Args[1]
  	v_0 := v.Args[0]
@@ -352,7 +352,7 @@ index f033b25bdd..9243702508 100644
  	// result: (MOVHUload [off1+off2] {mergeSym(sym1,sym2)} base mem)
  	for {
  		off1 := auxIntToInt32(v.AuxInt)
-@@ -4726,7 +4742,7 @@ func rewriteValueRISCV64_OpRISCV64MOVHUload(v *Value) bool {
+@@ -4864,7 +4880,7 @@ func rewriteValueRISCV64_OpRISCV64MOVHUload(v *Value) bool {
  		sym2 := auxToSym(v_0.Aux)
  		base := v_0.Args[0]
  		mem := v_1
@@ -361,7 +361,7 @@ index f033b25bdd..9243702508 100644
  			break
  		}
  		v.reset(OpRISCV64MOVHUload)
-@@ -4877,8 +4893,10 @@ func rewriteValueRISCV64_OpRISCV64MOVHUreg(v *Value) bool {
+@@ -5015,8 +5031,10 @@ func rewriteValueRISCV64_OpRISCV64MOVHUreg(v *Value) bool {
  func rewriteValueRISCV64_OpRISCV64MOVHload(v *Value) bool {
  	v_1 := v.Args[1]
  	v_0 := v.Args[0]
@@ -373,7 +373,7 @@ index f033b25bdd..9243702508 100644
  	// result: (MOVHload [off1+off2] {mergeSym(sym1,sym2)} base mem)
  	for {
  		off1 := auxIntToInt32(v.AuxInt)
-@@ -4890,7 +4908,7 @@ func rewriteValueRISCV64_OpRISCV64MOVHload(v *Value) bool {
+@@ -5028,7 +5046,7 @@ func rewriteValueRISCV64_OpRISCV64MOVHload(v *Value) bool {
  		sym2 := auxToSym(v_0.Aux)
  		base := v_0.Args[0]
  		mem := v_1
@@ -382,7 +382,7 @@ index f033b25bdd..9243702508 100644
  			break
  		}
  		v.reset(OpRISCV64MOVHload)
-@@ -5047,8 +5065,10 @@ func rewriteValueRISCV64_OpRISCV64MOVHstore(v *Value) bool {
+@@ -5185,8 +5203,10 @@ func rewriteValueRISCV64_OpRISCV64MOVHstore(v *Value) bool {
  	v_2 := v.Args[2]
  	v_1 := v.Args[1]
  	v_0 := v.Args[0]
@@ -394,7 +394,7 @@ index f033b25bdd..9243702508 100644
  	// result: (MOVHstore [off1+off2] {mergeSym(sym1,sym2)} base val mem)
  	for {
  		off1 := auxIntToInt32(v.AuxInt)
-@@ -5061,7 +5081,7 @@ func rewriteValueRISCV64_OpRISCV64MOVHstore(v *Value) bool {
+@@ -5199,7 +5219,7 @@ func rewriteValueRISCV64_OpRISCV64MOVHstore(v *Value) bool {
  		base := v_0.Args[0]
  		val := v_1
  		mem := v_2
@@ -403,7 +403,7 @@ index f033b25bdd..9243702508 100644
  			break
  		}
  		v.reset(OpRISCV64MOVHstore)
-@@ -5181,9 +5201,11 @@ func rewriteValueRISCV64_OpRISCV64MOVHstore(v *Value) bool {
+@@ -5319,9 +5339,11 @@ func rewriteValueRISCV64_OpRISCV64MOVHstore(v *Value) bool {
  func rewriteValueRISCV64_OpRISCV64MOVHstorezero(v *Value) bool {
  	v_1 := v.Args[1]
  	v_0 := v.Args[0]
@@ -418,7 +418,7 @@ index f033b25bdd..9243702508 100644
  	for {
  		off1 := auxIntToInt32(v.AuxInt)
  		sym1 := auxToSym(v.Aux)
-@@ -5192,20 +5214,20 @@ func rewriteValueRISCV64_OpRISCV64MOVHstorezero(v *Value) bool {
+@@ -5330,20 +5352,20 @@ func rewriteValueRISCV64_OpRISCV64MOVHstorezero(v *Value) bool {
  		}
  		off2 := auxIntToInt32(v_0.AuxInt)
  		sym2 := auxToSym(v_0.Aux)
@@ -444,7 +444,7 @@ index f033b25bdd..9243702508 100644
  	for {
  		off1 := auxIntToInt32(v.AuxInt)
  		sym := auxToSym(v.Aux)
-@@ -5213,7 +5235,7 @@ func rewriteValueRISCV64_OpRISCV64MOVHstorezero(v *Value) bool {
+@@ -5351,7 +5373,7 @@ func rewriteValueRISCV64_OpRISCV64MOVHstorezero(v *Value) bool {
  			break
  		}
  		off2 := auxIntToInt64(v_0.AuxInt)
@@ -453,7 +453,7 @@ index f033b25bdd..9243702508 100644
  		mem := v_1
  		if !(is32Bit(int64(off1) + off2)) {
  			break
-@@ -5221,7 +5243,7 @@ func rewriteValueRISCV64_OpRISCV64MOVHstorezero(v *Value) bool {
+@@ -5359,7 +5381,7 @@ func rewriteValueRISCV64_OpRISCV64MOVHstorezero(v *Value) bool {
  		v.reset(OpRISCV64MOVHstorezero)
  		v.AuxInt = int32ToAuxInt(off1 + int32(off2))
  		v.Aux = symToAux(sym)
@@ -462,7 +462,7 @@ index f033b25bdd..9243702508 100644
  		return true
  	}
  	return false
-@@ -5229,8 +5251,10 @@ func rewriteValueRISCV64_OpRISCV64MOVHstorezero(v *Value) bool {
+@@ -5367,8 +5389,10 @@ func rewriteValueRISCV64_OpRISCV64MOVHstorezero(v *Value) bool {
  func rewriteValueRISCV64_OpRISCV64MOVWUload(v *Value) bool {
  	v_1 := v.Args[1]
  	v_0 := v.Args[0]
@@ -474,7 +474,7 @@ index f033b25bdd..9243702508 100644
  	// result: (MOVWUload [off1+off2] {mergeSym(sym1,sym2)} base mem)
  	for {
  		off1 := auxIntToInt32(v.AuxInt)
-@@ -5242,7 +5266,7 @@ func rewriteValueRISCV64_OpRISCV64MOVWUload(v *Value) bool {
+@@ -5380,7 +5404,7 @@ func rewriteValueRISCV64_OpRISCV64MOVWUload(v *Value) bool {
  		sym2 := auxToSym(v_0.Aux)
  		base := v_0.Args[0]
  		mem := v_1
@@ -483,7 +483,7 @@ index f033b25bdd..9243702508 100644
  			break
  		}
  		v.reset(OpRISCV64MOVWUload)
-@@ -5417,8 +5441,10 @@ func rewriteValueRISCV64_OpRISCV64MOVWUreg(v *Value) bool {
+@@ -5555,8 +5579,10 @@ func rewriteValueRISCV64_OpRISCV64MOVWUreg(v *Value) bool {
  func rewriteValueRISCV64_OpRISCV64MOVWload(v *Value) bool {
  	v_1 := v.Args[1]
  	v_0 := v.Args[0]
@@ -495,7 +495,7 @@ index f033b25bdd..9243702508 100644
  	// result: (MOVWload [off1+off2] {mergeSym(sym1,sym2)} base mem)
  	for {
  		off1 := auxIntToInt32(v.AuxInt)
-@@ -5430,7 +5456,7 @@ func rewriteValueRISCV64_OpRISCV64MOVWload(v *Value) bool {
+@@ -5568,7 +5594,7 @@ func rewriteValueRISCV64_OpRISCV64MOVWload(v *Value) bool {
  		sym2 := auxToSym(v_0.Aux)
  		base := v_0.Args[0]
  		mem := v_1
@@ -504,7 +504,7 @@ index f033b25bdd..9243702508 100644
  			break
  		}
  		v.reset(OpRISCV64MOVWload)
-@@ -5741,8 +5767,10 @@ func rewriteValueRISCV64_OpRISCV64MOVWstore(v *Value) bool {
+@@ -5879,8 +5905,10 @@ func rewriteValueRISCV64_OpRISCV64MOVWstore(v *Value) bool {
  	v_2 := v.Args[2]
  	v_1 := v.Args[1]
  	v_0 := v.Args[0]
@@ -516,7 +516,7 @@ index f033b25bdd..9243702508 100644
  	// result: (MOVWstore [off1+off2] {mergeSym(sym1,sym2)} base val mem)
  	for {
  		off1 := auxIntToInt32(v.AuxInt)
-@@ -5755,7 +5783,7 @@ func rewriteValueRISCV64_OpRISCV64MOVWstore(v *Value) bool {
+@@ -5893,7 +5921,7 @@ func rewriteValueRISCV64_OpRISCV64MOVWstore(v *Value) bool {
  		base := v_0.Args[0]
  		val := v_1
  		mem := v_2
@@ -525,7 +525,7 @@ index f033b25bdd..9243702508 100644
  			break
  		}
  		v.reset(OpRISCV64MOVWstore)
-@@ -5841,9 +5869,11 @@ func rewriteValueRISCV64_OpRISCV64MOVWstore(v *Value) bool {
+@@ -5979,9 +6007,11 @@ func rewriteValueRISCV64_OpRISCV64MOVWstore(v *Value) bool {
  func rewriteValueRISCV64_OpRISCV64MOVWstorezero(v *Value) bool {
  	v_1 := v.Args[1]
  	v_0 := v.Args[0]
@@ -540,7 +540,7 @@ index f033b25bdd..9243702508 100644
  	for {
  		off1 := auxIntToInt32(v.AuxInt)
  		sym1 := auxToSym(v.Aux)
-@@ -5852,20 +5882,20 @@ func rewriteValueRISCV64_OpRISCV64MOVWstorezero(v *Value) bool {
+@@ -5990,20 +6020,20 @@ func rewriteValueRISCV64_OpRISCV64MOVWstorezero(v *Value) bool {
  		}
  		off2 := auxIntToInt32(v_0.AuxInt)
  		sym2 := auxToSym(v_0.Aux)
@@ -566,7 +566,7 @@ index f033b25bdd..9243702508 100644
  	for {
  		off1 := auxIntToInt32(v.AuxInt)
  		sym := auxToSym(v.Aux)
-@@ -5873,7 +5903,7 @@ func rewriteValueRISCV64_OpRISCV64MOVWstorezero(v *Value) bool {
+@@ -6011,7 +6041,7 @@ func rewriteValueRISCV64_OpRISCV64MOVWstorezero(v *Value) bool {
  			break
  		}
  		off2 := auxIntToInt64(v_0.AuxInt)
@@ -575,7 +575,7 @@ index f033b25bdd..9243702508 100644
  		mem := v_1
  		if !(is32Bit(int64(off1) + off2)) {
  			break
-@@ -5881,7 +5911,7 @@ func rewriteValueRISCV64_OpRISCV64MOVWstorezero(v *Value) bool {
+@@ -6019,7 +6049,7 @@ func rewriteValueRISCV64_OpRISCV64MOVWstorezero(v *Value) bool {
  		v.reset(OpRISCV64MOVWstorezero)
  		v.AuxInt = int32ToAuxInt(off1 + int32(off2))
  		v.Aux = symToAux(sym)
@@ -584,6 +584,3 @@ index f033b25bdd..9243702508 100644
  		return true
  	}
  	return false
--- 
-2.48.1.windows.1
-
diff --git a/golang.spec b/golang.spec
index 220543b..0fd675d 100644
--- a/golang.spec
+++ b/golang.spec
@@ -2,8 +2,8 @@
 %global _binaries_in_noarch_packages_terminate_build 0
 %global golibdir %{_libdir}/golang
 %global goroot /usr/lib/%{name}
-%global go_api 1.23
-%global go_version 1.23
+%global go_api 1.24
+%global go_version 1.24
 %global __spec_install_post /usr/lib/rpm/check-rpaths /usr/lib/rpm/check-buildroot /usr/lib/rpm/brp-compress
 %global __requires_exclude_from ^(%{_datadir}|/usr/lib)/%{name}/(doc|src)/.*$
 %global __strip /bin/true
@@ -65,7 +65,7 @@
 %endif
 
 Name:           golang
-Version:        1.23.7
+Version:        1.24.2
 Release:        33
 Summary:        The Go Programming Language
 License:        BSD and Public Domain
@@ -75,7 +75,7 @@ Source0:        https://dl.google.com/go/go%{version}.src.tar.gz
 %if !%{golang_bootstrap}
 BuildRequires:  gcc-go >= 5
 %else
-BuildRequires:  golang >= 1.20.6
+BuildRequires:  golang >= 1.22.6
 %endif
 BuildRequires:  hostname
 # for tests
@@ -99,19 +99,19 @@ Recommends: glibc gcc git subversion
 
 # Bundled/Vendored provides generated by bundled-deps.sh based on the in tree module data
 # - in version filed substituted with . per versioning guidelines
-Provides: bundled(golang(github.com/google/pprof)) = 0.0.0.20240528025155.186aa0362fba
-Provides: bundled(golang(github.com/ianlancetaylor/demangle)) = 0.0.0.20240312041847.bd984b5ce465
-Provides: bundled(golang(golang.org/x/arch)) = 0.8.0
-Provides: bundled(golang(golang.org/x/build)) = 0.0.0.20240603162849.5dfbda438323
-Provides: bundled(golang(golang.org/x/crypto)) = 0.23.1.0.20240603234054.0b431c7de36a
-Provides: bundled(golang(golang.org/x/mod)) = 0.19.0
-Provides: bundled(golang(golang.org/x/net)) = 0.25.1.0.20240603202750.6249541f2a6c
-Provides: bundled(golang(golang.org/x/sync)) = 0.7.0
-Provides: bundled(golang(golang.org/x/sys)) = 0.22.0
-Provides: bundled(golang(golang.org/x/telemetry)) = 0.0.0.20240828213427.40b6b7fe7147
-Provides: bundled(golang(golang.org/x/term)) = 0.20.0
-Provides: bundled(golang(golang.org/x/text)) = 0.16.0
-Provides: bundled(golang(golang.org/x/tools)) = 0.22.1.0.20240618181713.f2d2ebe43e72
+Provides: bundled(golang(github.com/google/pprof)) = 0.0.0.20241101162523.b92577c0c142
+Provides: bundled(golang(github.com/ianlancetaylor/demangle)) = 0.0.0.20240912202439.0a2b6291aafd
+Provides: bundled(golang(golang.org/x/arch)) = 0.12.0
+Provides: bundled(golang(golang.org/x/build)) = 0.0.0.20241205234318.b850320af2a4
+Provides: bundled(golang(golang.org/x/crypto)) = 0.30.0
+Provides: bundled(golang(golang.org/x/mod)) = 0.22.0
+Provides: bundled(golang(golang.org/x/net)) = 0.32.1.0.20250304185419.76f9bf3279ef
+Provides: bundled(golang(golang.org/x/sync)) = 0.10.0
+Provides: bundled(golang(golang.org/x/sys)) = 0.28.0
+Provides: bundled(golang(golang.org/x/telemetry)) = 0.0.0.20241204182053.c0ac0e154df3
+Provides: bundled(golang(golang.org/x/term)) = 0.27.0
+Provides: bundled(golang(golang.org/x/text)) = 0.21.0
+Provides: bundled(golang(golang.org/x/tools)) = 0.28.1.0.20250131145412.98746475647e
 Provides: bundled(golang(rsc.io/markdown)) = 0.0.0.20240306144322.0bf8f97ee8ef
 
 Provides:       %{name}-bin = %{version}-%{release}
@@ -316,7 +316,7 @@ export GO_LDFLAGS="-linkmode internal"
 export CGO_ENABLED=0
 %endif
 
-export GO_TEST_TIMEOUT_SCALE=10
+export GO_TEST_TIMEOUT_SCALE=60
 
 %if %{fail_on_tests}
 echo tests ignored
@@ -366,6 +366,9 @@ fi
 %files devel -f go-tests.list -f go-misc.list -f go-src.list
 
 %changelog
+* Thu Apr 17 2025 Suyun <ziyu.oerv@isrc.iscas.ac.cn> - 1.24.2-33
+- Update to 1.24.2
+
 * Mon Apr 07 2025 Suyun <ziyu.oerv@isrc.iscas.ac.cn> - 1.23.7-33
 - Increase GO_TEST_TIMEOUT_SCALE to fix tests on riscv64
 
diff --git a/sources b/sources
index 12d0d08..ce5a44a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3f8422d17739e427e11837389771c974  go1.23.7.src.tar.gz
+c34263bd873e92fa99649fb501223e1f  go1.24.2.src.tar.gz