Create builds configured for ARM and AARCH64.

tools/relocation_packer/src/leb128_unittest.cc

Index: tools/relocation_packer/src/leb128_unittest.cc
diff --git a/tools/relocation_packer/src/leb128_unittest.cc b/tools/relocation_packer/src/leb128_unittest.cc
index 62cf2f0638e6476233f1e1b9e2dbab673407c896..bd607b717b40e126e7d27db37f7d09899e46dca0 100644
--- a/tools/relocation_packer/src/leb128_unittest.cc
+++ b/tools/relocation_packer/src/leb128_unittest.cc
@@ -10,20 +10,23 @@
 namespace relocation_packer {
 
 TEST(Leb128, Encoder) {
-  std::vector<uint32_t> values;
-  values.push_back(624485u);
-  values.push_back(0u);
-  values.push_back(1u);
-  values.push_back(127u);
-  values.push_back(128u);
+  std::vector<ELF::Xword> values;
+  values.push_back(624485);
+  values.push_back(0);
+  values.push_back(1);
+  values.push_back(127);
+  values.push_back(128);
 
   Leb128Encoder encoder;
   encoder.EnqueueAll(values);
 
+  encoder.Enqueue(4294967295);
+  encoder.Enqueue(18446744073709551615ul);
+
   std::vector<uint8_t> encoding;
   encoder.GetEncoding(&encoding);
 
-  EXPECT_EQ(8u, encoding.size());
+  EXPECT_EQ(23, encoding.size());
   // 624485
   EXPECT_EQ(0xe5, encoding[0]);
   EXPECT_EQ(0x8e, encoding[1]);
@@ -37,19 +40,23 @@ TEST(Leb128, Encoder) {
   // 128
   EXPECT_EQ(0x80, encoding[6]);
   EXPECT_EQ(0x01, encoding[7]);
-
-  encoder.Enqueue(4294967295u);
-
-  encoding.clear();
-  encoder.GetEncoding(&encoding);
-
-  EXPECT_EQ(13u, encoding.size());
   // 4294967295
   EXPECT_EQ(0xff, encoding[8]);
   EXPECT_EQ(0xff, encoding[9]);
   EXPECT_EQ(0xff, encoding[10]);
   EXPECT_EQ(0xff, encoding[11]);
   EXPECT_EQ(0x0f, encoding[12]);
+  // 18446744073709551615
+  EXPECT_EQ(0xff, encoding[13]);
+  EXPECT_EQ(0xff, encoding[14]);
+  EXPECT_EQ(0xff, encoding[15]);
+  EXPECT_EQ(0xff, encoding[16]);
+  EXPECT_EQ(0xff, encoding[17]);
+  EXPECT_EQ(0xff, encoding[18]);
+  EXPECT_EQ(0xff, encoding[19]);
+  EXPECT_EQ(0xff, encoding[20]);
+  EXPECT_EQ(0xff, encoding[21]);
+  EXPECT_EQ(0x01, encoding[22]);
 }
 
 TEST(Leb128, Decoder) {
@@ -73,20 +80,32 @@ TEST(Leb128, Decoder) {
   encoding.push_back(0xff);
   encoding.push_back(0xff);
   encoding.push_back(0x0f);
+  // 18446744073709551615
+  encoding.push_back(0xff);
+  encoding.push_back(0xff);
+  encoding.push_back(0xff);
+  encoding.push_back(0xff);
+  encoding.push_back(0xff);
+  encoding.push_back(0xff);
+  encoding.push_back(0xff);
+  encoding.push_back(0xff);
+  encoding.push_back(0xff);
+  encoding.push_back(0x01);
 
   Leb128Decoder decoder(encoding);
 
-  EXPECT_EQ(624485u, decoder.Dequeue());
+  EXPECT_EQ(624485, decoder.Dequeue());
 
-  std::vector<uint32_t> dequeued;
+  std::vector<ELF::Xword> dequeued;
   decoder.DequeueAll(&dequeued);
 
-  EXPECT_EQ(5u, dequeued.size());
-  EXPECT_EQ(0u, dequeued[0]);
-  EXPECT_EQ(1u, dequeued[1]);
-  EXPECT_EQ(127u, dequeued[2]);
-  EXPECT_EQ(128u, dequeued[3]);
-  EXPECT_EQ(4294967295u, dequeued[4]);
+  EXPECT_EQ(6, dequeued.size());
+  EXPECT_EQ(0, dequeued[0]);
+  EXPECT_EQ(1, dequeued[1]);
+  EXPECT_EQ(127, dequeued[2]);
+  EXPECT_EQ(128, dequeued[3]);
+  EXPECT_EQ(4294967295, dequeued[4]);
+  EXPECT_EQ(18446744073709551615ul, dequeued[5]);
 }
 
 }  // namespace relocation_packer