diff options
| author | Saleem Abdulrasool <compnerd@compnerd.org> | 2019-09-20 20:46:33 +0000 |
|---|---|---|
| committer | Saleem Abdulrasool <compnerd@compnerd.org> | 2019-09-20 20:46:33 +0000 |
| commit | 0ae02fd71a3828209df37239910568ecde68912a (patch) | |
| tree | 3c0c37b088728423b3b085a8ebdd65c699aedc00 | |
| parent | 216be996d68ec325f1d4341d3af78f078d430d4b (diff) | |
| download | bcm5719-llvm-0ae02fd71a3828209df37239910568ecde68912a.tar.gz bcm5719-llvm-0ae02fd71a3828209df37239910568ecde68912a.zip | |
Unwind: avoid warning about unused typedef
Move the definition of Elf_Addr typedef to the only place it is used, to avoid:
```
llvm-project/libunwind/src/AddressSpace.hpp:501:28: warning: unused typedef 'Elf_Addr' [-Wunused-local-typedef]
```
when compiling for Android with _LIBUNWIND_ARM_EHABI defined and
_LIBUNWIND_SUPPORT_DWARF_UNWIND not defined.
Patch by Joel Klinghed!
llvm-svn: 372427
| -rw-r--r-- | libunwind/src/AddressSpace.hpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libunwind/src/AddressSpace.hpp b/libunwind/src/AddressSpace.hpp index 2c9a083be2a..bf57fdacbe6 100644 --- a/libunwind/src/AddressSpace.hpp +++ b/libunwind/src/AddressSpace.hpp @@ -497,9 +497,6 @@ inline bool LocalAddressSpace::findUnwindSections(pint_t targetAddr, #if !defined(Elf_Phdr) typedef ElfW(Phdr) Elf_Phdr; #endif -#if !defined(Elf_Addr) && defined(__ANDROID__) - typedef ElfW(Addr) Elf_Addr; -#endif #if defined(_LIBUNWIND_SUPPORT_DWARF_UNWIND) #if !defined(_LIBUNWIND_SUPPORT_DWARF_INDEX) @@ -507,6 +504,9 @@ inline bool LocalAddressSpace::findUnwindSections(pint_t targetAddr, #endif size_t object_length; #if defined(__ANDROID__) +#if !defined(Elf_Addr) + typedef ElfW(Addr) Elf_Addr; +#endif Elf_Addr image_base = pinfo->dlpi_phnum ? reinterpret_cast<Elf_Addr>(pinfo->dlpi_phdr) - |
