diff options
| author | Alexander Neben <alexander.neben@mongodb.com> | 2022-09-15 14:51:34 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-10-05 03:58:46 +0000 |
| commit | 8ed6de5926348e2bcf10f08fdf1c8665fc0ffa18 (patch) | |
| tree | bd8f00c7f9a4168c15078b855036afca7f191b8d | |
| parent | 0ca11aca38c75d3c8fb5bac5bd103b950718a896 (diff) | |
| download | mongo-8ed6de5926348e2bcf10f08fdf1c8665fc0ffa18.tar.gz | |
SERVER-69590 Fixed clang arm compiles
https://github.com/mongodb-forks/libunwind/commit/4e9596735f8f19fcf6afe0b411ce66df5cfb243b
This is the commit for the corresponding change to mongo-forks
(cherry picked from commit 3e661ebcc1fc8624472ae7de43a593a556ca8b4f)
5 files changed, 7 insertions, 15 deletions
diff --git a/src/third_party/unwind/SConscript b/src/third_party/unwind/SConscript index 0d74cfb8a78..9f4de94375b 100644 --- a/src/third_party/unwind/SConscript +++ b/src/third_party/unwind/SConscript @@ -141,6 +141,8 @@ if env['TARGET_ARCH'] == 'ppc64le': if env.ToolchainIs('clang'): env.Append(CCFLAGS=['-Wno-header-guard']) + if env['TARGET_ARCH'] == 'aarch64': + env.Append(CCFLAGS=['-Wno-absolute-value']) env.Append(CPPPATH=[ unwind_platform.Dir("build/include"), diff --git a/src/third_party/unwind/dist/include/libunwind-aarch64.h b/src/third_party/unwind/dist/include/libunwind-aarch64.h index a5265c4627b..5196b752a9b 100644 --- a/src/third_party/unwind/dist/include/libunwind-aarch64.h +++ b/src/third_party/unwind/dist/include/libunwind-aarch64.h @@ -37,11 +37,7 @@ extern "C" { #include <stdalign.h> #ifndef UNW_EMPTY_STRUCT -# ifdef __GNUC__ -# define UNW_EMPTY_STRUCT -# else -# define UNW_EMPTY_STRUCT uint8_t unused; -# endif +# define UNW_EMPTY_STRUCT uint8_t unused; #endif #define UNW_TARGET aarch64 diff --git a/src/third_party/unwind/dist/include/libunwind-arm.h b/src/third_party/unwind/dist/include/libunwind-arm.h index 0bea7958b3f..85134b40e96 100644 --- a/src/third_party/unwind/dist/include/libunwind-arm.h +++ b/src/third_party/unwind/dist/include/libunwind-arm.h @@ -33,11 +33,7 @@ extern "C" { #include <stddef.h> #ifndef UNW_EMPTY_STRUCT -# ifdef __GNUC__ -# define UNW_EMPTY_STRUCT -# else -# define UNW_EMPTY_STRUCT uint8_t unused; -# endif +# define UNW_EMPTY_STRUCT uint8_t unused; #endif #define UNW_TARGET arm diff --git a/src/third_party/unwind/dist/include/libunwind-x86.h b/src/third_party/unwind/dist/include/libunwind-x86.h index 40fe0464f2f..542c1774908 100644 --- a/src/third_party/unwind/dist/include/libunwind-x86.h +++ b/src/third_party/unwind/dist/include/libunwind-x86.h @@ -158,6 +158,7 @@ x86_regnum_t; typedef struct unw_tdep_save_loc { /* Additional target-dependent info on a save location. */ + char unused; } unw_tdep_save_loc_t; @@ -169,6 +170,7 @@ typedef ucontext_t unw_tdep_context_t; typedef struct { /* no x86-specific auxiliary proc-info */ + char unused; } unw_tdep_proc_info_t; diff --git a/src/third_party/unwind/platform/linux_aarch64/install/include/libunwind-aarch64.h b/src/third_party/unwind/platform/linux_aarch64/install/include/libunwind-aarch64.h index a5265c4627b..5196b752a9b 100644 --- a/src/third_party/unwind/platform/linux_aarch64/install/include/libunwind-aarch64.h +++ b/src/third_party/unwind/platform/linux_aarch64/install/include/libunwind-aarch64.h @@ -37,11 +37,7 @@ extern "C" { #include <stdalign.h> #ifndef UNW_EMPTY_STRUCT -# ifdef __GNUC__ -# define UNW_EMPTY_STRUCT -# else -# define UNW_EMPTY_STRUCT uint8_t unused; -# endif +# define UNW_EMPTY_STRUCT uint8_t unused; #endif #define UNW_TARGET aarch64 |