Skip to content

Commit

Permalink
Fix LLVM trunk build
Browse files Browse the repository at this point in the history
ld: error: duplicate symbol: dis_info
>>> defined at i386_disasm.c:1665
>>>            otool-i386_disasm.o:(dis_info)
>>> defined at arm_disasm.c:163
>>>            otool-arm_disasm.o:(.bss+0x8)

ld: error: duplicate symbol: dis_info
>>> defined at i386_disasm.c:1665
>>>            otool-i386_disasm.o:(dis_info)
>>> defined at arm64_disasm.c:62
>>>            otool-arm64_disasm.o:(.bss+0x0)
clang-11: error: linker command failed with exit code 1 (use -v to see invocation)
  • Loading branch information
tpoechtrager committed Mar 11, 2020
1 parent 2ac55b7 commit 4e1faec
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 0 deletions.
1 change: 1 addition & 0 deletions cctools/otool/arm64_disasm.c
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
#include "arm64_disasm.h"
#include "cxa_demangle.h"

static /* cctools-port */
struct disassemble_info {
/* otool(1) specific stuff */
enum bool verbose;
Expand Down
1 change: 1 addition & 0 deletions cctools/otool/arm_disasm.c
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ typedef char bfd_byte;

/* HACKS to avoid pulling in all of FSF binutils include/dis-asm.h */
typedef int (*fprintf_ftype) (void *, const char*, ...);
static /* cctools-port */
struct disassemble_info { /* HACK'ed up for just what we need here */
fprintf_ftype fprintf_func;
void *stream;
Expand Down
1 change: 1 addition & 0 deletions cctools/otool/i386_disasm.c
Original file line number Diff line number Diff line change
Expand Up @@ -1618,6 +1618,7 @@ static unsigned int xmm_rm(int r_m, int rex)
/*
* This is passed to the llvm disassembler.
*/
static /* cctools-port */
struct disassemble_info {
enum bool verbose;
/* Relocation information. */
Expand Down

0 comments on commit 4e1faec

Please sign in to comment.