diff --git a/lld/test/ELF/lto/Inputs/common.s b/lld/test/ELF/lto/Inputs/common-mixed1.s
rename from lld/test/ELF/lto/Inputs/common.s
rename to lld/test/ELF/lto/Inputs/common-mixed1.s
diff --git a/lld/test/ELF/lto/Inputs/common-mixed2.s b/lld/test/ELF/lto/Inputs/common-mixed2.s
new file mode 100644
--- /dev/null
+++ b/lld/test/ELF/lto/Inputs/common-mixed2.s
@@ -0,0 +1 @@
+        .comm   a,1,8
diff --git a/lld/test/ELF/lto/Inputs/resolution.s b/lld/test/ELF/lto/Inputs/resolution.s
--- a/lld/test/ELF/lto/Inputs/resolution.s
+++ b/lld/test/ELF/lto/Inputs/resolution.s
@@ -2,3 +2,7 @@
         .global a
 a:
         .long 9
+
+        .weak b
+b:
+        .long 5
diff --git a/lld/test/ELF/lto/bitcode-wrapper.ll b/lld/test/ELF/lto/bitcode-wrapper.ll
new file mode 100644
--- /dev/null
+++ b/lld/test/ELF/lto/bitcode-wrapper.ll
@@ -0,0 +1,55 @@
+; REQUIRES: x86
+
+;; The LLVM bitcode format allows for an optional wrapper header. This test
+;; shows that LLD can handle bitcode wrapped in this way, and also that an
+;; invalid offset in the wrapper header is handled cleanly.
+
+; RUN: rm -rf %t
+; RUN: split-file %s %t
+; RUN: llvm-as %t/ir.ll -o %t.bc
+
+;; Basic case:
+; RUN: %python %t/wrap_bitcode.py %t.bc %t.o 0 0x14
+; RUN: ld.lld %t.o -o %t.elf
+; RUN: llvm-readelf -s %t.elf | FileCheck %s
+
+;; Padding between wrapper header and body:
+; RUN: %python %t/wrap_bitcode.py %t.bc %t.o 0x10 0x24
+; RUN: ld.lld %t.o -o %t.elf
+; RUN: llvm-readelf -s %t.elf | FileCheck %s
+
+; CHECK: _start
+
+;; Invalid offset past end of file:
+; RUN: %python %t/wrap_bitcode.py %t.bc %t2.o 0x10 0xffffffff
+; RUN: not ld.lld %t2.o -o %t2.elf 2>&1 | FileCheck %s --check-prefix=ERR1 -DFILE=%t2.o
+
+; ERR1: error: [[FILE]]: Invalid bitcode wrapper header
+
+;; Invalid offset within file:
+; RUN: %python %t/wrap_bitcode.py %t.bc %t3.o 0x10 0x14
+; RUN: not ld.lld %t3.o -o %t3.elf 2>&1 | FileCheck %s --check-prefix=ERR2 -DFILE=%t3.o
+
+; ERR2: error: [[FILE]]: file doesn't start with bitcode header
+
+;--- ir.ll
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-unknown-linux-gnu"
+
+@_start = global i32 0
+
+;--- wrap_bitcode.py
+## Arguments are: input file, output file, padding size, offset value.
+import struct
+import sys
+
+with open(sys.argv[1], 'rb') as input:
+    bitcode = input.read()
+
+padding = int(sys.argv[3], 16) * '\0'
+offset = int(sys.argv[4], 16)
+header = struct.pack('<IIIII', 0x0B17C0DE, 0, offset, len(bitcode), 0)
+with open(sys.argv[2], 'wb') as output:
+    output.write(header)
+    output.write(padding)
+    output.write(bitcode)
diff --git a/lld/test/ELF/lto/common-mixed1.ll b/lld/test/ELF/lto/common-mixed1.ll
new file mode 100644
--- /dev/null
+++ b/lld/test/ELF/lto/common-mixed1.ll
@@ -0,0 +1,35 @@
+; REQUIRES: x86
+
+;; Show that common symbols defined in both native objects and bitcode files are
+;; properly resolved. In this case, the native object symbol is larger, but has
+;; a smaller alignment.
+; RUN: llvm-as %s -o %t1.o
+; RUN: llvm-mc -triple=x86_64-pc-linux %p/Inputs/common-mixed1.s -o %t2.o -filetype=obj
+; RUN: ld.lld %t1.o %t2.o -o %t.so -shared
+; RUN: llvm-readobj -S --symbols %t.so | FileCheck %s
+
+; CHECK:      Name: .bss
+; CHECK-NEXT: Type: SHT_NOBITS
+; CHECK-NEXT: Flags [
+; CHECK-NEXT:   SHF_ALLOC
+; CHECK-NEXT:   SHF_WRITE
+; CHECK-NEXT: ]
+; CHECK-NEXT: Address:
+; CHECK-NEXT: Offset:
+; CHECK-NEXT: Size: 8
+; CHECK-NEXT: Link: 0
+; CHECK-NEXT: Info: 0
+; CHECK-NEXT: AddressAlignment: 8
+
+; CHECK:      Name: a
+; CHECK-NEXT: Value:
+; CHECK-NEXT: Size: 8
+; CHECK-NEXT: Binding: Global
+; CHECK-NEXT: Type: Object
+; CHECK-NEXT: Other: 0
+; CHECK-NEXT: Section: .bss
+
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-unknown-linux-gnu"
+
+@a = common global i32 0, align 8
diff --git a/lld/test/ELF/lto/common-mixed2.ll b/lld/test/ELF/lto/common-mixed2.ll
new file mode 100644
--- /dev/null
+++ b/lld/test/ELF/lto/common-mixed2.ll
@@ -0,0 +1,38 @@
+; REQUIRES: x86
+
+;; Show that common symbols defined in both native objects and bitcode files are
+;; properly resolved. In this case, the bitcode symbol is larger, but has a
+;; smaller alignment.
+; RUN: llvm-as %s -o %t1.o
+; RUN: llvm-mc -triple=x86_64-pc-linux %p/Inputs/common-mixed2.s -o %t2.o -filetype=obj
+; RUN: ld.lld %t1.o %t2.o -o %t.so -shared --save-temps
+; RUN: llvm-readobj -S --symbols %t.so | FileCheck %s
+
+; CHECK:      Name: .bss
+; CHECK-NEXT: Type: SHT_NOBITS
+; CHECK-NEXT: Flags [
+; CHECK-NEXT:   SHF_ALLOC
+; CHECK-NEXT:   SHF_WRITE
+; CHECK-NEXT: ]
+; CHECK-NEXT: Address:
+; CHECK-NEXT: Offset:
+; CHECK-NEXT: Size: 2
+; CHECK-NEXT: Link: 0
+; CHECK-NEXT: Info: 0
+;; FIXME: This alignment should be 8, but LLD is ignoring the alignment of a
+;; symbol in a native object file when the larger symbol is in a bitcode file.
+;; See https://bugs.llvm.org/show_bug.cgi?id=47819.
+; CHECK-NEXT: AddressAlignment: 4
+
+; CHECK:      Name: a
+; CHECK-NEXT: Value:
+; CHECK-NEXT: Size: 2
+; CHECK-NEXT: Binding: Global
+; CHECK-NEXT: Type: Object
+; CHECK-NEXT: Other: 0
+; CHECK-NEXT: Section: .bss
+
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-unknown-linux-gnu"
+
+@a = common global i16 0, align 4
diff --git a/lld/test/ELF/lto/common.ll b/lld/test/ELF/lto/common.ll
--- a/lld/test/ELF/lto/common.ll
+++ b/lld/test/ELF/lto/common.ll
@@ -1,31 +1,21 @@
 ; REQUIRES: x86
-; RUN: llvm-as %s -o %t1.o
-; RUN: llvm-mc -triple=x86_64-pc-linux %p/Inputs/common.s -o %t2.o -filetype=obj
-; RUN: ld.lld %t1.o %t2.o -o %t.so -shared
-; RUN: llvm-readobj -S --symbols %t.so | FileCheck %s
 
-; CHECK:      Name: .bss
-; CHECK-NEXT: Type: SHT_NOBITS
-; CHECK-NEXT: Flags [
-; CHECK-NEXT:   SHF_ALLOC
-; CHECK-NEXT:   SHF_WRITE
-; CHECK-NEXT: ]
-; CHECK-NEXT: Address:
-; CHECK-NEXT: Offset:
-; CHECK-NEXT: Size: 8
-; CHECK-NEXT: Link: 0
-; CHECK-NEXT: Info: 0
-; CHECK-NEXT: AddressAlignment: 8
+;; Make sure that common symbols are properly internalized.
+;; In this file, @a does not interpose any symbol in a DSO,
+;; so LTO should be able to internalize it.
 
-; CHECK:      Name: a
-; CHECK-NEXT: Value:
-; CHECK-NEXT: Size: 8
-; CHECK-NEXT: Binding: Global
-; CHECK-NEXT: Type: Object
-; CHECK-NEXT: Other: 0
-; CHECK-NEXT: Section: .bss
+; RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux /dev/null -o %t.so.o
+; RUN: ld.lld -shared -o %t.so %t.so.o
+
+; RUN: llvm-as %s -o %t.o
+; RUN: ld.lld -o %t.exe -save-temps %t.o %t.so
+; RUN: llvm-dis < %t.exe.0.2.internalize.bc | FileCheck %s
+
+; RUN: ld.lld -pie -o %t.exe -save-temps %t.o
+; RUN: llvm-dis < %t.exe.0.2.internalize.bc | FileCheck %s
 
 target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
-@a = common global i32 0, align 8
+@a = common dso_local local_unnamed_addr global i32 0, align 4
+; CHECK-DAG: @a = internal global i32 0, align 4
diff --git a/lld/test/ELF/lto/common4.ll b/lld/test/ELF/lto/common4.ll
deleted file mode 100644
--- a/lld/test/ELF/lto/common4.ll
+++ /dev/null
@@ -1,21 +0,0 @@
-; REQUIRES: x86
-
-;; Make sure that common symbols are properly internalized.
-;; In this file, @a does not interpose any symbol in a DSO,
-;; so LTO should be able to internalize it.
-
-; RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux /dev/null -o %t.so.o
-; RUN: ld.lld -shared -o %t.so %t.so.o
-
-; RUN: llvm-as %s -o %t.o
-; RUN: ld.lld -o %t.exe -save-temps %t.o %t.so
-; RUN: llvm-dis < %t.exe.0.2.internalize.bc | FileCheck %s
-
-; RUN: ld.lld -pie -o %t.exe -save-temps %t.o
-; RUN: llvm-dis < %t.exe.0.2.internalize.bc | FileCheck %s
-
-target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
-target triple = "x86_64-unknown-linux-gnu"
-
-@a = common dso_local local_unnamed_addr global i32 0, align 4
-; CHECK-DAG: @a = internal global i32 0, align 4
diff --git a/lld/test/ELF/lto/non-ascii-filenames.ll b/lld/test/ELF/lto/non-ascii-filenames.ll
new file mode 100644
--- /dev/null
+++ b/lld/test/ELF/lto/non-ascii-filenames.ll
@@ -0,0 +1,21 @@
+; REQUIRES: x86
+
+;; Show that both regular LTO and ThinLTO work correctly when an input file uses
+;; a non-ascii filename.
+
+;; Regular LTO.
+; RUN: llvm-as %s -o %t£.o
+; RUN: ld.lld %t£.o -o %t
+; RUN: llvm-readelf -s %t | FileCheck %s
+
+;; Thin LTO.
+; RUN: opt -module-summary %s -o %t-thin£.o
+; RUN: ld.lld %t-thin£.o -o %t-thin
+; RUN: llvm-readelf -s %t-thin | FileCheck %s
+
+; CHECK: _start
+
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-unknown-linux-gnu"
+
+@_start = global i32 0
diff --git a/lld/test/ELF/lto/resolution.ll b/lld/test/ELF/lto/resolution.ll
--- a/lld/test/ELF/lto/resolution.ll
+++ b/lld/test/ELF/lto/resolution.ll
@@ -12,16 +12,17 @@
 ; CHECK-NEXT: ]
 ; CHECK-NEXT: Address:
 ; CHECK-NEXT: Offset:
-; CHECK-NEXT: Size: 4
+; CHECK-NEXT: Size: 8
 ; CHECK-NEXT: Link: 0
 ; CHECK-NEXT: Info: 0
 ; CHECK-NEXT: AddressAlignment: 1
 ; CHECK-NEXT: EntrySize: 0
 ; CHECK-NEXT: SectionData (
-; CHECK-NEXT:   0000: 09000000 |{{.*}}|
+; CHECK-NEXT:   0000: 09000000 04000000 |{{.*}}|
 ; CHECK-NEXT: )
 
 target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
 @a = weak global i32 8
+@b = global i32 4