Create builds configured for ARM and AARCH64.

tools/relocation_packer/src/run_length_encoder_unittest.cc

Index: tools/relocation_packer/src/run_length_encoder_unittest.cc
diff --git a/tools/relocation_packer/src/run_length_encoder_unittest.cc b/tools/relocation_packer/src/run_length_encoder_unittest.cc
index d632e888fea9d13a87e046c9a1bbf248627f58b7..e6e318a68256c41b2f5d03d482f41d175663df1b 100644
--- a/tools/relocation_packer/src/run_length_encoder_unittest.cc
+++ b/tools/relocation_packer/src/run_length_encoder_unittest.cc
@@ -6,17 +6,22 @@
 
 #include <vector>
 #include "elf.h"
+#include "elf_traits.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
-void AddRelocation(Elf32_Addr addr, std::vector<Elf32_Rel>* relocations) {
-  Elf32_Rel relocation = {addr, R_ARM_RELATIVE};
+void AddRelocation(ELF::Addr addr, std::vector<ELF::Rel>* relocations) {
+  ELF::Rel relocation;
+  relocation.r_offset = addr;
+  relocation.r_info = ELF_R_INFO(0, ELF::kArmRelativeRelocationCode);
   relocations->push_back(relocation);
 }
 
-bool CheckRelocation(Elf32_Addr addr, const Elf32_Rel& relocation) {
-  return relocation.r_offset == addr && relocation.r_info == R_ARM_RELATIVE;
+bool CheckRelocation(ELF::Addr addr, const ELF::Rel& relocation) {
+  return relocation.r_offset == addr &&
+      ELF_R_SYM(relocation.r_info) == 0 &&
+      ELF_R_TYPE(relocation.r_info) == ELF::kArmRelativeRelocationCode;
 }
 
 }  // namespace
@@ -24,15 +29,15 @@ bool CheckRelocation(Elf32_Addr addr, const Elf32_Rel& relocation) {
 namespace relocation_packer {
 
 TEST(Rle, Encode) {
-  std::vector<Elf32_Rel> relocations;
-  std::vector<Elf32_Word> packed;
+  std::vector<ELF::Rel> relocations;
+  std::vector<ELF::Xword> packed;
 
   RelocationRunLengthCodec codec;
 
   packed.clear();
   codec.Encode(relocations, &packed);
 
-  EXPECT_EQ(0u, packed.size());
+  EXPECT_EQ(0, packed.size());
 
   // Add one relocation (insufficient data to encode).
   AddRelocation(0xf00d0000, &relocations);
@@ -40,7 +45,7 @@ TEST(Rle, Encode) {
   packed.clear();
   codec.Encode(relocations, &packed);
 
-  EXPECT_EQ(0u, packed.size());
+  EXPECT_EQ(0, packed.size());
 
   // Add a second relocation, 4 byte delta (minimum data to encode).
   AddRelocation(0xf00d0004, &relocations);
@@ -48,14 +53,14 @@ TEST(Rle, Encode) {
   packed.clear();
   codec.Encode(relocations, &packed);
 
-  EXPECT_EQ(4u, packed.size());
+  EXPECT_EQ(4, packed.size());
   // One count-delta pair present.
-  EXPECT_EQ(1u, packed[0]);
+  EXPECT_EQ(1, packed[0]);
   // Initial relocation.
   EXPECT_EQ(0xf00d0000, packed[1]);
   // Run of a single relocation, 4 byte delta.
-  EXPECT_EQ(1u, packed[2]);
-  EXPECT_EQ(4u, packed[3]);
+  EXPECT_EQ(1, packed[2]);
+  EXPECT_EQ(4, packed[3]);
 
   // Add a third relocation, 4 byte delta.
   AddRelocation(0xf00d0008, &relocations);
@@ -68,43 +73,43 @@ TEST(Rle, Encode) {
   packed.clear();
   codec.Encode(relocations, &packed);
 
-  EXPECT_EQ(6u, packed.size());
+  EXPECT_EQ(6, packed.size());
   // Two count-delta pairs present.
-  EXPECT_EQ(2u, packed[0]);
+  EXPECT_EQ(2, packed[0]);
   // Initial relocation.
   EXPECT_EQ(0xf00d0000, packed[1]);
   // Run of two relocations, 4 byte deltas.
-  EXPECT_EQ(2u, packed[2]);
-  EXPECT_EQ(4u, packed[3]);
+  EXPECT_EQ(2, packed[2]);
+  EXPECT_EQ(4, packed[3]);
   // Run of three relocations, 8 byte deltas.
-  EXPECT_EQ(3u, packed[4]);
-  EXPECT_EQ(8u, packed[5]);
+  EXPECT_EQ(3, packed[4]);
+  EXPECT_EQ(8, packed[5]);
 }
 
 TEST(Rle, Decode) {
-  std::vector<Elf32_Word> packed;
-  std::vector<Elf32_Rel> relocations;
+  std::vector<ELF::Xword> packed;
+  std::vector<ELF::Rel> relocations;
 
   RelocationRunLengthCodec codec;
   codec.Decode(packed, &relocations);
 
-  EXPECT_EQ(0u, relocations.size());
+  EXPECT_EQ(0, relocations.size());
 
   // Two count-delta pairs.
-  packed.push_back(2u);
+  packed.push_back(2);
   // Initial relocation.
   packed.push_back(0xc0de0000);
   // Run of two relocations, 4 byte deltas.
-  packed.push_back(2u);
-  packed.push_back(4u);
+  packed.push_back(2);
+  packed.push_back(4);
   // Run of three relocations, 8 byte deltas.
-  packed.push_back(3u);
-  packed.push_back(8u);
+  packed.push_back(3);
+  packed.push_back(8);
 
   relocations.clear();
   codec.Decode(packed, &relocations);
 
-  EXPECT_EQ(6u, relocations.size());
+  EXPECT_EQ(6, relocations.size());
   // Initial relocation.
   EXPECT_TRUE(CheckRelocation(0xc0de0000, relocations[0]));
   // Two relocations, 4 byte deltas.