Andrew Geissler | 615f2f1 | 2022-07-15 14:00:58 -0500 | [diff] [blame^] | 1 | From 738549dea7a4e6c462a79962c414eaa450c2cffd Mon Sep 17 00:00:00 2001 |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Thu, 9 Apr 2020 13:06:27 -0700 |
Andrew Geissler | 615f2f1 | 2022-07-15 14:00:58 -0500 | [diff] [blame^] | 4 | Subject: [PATCH 1/3] absl: always use <asm/sgidefs.h> |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 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> |
Andrew Geissler | 615f2f1 | 2022-07-15 14:00:58 -0500 | [diff] [blame^] | 13 | |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 14 | --- |
| 15 | absl/base/internal/direct_mmap.h | 6 +----- |
| 16 | 1 file changed, 1 insertion(+), 5 deletions(-) |
| 17 | |
| 18 | diff --git a/absl/base/internal/direct_mmap.h b/absl/base/internal/direct_mmap.h |
Andrew Geissler | 615f2f1 | 2022-07-15 14:00:58 -0500 | [diff] [blame^] | 19 | index e492bb0..c8a4fba 100644 |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 20 | --- a/absl/base/internal/direct_mmap.h |
| 21 | +++ b/absl/base/internal/direct_mmap.h |
| 22 | @@ -41,13 +41,9 @@ |
| 23 | |
| 24 | #ifdef __mips__ |
| 25 | // Include definitions of the ABI currently in use. |
Andrew Geissler | 615f2f1 | 2022-07-15 14:00:58 -0500 | [diff] [blame^] | 26 | -#if defined(__BIONIC__) || !defined(__GLIBC__) |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 27 | -// Android doesn't have sgidefs.h, but does have asm/sgidefs.h, which has the |
| 28 | +// bionic/musl C libs don't have sgidefs.h, but do have asm/sgidefs.h, which has the |
| 29 | // definitions we need. |
| 30 | #include <asm/sgidefs.h> |
| 31 | -#else |
| 32 | -#include <sgidefs.h> |
Andrew Geissler | 615f2f1 | 2022-07-15 14:00:58 -0500 | [diff] [blame^] | 33 | -#endif // __BIONIC__ || !__GLIBC__ |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 34 | #endif // __mips__ |
| 35 | |
| 36 | // SYS_mmap and SYS_munmap are not defined in Android. |
| 37 | -- |
Andrew Geissler | eef6386 | 2021-01-29 15:58:13 -0600 | [diff] [blame] | 38 | 2.25.1 |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 39 | |