Merge 4635de3 into f03582f

Gallopsled · Nov 29, 2023 · 8e429f9 · 8e429f9
2 parents f03582f + 4635de3
commit 8e429f9
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 1 deletion.
diff --git a/pwnlib/context/__init__.py b/pwnlib/context/__init__.py
@@ -787,7 +787,7 @@ def arch(self, arch):
         try:
             defaults = self.architectures[arch]
         except KeyError:
-            raise AttributeError('AttributeError: arch must be one of %r' % sorted(self.architectures))
+            raise AttributeError('AttributeError: arch (%r) must be one of %r' % (arch, sorted(self.architectures)))
 
         for k,v in defaults.items():
             if k not in self._tls:

diff --git a/pwnlib/data/elf/test-x32 b/pwnlib/data/elf/test-x32
diff --git a/pwnlib/data/elf/test-x32-pie b/pwnlib/data/elf/test-x32-pie
diff --git a/pwnlib/data/elf/test-x32-relro b/pwnlib/data/elf/test-x32-relro
diff --git a/pwnlib/data/elf/test-x32-relro-pie b/pwnlib/data/elf/test-x32-relro-pie
diff --git a/pwnlib/elf/elf.py b/pwnlib/elf/elf.py
@@ -460,6 +460,7 @@ def _describe(self, *a, **kw):
     def get_machine_arch(self):
         return {
             ('EM_X86_64', 64): 'amd64',
+            ('EM_X86_64', 32): 'amd64', # x32 ABI
             ('EM_386', 32): 'i386',
             ('EM_486', 32): 'i386',
             ('EM_ARM', 32): 'arm',