Skip to content
Permalink
Browse files

8244819: hsdis does not compile with binutils 2.34+

Reviewed-by: kvn, thartmann
  • Loading branch information
YaSuenag committed May 19, 2020
1 parent 13cf783 commit ebf928a0e7d02ab66be47f78dd85e78c1147c2f3
Showing with 6 additions and 1 deletion.
  1. +6 −1 src/utils/hsdis/hsdis.c
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2008, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* The Universal Permissive License (UPL), Version 1.0
@@ -568,7 +568,12 @@ static void init_disassemble_info_from_bfd(struct disassemble_info* dinfo,
dinfo->arch = bfd_get_arch(abfd);
dinfo->mach = bfd_get_mach(abfd);
dinfo->disassembler_options = disassembler_options;
#if BFD_VERSION >= 234000000
/* bfd_octets_per_byte() has 2 args since binutils 2.34 */
dinfo->octets_per_byte = bfd_octets_per_byte (abfd, NULL);
#else
dinfo->octets_per_byte = bfd_octets_per_byte (abfd);
#endif
dinfo->skip_zeroes = sizeof(void*) * 2;
dinfo->skip_zeroes_at_end = sizeof(void*)-1;
dinfo->disassembler_needs_relocs = FALSE;

0 comments on commit ebf928a

Please sign in to comment.