diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2019-08-22 19:26:11 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2019-08-22 19:26:11 +0000 |
| commit | 14a0b2859e9d76204ca897de961b36344ce1e775 (patch) | |
| tree | 08901f9a2645ad5ec5813f4b15bdc92620e1f7e4 /contrib/compiler-rt/lib/tsan/rtl/tsan_interface_java.cc | |
| parent | 580d4aa65a2dadf52a0abc9451ab25918cb25125 (diff) | |
| parent | 8f3cadc28cb2bb9e8f9d69eeaaea1f57f2f7b2ab (diff) | |
| download | src-14a0b2859e9d76204ca897de961b36344ce1e775.tar.gz src-14a0b2859e9d76204ca897de961b36344ce1e775.zip | |
Merge compiler-rt trunk r366426, resolve conflicts, and add
FREEBSD-Xlist.
Notes
Notes:
svn path=/projects/clang900-import/; revision=351401
Diffstat (limited to 'contrib/compiler-rt/lib/tsan/rtl/tsan_interface_java.cc')
| -rw-r--r-- | contrib/compiler-rt/lib/tsan/rtl/tsan_interface_java.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/contrib/compiler-rt/lib/tsan/rtl/tsan_interface_java.cc b/contrib/compiler-rt/lib/tsan/rtl/tsan_interface_java.cc index 75e960e629f9..9f227f09589e 100644 --- a/contrib/compiler-rt/lib/tsan/rtl/tsan_interface_java.cc +++ b/contrib/compiler-rt/lib/tsan/rtl/tsan_interface_java.cc @@ -1,9 +1,8 @@ //===-- tsan_interface_java.cc --------------------------------------------===// // -// The LLVM Compiler Infrastructure -// -// 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 // //===----------------------------------------------------------------------===// // |