]> Cypherpunks.ru repositories - gostls13.git/commitdiff
cmd/link: deal with ADDR32NB relocations the same way as ADDR32 on arm
authorJason A. Donenfeld <Jason@zx2c4.com>
Sun, 8 Nov 2020 02:09:42 +0000 (03:09 +0100)
committerJason A. Donenfeld <Jason@zx2c4.com>
Mon, 14 Dec 2020 22:35:02 +0000 (22:35 +0000)
As far as I can tell, the addend is the same for both of these, and in
this context we don't really care about setting or unsetting the thumb
selection bit, so just treat these the same way.

Change-Id: I3756c027239f77778c32b317733df9ac92272580
Reviewed-on: https://go-review.googlesource.com/c/go/+/268238
Reviewed-by: Cherry Zhang <cherryyz@google.com>
Trust: Jason A. Donenfeld <Jason@zx2c4.com>

src/cmd/link/internal/loadpe/ldpe.go

index 7677278ec59c07a899cf8d2c29e0043dafa43039..c72965dddc21fa32d23cdb38704976efafca1469 100644 (file)
@@ -308,7 +308,7 @@ func Load(l *loader.Loader, arch *sys.Arch, localSymVersion int, input *bio.Read
 
                                        rAdd = int64(int32(binary.LittleEndian.Uint32(sectdata[rsect][rOff:])))
 
-                               case IMAGE_REL_ARM_ADDR32:
+                               case IMAGE_REL_ARM_ADDR32, IMAGE_REL_ARM_ADDR32NB:
                                        rType = objabi.R_ADDR
 
                                        rAdd = int64(int32(binary.LittleEndian.Uint32(sectdata[rsect][rOff:])))