Skip to content

S
swiftshader
Commit 72e68083 by Adam Kallai Committed by Alexis Hétu
Options

Add new relocation types.

This was committed to LLVM at https://reviews.llvm.org/D57291 . Created by Martin Storsjo. Bug: chromium:893460 Change-Id: Ifbf5a632f8d517b0910aa3274d0cae585729d34f Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/38452 Kokoro-Presubmit: kokoro <noreply+kokoro@google.com> Reviewed-by: 's avatarAlexis Hétu <sugoi@google.com> Tested-by: 's avatarAlexis Hétu <sugoi@google.com>
parent f2c9ce1e
Showing with 10 additions and 1 deletion
third_party/llvm-7.0/llvm/include/llvm/BinaryFormat/COFF.h
...@@ -371,13 +371,15 @@ enum RelocationTypesARM : unsigned { ...@@ -371,13 +371,15 @@ enum RelocationTypesARM : unsigned {
IMAGE_REL_ARM_TOKEN = 0x0005, IMAGE_REL_ARM_TOKEN = 0x0005,
IMAGE_REL_ARM_BLX24 = 0x0008, IMAGE_REL_ARM_BLX24 = 0x0008,
IMAGE_REL_ARM_BLX11 = 0x0009, IMAGE_REL_ARM_BLX11 = 0x0009,
IMAGE_REL_ARM_REL32 = 0x000A,
IMAGE_REL_ARM_SECTION = 0x000E, IMAGE_REL_ARM_SECTION = 0x000E,
IMAGE_REL_ARM_SECREL = 0x000F, IMAGE_REL_ARM_SECREL = 0x000F,
IMAGE_REL_ARM_MOV32A = 0x0010, IMAGE_REL_ARM_MOV32A = 0x0010,
IMAGE_REL_ARM_MOV32T = 0x0011, IMAGE_REL_ARM_MOV32T = 0x0011,
IMAGE_REL_ARM_BRANCH20T = 0x0012, IMAGE_REL_ARM_BRANCH20T = 0x0012,
IMAGE_REL_ARM_BRANCH24T = 0x0014, IMAGE_REL_ARM_BRANCH24T = 0x0014,
IMAGE_REL_ARM_BLX23T = 0x0015 IMAGE_REL_ARM_BLX23T = 0x0015,
IMAGE_REL_ARM_PAIR = 0x0016,
}; };
enum RelocationTypesARM64 : unsigned { enum RelocationTypesARM64 : unsigned {
...@@ -398,6 +400,7 @@ enum RelocationTypesARM64 : unsigned { ...@@ -398,6 +400,7 @@ enum RelocationTypesARM64 : unsigned {
IMAGE_REL_ARM64_ADDR64 = 0x000E, IMAGE_REL_ARM64_ADDR64 = 0x000E,
IMAGE_REL_ARM64_BRANCH19 = 0x000F, IMAGE_REL_ARM64_BRANCH19 = 0x000F,
IMAGE_REL_ARM64_BRANCH14 = 0x0010, IMAGE_REL_ARM64_BRANCH14 = 0x0010,
IMAGE_REL_ARM64_REL32 = 0x0011,
}; };
enum COMDATType : unsigned { enum COMDATType : unsigned {
......
third_party/llvm-7.0/llvm/lib/Object/COFFObjectFile.cpp
...@@ -1217,6 +1217,7 @@ void COFFObjectFile::getRelocationTypeName( ...@@ -1217,6 +1217,7 @@ void COFFObjectFile::getRelocationTypeName(
LLVM_COFF_SWITCH_RELOC_TYPE_NAME(IMAGE_REL_ARM_TOKEN); LLVM_COFF_SWITCH_RELOC_TYPE_NAME(IMAGE_REL_ARM_TOKEN);
LLVM_COFF_SWITCH_RELOC_TYPE_NAME(IMAGE_REL_ARM_BLX24); LLVM_COFF_SWITCH_RELOC_TYPE_NAME(IMAGE_REL_ARM_BLX24);
LLVM_COFF_SWITCH_RELOC_TYPE_NAME(IMAGE_REL_ARM_BLX11); LLVM_COFF_SWITCH_RELOC_TYPE_NAME(IMAGE_REL_ARM_BLX11);
LLVM_COFF_SWITCH_RELOC_TYPE_NAME(IMAGE_REL_ARM_REL32);
LLVM_COFF_SWITCH_RELOC_TYPE_NAME(IMAGE_REL_ARM_SECTION); LLVM_COFF_SWITCH_RELOC_TYPE_NAME(IMAGE_REL_ARM_SECTION);
LLVM_COFF_SWITCH_RELOC_TYPE_NAME(IMAGE_REL_ARM_SECREL); LLVM_COFF_SWITCH_RELOC_TYPE_NAME(IMAGE_REL_ARM_SECREL);
LLVM_COFF_SWITCH_RELOC_TYPE_NAME(IMAGE_REL_ARM_MOV32A); LLVM_COFF_SWITCH_RELOC_TYPE_NAME(IMAGE_REL_ARM_MOV32A);
...@@ -1224,6 +1225,7 @@ void COFFObjectFile::getRelocationTypeName( ...@@ -1224,6 +1225,7 @@ void COFFObjectFile::getRelocationTypeName(
LLVM_COFF_SWITCH_RELOC_TYPE_NAME(IMAGE_REL_ARM_BRANCH20T); LLVM_COFF_SWITCH_RELOC_TYPE_NAME(IMAGE_REL_ARM_BRANCH20T);
LLVM_COFF_SWITCH_RELOC_TYPE_NAME(IMAGE_REL_ARM_BRANCH24T); LLVM_COFF_SWITCH_RELOC_TYPE_NAME(IMAGE_REL_ARM_BRANCH24T);
LLVM_COFF_SWITCH_RELOC_TYPE_NAME(IMAGE_REL_ARM_BLX23T); LLVM_COFF_SWITCH_RELOC_TYPE_NAME(IMAGE_REL_ARM_BLX23T);
LLVM_COFF_SWITCH_RELOC_TYPE_NAME(IMAGE_REL_ARM_PAIR);
default: default:
Res = "Unknown"; Res = "Unknown";
} }
...@@ -1247,6 +1249,7 @@ void COFFObjectFile::getRelocationTypeName( ...@@ -1247,6 +1249,7 @@ void COFFObjectFile::getRelocationTypeName(
LLVM_COFF_SWITCH_RELOC_TYPE_NAME(IMAGE_REL_ARM64_ADDR64); LLVM_COFF_SWITCH_RELOC_TYPE_NAME(IMAGE_REL_ARM64_ADDR64);
LLVM_COFF_SWITCH_RELOC_TYPE_NAME(IMAGE_REL_ARM64_BRANCH19); LLVM_COFF_SWITCH_RELOC_TYPE_NAME(IMAGE_REL_ARM64_BRANCH19);
LLVM_COFF_SWITCH_RELOC_TYPE_NAME(IMAGE_REL_ARM64_BRANCH14); LLVM_COFF_SWITCH_RELOC_TYPE_NAME(IMAGE_REL_ARM64_BRANCH14);
LLVM_COFF_SWITCH_RELOC_TYPE_NAME(IMAGE_REL_ARM64_REL32);
default: default:
Res = "Unknown"; Res = "Unknown";
} }
......
third_party/llvm-7.0/llvm/lib/ObjectYAML/COFFYAML.cpp
...@@ -188,6 +188,7 @@ void ScalarEnumerationTraits<COFF::RelocationTypesARM>::enumeration( ...@@ -188,6 +188,7 @@ void ScalarEnumerationTraits<COFF::RelocationTypesARM>::enumeration(
ECase(IMAGE_REL_ARM_TOKEN); ECase(IMAGE_REL_ARM_TOKEN);
ECase(IMAGE_REL_ARM_BLX24); ECase(IMAGE_REL_ARM_BLX24);
ECase(IMAGE_REL_ARM_BLX11); ECase(IMAGE_REL_ARM_BLX11);
ECase(IMAGE_REL_ARM_REL32);
ECase(IMAGE_REL_ARM_SECTION); ECase(IMAGE_REL_ARM_SECTION);
ECase(IMAGE_REL_ARM_SECREL); ECase(IMAGE_REL_ARM_SECREL);
ECase(IMAGE_REL_ARM_MOV32A); ECase(IMAGE_REL_ARM_MOV32A);
...@@ -195,6 +196,7 @@ void ScalarEnumerationTraits<COFF::RelocationTypesARM>::enumeration( ...@@ -195,6 +196,7 @@ void ScalarEnumerationTraits<COFF::RelocationTypesARM>::enumeration(
ECase(IMAGE_REL_ARM_BRANCH20T); ECase(IMAGE_REL_ARM_BRANCH20T);
ECase(IMAGE_REL_ARM_BRANCH24T); ECase(IMAGE_REL_ARM_BRANCH24T);
ECase(IMAGE_REL_ARM_BLX23T); ECase(IMAGE_REL_ARM_BLX23T);
ECase(IMAGE_REL_ARM_PAIR);
} }
void ScalarEnumerationTraits<COFF::RelocationTypesARM64>::enumeration( void ScalarEnumerationTraits<COFF::RelocationTypesARM64>::enumeration(
...@@ -216,6 +218,7 @@ void ScalarEnumerationTraits<COFF::RelocationTypesARM64>::enumeration( ...@@ -216,6 +218,7 @@ void ScalarEnumerationTraits<COFF::RelocationTypesARM64>::enumeration(
ECase(IMAGE_REL_ARM64_ADDR64); ECase(IMAGE_REL_ARM64_ADDR64);
ECase(IMAGE_REL_ARM64_BRANCH19); ECase(IMAGE_REL_ARM64_BRANCH19);
ECase(IMAGE_REL_ARM64_BRANCH14); ECase(IMAGE_REL_ARM64_BRANCH14);
ECase(IMAGE_REL_ARM64_REL32);
} }
void ScalarEnumerationTraits<COFF::WindowsSubsystem>::enumeration( void ScalarEnumerationTraits<COFF::WindowsSubsystem>::enumeration(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment