aboutsummaryrefslogtreecommitdiff
path: root/contrib/compiler-rt/lib/builtins/i386/floatdisf.S
diff options
context:
space:
mode:
authorDimitry Andric <dim@FreeBSD.org>2019-08-22 19:26:11 +0000
committerDimitry Andric <dim@FreeBSD.org>2019-08-22 19:26:11 +0000
commit14a0b2859e9d76204ca897de961b36344ce1e775 (patch)
tree08901f9a2645ad5ec5813f4b15bdc92620e1f7e4 /contrib/compiler-rt/lib/builtins/i386/floatdisf.S
parent580d4aa65a2dadf52a0abc9451ab25918cb25125 (diff)
parent8f3cadc28cb2bb9e8f9d69eeaaea1f57f2f7b2ab (diff)
downloadsrc-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/builtins/i386/floatdisf.S')
-rw-r--r--contrib/compiler-rt/lib/builtins/i386/floatdisf.S5
1 files changed, 3 insertions, 2 deletions
diff --git a/contrib/compiler-rt/lib/builtins/i386/floatdisf.S b/contrib/compiler-rt/lib/builtins/i386/floatdisf.S
index 0874eaaa9a98..d91f14e9f330 100644
--- a/contrib/compiler-rt/lib/builtins/i386/floatdisf.S
+++ b/contrib/compiler-rt/lib/builtins/i386/floatdisf.S
@@ -1,5 +1,6 @@
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. 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
#include "../assembly.h"