aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2020-11-08 03:09:42 +0100
committerJason A. Donenfeld <Jason@zx2c4.com>2020-12-14 22:35:02 +0000
commit48dfa2b2dca43c6dc80d7e1d1c605e2918fad3af (patch)
treecfc1897fb58025ca0f4197222ab40a48b5a492af
parent033390d9adb0e7a96d0558bb1702e270ef986c90 (diff)
downloadgo-48dfa2b2dca43c6dc80d7e1d1c605e2918fad3af.tar.gz
go-48dfa2b2dca43c6dc80d7e1d1c605e2918fad3af.zip
cmd/link: deal with ADDR32NB relocations the same way as ADDR32 on arm
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>
-rw-r--r--src/cmd/link/internal/loadpe/ldpe.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cmd/link/internal/loadpe/ldpe.go b/src/cmd/link/internal/loadpe/ldpe.go
index 7677278ec5..c72965dddc 100644
--- a/src/cmd/link/internal/loadpe/ldpe.go
+++ b/src/cmd/link/internal/loadpe/ldpe.go
@@ -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:])))