diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2019-08-21 20:44:42 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2019-08-21 20:44:42 +0000 |
| commit | 22d1794578bafc3a0f25691c0531ba10d57713e6 (patch) | |
| tree | 7a15dfb784af9445419fb44eddb49d039bd4cdc2 /contrib/llvm/tools/lld/lib/ReaderWriter/MachO/SectCreateFile.h | |
| parent | e123fc8fd8677e4dc86f274cffd069e5d56f4a01 (diff) | |
| parent | f1e1c239e31b467e17f1648b1f524fc9ab5b431a (diff) | |
Merge lld trunk r366426, and resolve conflicts.
Notes
Notes:
svn path=/projects/clang900-import/; revision=351353
Diffstat (limited to 'contrib/llvm/tools/lld/lib/ReaderWriter/MachO/SectCreateFile.h')
| -rw-r--r-- | contrib/llvm/tools/lld/lib/ReaderWriter/MachO/SectCreateFile.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/contrib/llvm/tools/lld/lib/ReaderWriter/MachO/SectCreateFile.h b/contrib/llvm/tools/lld/lib/ReaderWriter/MachO/SectCreateFile.h index 49e65f63151d..7bb98e16695c 100644 --- a/contrib/llvm/tools/lld/lib/ReaderWriter/MachO/SectCreateFile.h +++ b/contrib/llvm/tools/lld/lib/ReaderWriter/MachO/SectCreateFile.h @@ -1,9 +1,8 @@ //===---- lib/ReaderWriter/MachO/SectCreateFile.h ---------------*- c++ -*-===// // -// The LLVM Linker -// -// This file is distributed under the University of Illinois Open Source -// License. See LICENSE.TXT for details. +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // //===----------------------------------------------------------------------===// |