Handle object files named *.obj in merge_archives.py

Differential Revision: https://reviews.llvm.org/D37133

llvm-svn: 313072
Cr-Mirrored-From: sso://chromium.googlesource.com/_direct/external/github.com/llvm/llvm-project
Cr-Mirrored-Commit: 499f58a54838dd63f8b295ec37d6de711ef270c4
diff --git a/utils/merge_archives.py b/utils/merge_archives.py
index 856dd3b..db101da 100755
--- a/utils/merge_archives.py
+++ b/utils/merge_archives.py
@@ -118,7 +118,7 @@
         execute_command_verbose([ar_exe, '-x', arc], cwd=temp_directory_root,
                                 verbose=args.verbose)
 
-    files = glob.glob(os.path.join(temp_directory_root, '*.o'))
+    files = glob.glob(os.path.join(temp_directory_root, '*.o*'))
     if not files:
         print_and_exit('Failed to glob for %s' % glob_path)
     cmd = [ar_exe, '-qc', args.output] + files