Date: Tue, 13 Jun 2017 01:25:19 +0000 (UTC) From: Ed Maste <emaste@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r319891 - head/contrib/llvm/tools/lld/ELF Message-ID: <201706130125.v5D1PJxv099315@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: emaste Date: Tue Jun 13 01:25:19 2017 New Revision: 319891 URL: https://svnweb.freebsd.org/changeset/base/319891 Log: lld: revert accidentally committed change from r319887 This change is a portion of LLD rev 305212 which accidentally ended up in my svn tree. We do want to backport the change to LLD 4.0, but it needs additional work and was not supposed to be included in r319887. Modified: head/contrib/llvm/tools/lld/ELF/InputSection.cpp Modified: head/contrib/llvm/tools/lld/ELF/InputSection.cpp ============================================================================== --- head/contrib/llvm/tools/lld/ELF/InputSection.cpp Tue Jun 13 01:17:58 2017 (r319890) +++ head/contrib/llvm/tools/lld/ELF/InputSection.cpp Tue Jun 13 01:25:19 2017 (r319891) @@ -255,7 +255,7 @@ static uint32_t getARMUndefinedRelativeWeakVA(uint32_t uint32_t P) { switch (Type) { case R_ARM_THM_JUMP11: - return P + 2 + A; + return P + 2; case R_ARM_CALL: case R_ARM_JUMP24: case R_ARM_PC24: @@ -263,12 +263,12 @@ static uint32_t getARMUndefinedRelativeWeakVA(uint32_t case R_ARM_PREL31: case R_ARM_THM_JUMP19: case R_ARM_THM_JUMP24: - return P + 4 + A; + return P + 4; case R_ARM_THM_CALL: // We don't want an interworking BLX to ARM - return P + 5 + A; + return P + 5; default: - return P + A; + return A; } } @@ -279,9 +279,9 @@ static uint64_t getAArch64UndefinedRelativeWeakVA(uint case R_AARCH64_CONDBR19: case R_AARCH64_JUMP26: case R_AARCH64_TSTBR14: - return P + 4 + A; + return P + 4; default: - return P + A; + return A; } }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201706130125.v5D1PJxv099315>