commit 72e68083f914fb2904f19d7118f0ce397cb6e9d3
author Adam Kallai <kadam@inf.u-szeged.hu> Wed Nov 20 12:02:32 2019 +0100
committer Alexis Hétu <sugoi@google.com> Thu Nov 21 14:55:07 2019 +0000
tree 26036bdbefeb72eca3e34faca81789680e378408
parent f2c9ce1e08ed30ed42f16df61c0ea91579941134

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: Alexis Hétu <sugoi@google.com>
Tested-by: Alexis Hétu <sugoi@google.com>

third_party/llvm-7.0/llvm/include/llvm/BinaryFormat/COFF.h

diff --git a/third_party/llvm-7.0/llvm/include/llvm/BinaryFormat/COFF.h b/third_party/llvm-7.0/llvm/include/llvm/BinaryFormat/COFF.h
index 7b973c0..59886db 100644
--- a/third_party/llvm-7.0/llvm/include/llvm/BinaryFormat/COFF.h
+++ b/third_party/llvm-7.0/llvm/include/llvm/BinaryFormat/COFF.h
@@ -371,13 +371,15 @@
   IMAGE_REL_ARM_TOKEN = 0x0005,
   IMAGE_REL_ARM_BLX24 = 0x0008,
   IMAGE_REL_ARM_BLX11 = 0x0009,
+  IMAGE_REL_ARM_REL32 = 0x000A,
   IMAGE_REL_ARM_SECTION = 0x000E,
   IMAGE_REL_ARM_SECREL = 0x000F,
   IMAGE_REL_ARM_MOV32A = 0x0010,
   IMAGE_REL_ARM_MOV32T = 0x0011,
   IMAGE_REL_ARM_BRANCH20T = 0x0012,
   IMAGE_REL_ARM_BRANCH24T = 0x0014,
-  IMAGE_REL_ARM_BLX23T = 0x0015
+  IMAGE_REL_ARM_BLX23T = 0x0015,
+  IMAGE_REL_ARM_PAIR = 0x0016,
 };
 
 enum RelocationTypesARM64 : unsigned {
@@ -398,6 +400,7 @@
   IMAGE_REL_ARM64_ADDR64 = 0x000E,
   IMAGE_REL_ARM64_BRANCH19 = 0x000F,
   IMAGE_REL_ARM64_BRANCH14 = 0x0010,
+  IMAGE_REL_ARM64_REL32 = 0x0011,
 };
 
 enum COMDATType : unsigned {

third_party/llvm-7.0/llvm/lib/Object/COFFObjectFile.cpp

diff --git a/third_party/llvm-7.0/llvm/lib/Object/COFFObjectFile.cpp b/third_party/llvm-7.0/llvm/lib/Object/COFFObjectFile.cpp
index 85b1913..1da1303 100644
--- a/third_party/llvm-7.0/llvm/lib/Object/COFFObjectFile.cpp
+++ b/third_party/llvm-7.0/llvm/lib/Object/COFFObjectFile.cpp
@@ -1217,6 +1217,7 @@
     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_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_SECREL);
     LLVM_COFF_SWITCH_RELOC_TYPE_NAME(IMAGE_REL_ARM_MOV32A);
@@ -1224,6 +1225,7 @@
     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_BLX23T);
+    LLVM_COFF_SWITCH_RELOC_TYPE_NAME(IMAGE_REL_ARM_PAIR);
     default:
       Res = "Unknown";
     }
@@ -1247,6 +1249,7 @@
     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_BRANCH14);
+    LLVM_COFF_SWITCH_RELOC_TYPE_NAME(IMAGE_REL_ARM64_REL32);
     default:
       Res = "Unknown";
     }

third_party/llvm-7.0/llvm/lib/ObjectYAML/COFFYAML.cpp

diff --git a/third_party/llvm-7.0/llvm/lib/ObjectYAML/COFFYAML.cpp b/third_party/llvm-7.0/llvm/lib/ObjectYAML/COFFYAML.cpp
index 9351ef9..20e9348 100644
--- a/third_party/llvm-7.0/llvm/lib/ObjectYAML/COFFYAML.cpp
+++ b/third_party/llvm-7.0/llvm/lib/ObjectYAML/COFFYAML.cpp
@@ -188,6 +188,7 @@
   ECase(IMAGE_REL_ARM_TOKEN);
   ECase(IMAGE_REL_ARM_BLX24);
   ECase(IMAGE_REL_ARM_BLX11);
+  ECase(IMAGE_REL_ARM_REL32);
   ECase(IMAGE_REL_ARM_SECTION);
   ECase(IMAGE_REL_ARM_SECREL);
   ECase(IMAGE_REL_ARM_MOV32A);
@@ -195,6 +196,7 @@
   ECase(IMAGE_REL_ARM_BRANCH20T);
   ECase(IMAGE_REL_ARM_BRANCH24T);
   ECase(IMAGE_REL_ARM_BLX23T);
+  ECase(IMAGE_REL_ARM_PAIR);
 }
 
 void ScalarEnumerationTraits<COFF::RelocationTypesARM64>::enumeration(
@@ -216,6 +218,7 @@
   ECase(IMAGE_REL_ARM64_ADDR64);
   ECase(IMAGE_REL_ARM64_BRANCH19);
   ECase(IMAGE_REL_ARM64_BRANCH14);
+  ECase(IMAGE_REL_ARM64_REL32);
 }
 
 void ScalarEnumerationTraits<COFF::WindowsSubsystem>::enumeration(