Refactor rel32 searching process for x64 to make it more similar to x86.

courgette/BUILD.gn

Index: courgette/BUILD.gn
diff --git a/courgette/BUILD.gn b/courgette/BUILD.gn
index bef724e305a814ff79d06b564e519cae86d893ee..86e78821218fa3af30e939d0d9666a5ff5fcdc0d 100644
--- a/courgette/BUILD.gn
+++ b/courgette/BUILD.gn
@@ -47,8 +47,12 @@ static_library("courgette_lib") {
     "program_detector.cc",
     "program_detector.h",
     "region.h",
-    "rel32_finder_win32_x86.cc",
-    "rel32_finder_win32_x86.h",
+    "rel32_finder.cc",
+    "rel32_finder.h",
+    "rel32_finder_x64.cc",
+    "rel32_finder_x64.h",
+    "rel32_finder_x86.cc",
+    "rel32_finder_x86.h",
     "simple_delta.cc",
     "simple_delta.h",
     "streams.cc",
@@ -114,7 +118,6 @@ test("courgette_unittests") {
     "consecutive_range_visitor_unittest.cc",
     "difference_estimator_unittest.cc",
     "disassembler_elf_32_x86_unittest.cc",
-    "disassembler_win32_x64_unittest.cc",
     "disassembler_win32_x86_unittest.cc",
     "encode_decode_unittest.cc",
     "encoded_program_unittest.cc",
@@ -122,7 +125,7 @@ test("courgette_unittests") {
     "image_utils_unittest.cc",
     "label_manager_unittest.cc",
     "memory_allocator_unittest.cc",
-    "rel32_finder_win32_x86_unittest.cc",
+    "rel32_finder_unittest.cc",
     "streams_unittest.cc",
     "third_party/bsdiff/paged_array_unittest.cc",
     "third_party/bsdiff/qsufsort_unittest.cc",