| Andrew Geissler | 32b1199 | 2021-03-31 13:37:05 -0500 | [diff] [blame] | 1 | From 8f21fdfb83b0fa844a9f1f03a86a9ca46642d85e Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Thu, 9 Apr 2020 13:06:27 -0700 |
| 4 | Subject: [PATCH 1/2] absl: always use <asm/sgidefs.h> |
| 5 | |
| 6 | Fixes mips/musl build, since sgidefs.h is not present on all C libraries |
| 7 | but on linux asm/sgidefs.h is there and contains same definitions, using |
| 8 | that makes it portable. |
| 9 | |
| 10 | Upstream-Status: Pending |
| 11 | |
| 12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 13 | --- |
| 14 | third_party/abseil-cpp/absl/base/internal/direct_mmap.h | 6 +----- |
| 15 | 1 file changed, 1 insertion(+), 5 deletions(-) |
| 16 | |
| 17 | --- a/third_party/abseil-cpp/absl/base/internal/direct_mmap.h |
| 18 | +++ b/third_party/abseil-cpp/absl/base/internal/direct_mmap.h |
| 19 | @@ -41,13 +41,9 @@ |
| 20 | |
| 21 | #ifdef __mips__ |
| 22 | // Include definitions of the ABI currently in use. |
| 23 | -#ifdef __BIONIC__ |
| 24 | -// Android doesn't have sgidefs.h, but does have asm/sgidefs.h, which has the |
| 25 | +// bionic/musl C libs don't have sgidefs.h, but do have asm/sgidefs.h, which has the |
| 26 | // definitions we need. |
| 27 | #include <asm/sgidefs.h> |
| 28 | -#else |
| 29 | -#include <sgidefs.h> |
| 30 | -#endif // __BIONIC__ |
| 31 | #endif // __mips__ |
| 32 | |
| 33 | // SYS_mmap and SYS_munmap are not defined in Android. |