aboutsummaryrefslogtreecommitdiffstats
path: root/lib/interception
diff options
context:
space:
mode:
authorDimitry Andric <dim@FreeBSD.org>2019-10-23 17:52:22 +0000
committerDimitry Andric <dim@FreeBSD.org>2019-10-23 17:52:22 +0000
commit3a1720af1d7f43edc5b214cde0be11bfb94d077e (patch)
tree029e0ff2d5e3c0eaf2405fd8e669555fdf5e1297 /lib/interception
parent8f3cadc28cb2bb9e8f9d69eeaaea1f57f2f7b2ab (diff)
downloadsrc-vendor/compiler-rt.tar.gz
src-vendor/compiler-rt.zip
Vendor import of stripped compiler-rt trunk r375505, the last commitvendor/compiler-rt/compiler-rt-trunk-r375505vendor/compiler-rt
before the upstream Subversion repository was made read-only, and the LLVM project migrated to GitHub: https://llvm.org/svn/llvm-project/compiler-rt/trunk@375505
Notes
Notes: svn path=/vendor/compiler-rt/dist/; revision=353944 svn path=/vendor/compiler-rt/compiler-rt-r375505/; revision=353945; tag=vendor/compiler-rt/compiler-rt-trunk-r375505
Diffstat (limited to 'lib/interception')
-rw-r--r--lib/interception/interception.h4
-rw-r--r--lib/interception/interception_linux.cpp (renamed from lib/interception/interception_linux.cc)2
-rw-r--r--lib/interception/interception_mac.cpp (renamed from lib/interception/interception_mac.cc)2
-rw-r--r--lib/interception/interception_type_test.cpp (renamed from lib/interception/interception_type_test.cc)2
-rw-r--r--lib/interception/interception_win.cpp (renamed from lib/interception/interception_win.cc)10
5 files changed, 10 insertions, 10 deletions
diff --git a/lib/interception/interception.h b/lib/interception/interception.h
index dacfa5ede28d..d27a8ccf92a8 100644
--- a/lib/interception/interception.h
+++ b/lib/interception/interception.h
@@ -272,9 +272,9 @@ const interpose_substitution substitution_##func_name[] \
// INTERCEPT_FUNCTION macro, only its name.
namespace __interception {
#if defined(_WIN64)
-typedef unsigned long long uptr; // NOLINT
+typedef unsigned long long uptr;
#else
-typedef unsigned long uptr; // NOLINT
+typedef unsigned long uptr;
#endif // _WIN64
} // namespace __interception
diff --git a/lib/interception/interception_linux.cc b/lib/interception/interception_linux.cpp
index 4b27102a159c..950cd5126538 100644
--- a/lib/interception/interception_linux.cc
+++ b/lib/interception/interception_linux.cpp
@@ -1,4 +1,4 @@
-//===-- interception_linux.cc -----------------------------------*- C++ -*-===//
+//===-- interception_linux.cpp ----------------------------------*- C++ -*-===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
diff --git a/lib/interception/interception_mac.cc b/lib/interception/interception_mac.cpp
index 5bfc1514d2b8..fb6eadcff597 100644
--- a/lib/interception/interception_mac.cc
+++ b/lib/interception/interception_mac.cpp
@@ -1,4 +1,4 @@
-//===-- interception_mac.cc -------------------------------------*- C++ -*-===//
+//===-- interception_mac.cpp ------------------------------------*- C++ -*-===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
diff --git a/lib/interception/interception_type_test.cc b/lib/interception/interception_type_test.cpp
index c00294a9b474..a611604a700c 100644
--- a/lib/interception/interception_type_test.cc
+++ b/lib/interception/interception_type_test.cpp
@@ -1,4 +1,4 @@
-//===-- interception_type_test.cc -------------------------------*- C++ -*-===//
+//===-- interception_type_test.cpp ------------------------------*- C++ -*-===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
diff --git a/lib/interception/interception_win.cc b/lib/interception/interception_win.cpp
index 40bde008052b..1a1c327e6124 100644
--- a/lib/interception/interception_win.cc
+++ b/lib/interception/interception_win.cpp
@@ -1,4 +1,4 @@
-//===-- interception_linux.cc -----------------------------------*- C++ -*-===//
+//===-- interception_linux.cpp ----------------------------------*- C++ -*-===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
@@ -883,8 +883,8 @@ uptr InternalGetProcAddress(void *module, const char *func_name) {
// Check that the module header is full and present.
RVAPtr<IMAGE_DOS_HEADER> dos_stub(module, 0);
RVAPtr<IMAGE_NT_HEADERS> headers(module, dos_stub->e_lfanew);
- if (!module || dos_stub->e_magic != IMAGE_DOS_SIGNATURE || // "MZ"
- headers->Signature != IMAGE_NT_SIGNATURE || // "PE\0\0"
+ if (!module || dos_stub->e_magic != IMAGE_DOS_SIGNATURE || // "MZ"
+ headers->Signature != IMAGE_NT_SIGNATURE || // "PE\0\0"
headers->FileHeader.SizeOfOptionalHeader <
sizeof(IMAGE_OPTIONAL_HEADER)) {
return 0;
@@ -963,8 +963,8 @@ bool OverrideImportedFunction(const char *module_to_patch,
// Check that the module header is full and present.
RVAPtr<IMAGE_DOS_HEADER> dos_stub(module, 0);
RVAPtr<IMAGE_NT_HEADERS> headers(module, dos_stub->e_lfanew);
- if (!module || dos_stub->e_magic != IMAGE_DOS_SIGNATURE || // "MZ"
- headers->Signature != IMAGE_NT_SIGNATURE || // "PE\0\0"
+ if (!module || dos_stub->e_magic != IMAGE_DOS_SIGNATURE || // "MZ"
+ headers->Signature != IMAGE_NT_SIGNATURE || // "PE\0\0"
headers->FileHeader.SizeOfOptionalHeader <
sizeof(IMAGE_OPTIONAL_HEADER)) {
return false;