Skip to content

Commit bf94fae

Browse files
authored
Use x86_64 binutils package for android objdump/nm (#1803)
1 parent e07801f commit bf94fae

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

backend/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ RUN dpkg --add-architecture i386 \
5555
binutils-mipsel-linux-gnu \
5656
binutils-powerpc-linux-gnu \
5757
binutils-sh-elf \
58+
binutils-x86-64-linux-gnu \
5859
bzip2 \
5960
cpp \
6061
dj64 \

backend/coreapp/platforms.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -268,10 +268,8 @@ def from_id(platform_id: str) -> Platform:
268268
description="i686",
269269
arch="i686",
270270
assemble_cmd='i686-linux-android-as -o "$OUTPUT" "$PRELUDE" "$INPUT"',
271-
objdump_cmd="i686-linux-android-objdump",
272-
nm_cmd="i686-linux-android-nm",
273-
# While it supports disassembly, it doesn't allow specifying a symbol.
274-
supports_objdump_disassemble=False,
271+
objdump_cmd="x86_64-linux-gnu-objdump",
272+
nm_cmd="x86_64-linux-gnu-nm",
275273
)
276274

277275
_platforms: OrderedDict[str, Platform] = OrderedDict(

0 commit comments

Comments
 (0)