diff options
| author |  Copybara-Service <copybara-worker@google.com> | 2023-06-08 07:28:34 -0700 |
|---|---|---|
| committer | Copybara-Service <copybara-worker@google.com> | 2023-06-08 07:28:34 -0700 |
| commit | afc9206b3d55b1f21790c536e0a3a4fc0b57f68f (patch) | |
| tree | 158fe2b764714a4b90a410ca2ae948a51f17b13e | |
| parent | ae87791869cacbc125aa708108c4721e51ff703d (diff) | |
| parent | 872d99b48da314ed949770b9997bad404b73cb86 (diff) | |
Merge pull request #1471 from wenshan1:blan-add-VxWorks-support
PiperOrigin-RevId: 538778978
Change-Id: I0c04b09987eb4d97892825e3c994656d4e300f60
| -rw-r--r-- | absl/base/config.h | 9 | ||||
| -rw-r--r-- | absl/debugging/internal/elf_mem_image.h | 3 |
2 files changed, 7 insertions, 5 deletions
diff --git a/absl/base/config.h b/absl/base/config.h index 7d06e11c..4a167a2e 100644 --- a/absl/base/config.h +++ b/absl/base/config.h @@ -412,7 +412,7 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != 'h' || defined(__asmjs__) || defined(__wasm__) || defined(__Fuchsia__) || \ defined(__sun) || defined(__ASYLO__) || defined(__myriad2__) || \ defined(__HAIKU__) || defined(__OpenBSD__) || defined(__NetBSD__) || \ - defined(__QNX__) + defined(__QNX__) || defined(__VXWORKS__) #define ABSL_HAVE_MMAP 1 #endif @@ -424,7 +424,7 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != 'h' || #error ABSL_HAVE_PTHREAD_GETSCHEDPARAM cannot be directly set #elif defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || \ defined(_AIX) || defined(__ros__) || defined(__OpenBSD__) || \ - defined(__NetBSD__) + defined(__NetBSD__) || defined(__VXWORKS__) #define ABSL_HAVE_PTHREAD_GETSCHEDPARAM 1 #endif @@ -443,7 +443,8 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != 'h' || // POSIX.1-2001. #ifdef ABSL_HAVE_SCHED_YIELD #error ABSL_HAVE_SCHED_YIELD cannot be directly set -#elif defined(__linux__) || defined(__ros__) || defined(__native_client__) +#elif defined(__linux__) || defined(__ros__) || defined(__native_client__) || \ + defined(__VXWORKS__) #define ABSL_HAVE_SCHED_YIELD 1 #endif @@ -458,7 +459,7 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != 'h' || // platforms. #ifdef ABSL_HAVE_SEMAPHORE_H #error ABSL_HAVE_SEMAPHORE_H cannot be directly set -#elif defined(__linux__) || defined(__ros__) +#elif defined(__linux__) || defined(__ros__) || defined(__VXWORKS__) #define ABSL_HAVE_SEMAPHORE_H 1 #endif diff --git a/absl/debugging/internal/elf_mem_image.h b/absl/debugging/internal/elf_mem_image.h index 5f4537ba..8d95d0ba 100644 --- a/absl/debugging/internal/elf_mem_image.h +++ b/absl/debugging/internal/elf_mem_image.h @@ -33,7 +33,8 @@ #if defined(__ELF__) && !defined(__OpenBSD__) && !defined(__QNX__) && \ !defined(__native_client__) && !defined(__asmjs__) && \ - !defined(__wasm__) && !defined(__HAIKU__) && !defined(__sun) + !defined(__wasm__) && !defined(__HAIKU__) && !defined(__sun) && \ + !defined(__VXWORKS__) #define ABSL_HAVE_ELF_MEM_IMAGE 1 #endif |