diff options
| author | Dan Albert <danalbert@google.com> | 2019-03-05 14:20:07 -0800 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2019-03-05 14:20:07 -0800 |
| commit | cc3148bd34f3d0a7bdc2a2c18333bb56d2ae829b (patch) | |
| tree | eee7241cdd58a861b1eb25522165c2dc06dad92e /src/Unwind-EHABI.cpp | |
| parent | 99e952c01a773162b7c55a049be6f22bcd079a5a (diff) | |
| parent | 2ae4f16e7a3c5b6493b5eddbd76f231f3923eee0 (diff) | |
| download | libunwind_llvm-cc3148bd34f3d0a7bdc2a2c18333bb56d2ae829b.tar.gz | |
Merge to upstream r355142.android-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1android-o-mr1-iot-release-1.0.12android-o-mr1-iot-release-1.0.10oreo-mr1-iot-release
Test: external/libcxx/run_tests.py --bitness 32
Bug: None
Change-Id: Id93c4ae190bed3a19d6de2d1fbf45db481982789
Diffstat (limited to 'src/Unwind-EHABI.cpp')
| -rw-r--r-- | src/Unwind-EHABI.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/Unwind-EHABI.cpp b/src/Unwind-EHABI.cpp index f37732c..c64ca12 100644 --- a/src/Unwind-EHABI.cpp +++ b/src/Unwind-EHABI.cpp @@ -1,9 +1,8 @@ //===--------------------------- Unwind-EHABI.cpp -------------------------===// // -// The LLVM Compiler Infrastructure -// -// 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 // // // Implements ARM zero-cost C++ exceptions @@ -21,8 +20,6 @@ #include <stdlib.h> #include <string.h> -#include <type_traits> - #include "config.h" #include "libunwind.h" #include "libunwind_ext.h" |