[incubator-doris] branch master updated: Fix build failure after binutils-dev 2.34 (#3449)

[morningman]

This is an automated email from the ASF dual-hosted git repository.

morningman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-doris.git


The following commit(s) were added to refs/heads/master by this push:
     new d948af6  Fix build failure after binutils-dev 2.34 (#3449)
d948af6 is described below

commit d948af6a2ffa99db62cedf019c4109cf0e3763e4
Author: Binglin Chang <decst...@gmail.com>
AuthorDate: Sun May 3 17:26:22 2020 +0800

    Fix build failure after binutils-dev 2.34 (#3449)
    
    Doris uses some binutils private API, and binutils-dev 2.34 remove them.
    This commit makes the code compatible with new versions.
---
 be/src/util/bfd_parser.cpp | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/be/src/util/bfd_parser.cpp b/be/src/util/bfd_parser.cpp
index 6bd1944..a0bff86 100644
--- a/be/src/util/bfd_parser.cpp
+++ b/be/src/util/bfd_parser.cpp
@@ -45,14 +45,28 @@ static void find_addr_in_section(bfd* abfd, asection* sec, 
void* arg) {
     if (ctx->found) {
         return;
     }
+#ifdef bfd_get_section_flags
     if ((bfd_get_section_flags(abfd, sec) & SEC_ALLOC) == 0) {
         return;
     }
+#else
+    if ((bfd_section_flags(sec) & SEC_ALLOC) == 0) {
+        return;
+    }
+#endif
+#ifdef bfd_get_section_vma
     auto vma = bfd_get_section_vma(abfd, sec);
+#else
+    auto vma = bfd_section_vma(sec);
+#endif
     if (ctx->pc < vma) {
         return;
     }
+#ifdef bfd_get_section_size
     auto size = bfd_get_section_size(sec);
+#else
+    auto size = bfd_section_size(sec);
+#endif
     if (ctx->pc >= vma + size) {
         return;
     }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org