summaryrefslogtreecommitdiff
path: root/absl/base
diff options
context:
space:
mode:
authorGravatar Abseil Team <absl-team@google.com>2018-05-14 07:57:58 -0700
committerGravatar jueminyang <jueminyang@google.com>2018-05-14 13:15:39 -0400
commitadd89fd0e4bfd7d874bb55b67f4e13bf8beca762 (patch)
treed33fe008a0b8b6764d062f8c9f6f59b624515728 /absl/base
parentdd9911a004edcc34152850a6216bb3b53ad6bb82 (diff)
- 6194c9b0d6dbdbeeb27b19d5c61562f985b25ff2 Removing support for NaCL in dynamic_annotations.h. by Abseil Team <absl-team@google.com>
- 6f89386971a21422c4cd9653e965c96d9f7a3573 Fix handling of VDSOs that are loaded lower then their li... by Abseil Team <absl-team@google.com> - f27a7269ab714c9c75fe4e15fa1bce8b12531a92 Check that __GLIBC__ is defined before checking for __GLI... by Derek Mauro <dmauro@google.com> GitOrigin-RevId: 6194c9b0d6dbdbeeb27b19d5c61562f985b25ff2 Change-Id: I3eceb6f76bf2b25d55d1f5f77fba57af947da0cf
Diffstat (limited to 'absl/base')
-rw-r--r--absl/base/dynamic_annotations.h21
-rw-r--r--absl/base/policy_checks.h2
2 files changed, 1 insertions, 22 deletions
diff --git a/absl/base/dynamic_annotations.h b/absl/base/dynamic_annotations.h
index 3b6d6ef4..7e328d96 100644
--- a/absl/base/dynamic_annotations.h
+++ b/absl/base/dynamic_annotations.h
@@ -50,25 +50,6 @@
# define DYNAMIC_ANNOTATIONS_ENABLED 0
#endif
-#if defined(__native_client__)
- #include "nacl/dynamic_annotations.h"
-
- // Stub out the macros missing from the NaCl version.
- #ifndef ANNOTATE_CONTIGUOUS_CONTAINER
- #define ANNOTATE_CONTIGUOUS_CONTAINER(beg, end, old_mid, new_mid)
- #endif
- #ifndef ANNOTATE_RWLOCK_CREATE_STATIC
- #define ANNOTATE_RWLOCK_CREATE_STATIC(lock)
- #endif
- #ifndef ADDRESS_SANITIZER_REDZONE
- #define ADDRESS_SANITIZER_REDZONE(name)
- #endif
- #ifndef ANNOTATE_MEMORY_IS_UNINITIALIZED
- #define ANNOTATE_MEMORY_IS_UNINITIALIZED(address, size)
- #endif
-
-#else /* !__native_client__ */
-
#if DYNAMIC_ANNOTATIONS_ENABLED != 0
/* -------------------------------------------------------------
@@ -404,6 +385,4 @@ inline T ANNOTATE_UNPROTECTED_READ(const volatile T &x) { /* NOLINT */
#undef ATTRIBUTE_IGNORE_READS_BEGIN
#undef ATTRIBUTE_IGNORE_READS_END
-#endif /* !__native_client__ */
-
#endif /* ABSL_BASE_DYNAMIC_ANNOTATIONS_H_ */
diff --git a/absl/base/policy_checks.h b/absl/base/policy_checks.h
index d634dac6..0a07fc03 100644
--- a/absl/base/policy_checks.h
+++ b/absl/base/policy_checks.h
@@ -86,7 +86,7 @@
// in May, 2010 and includes some functionality used in Google software
// (for instance pthread_setname_np):
// https://sourceware.org/ml/libc-alpha/2010-05/msg00000.html
-#ifdef __GLIBC_PREREQ
+#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
#if !__GLIBC_PREREQ(2, 12)
#error "Minimum required version of glibc is 2.12."
#endif