Virtualization/meson
1
0
Fork 0
mirror of https://gitlab.com/qemu-project/meson.git synced 2025-11-08 23:10:00 +08:00
Code Issues Projects Releases Wiki Activity

Revert "compilers/asm: Introduce an ASMCompiler base class"

Browse Source 
This reverts commit 1e254ad7f3.
This commit is contained in:
Dylan Baker
2025-10-06 10:06:10 -07:00
committed by GitHub
parent a5dc67a9fa
commit b2111914a7
1 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
mesonbuild/compilers/asm.py
View File

@ -26,12 +26,7 @@ nasm_optimization_args: T.Dict[str, T.List[str]] = {
}
class ASMCompiler(Compiler):
"""Shared base class for all ASM Compilers (Assemblers)"""
class NasmCompiler(ASMCompiler):
class NasmCompiler(Compiler):
language = 'nasm'
id = 'nasm'
@ -157,7 +152,7 @@ class YasmCompiler(NasmCompiler):
return ['--depfile', outfile]
# https://learn.microsoft.com/en-us/cpp/assembler/masm/ml-and-ml64-command-line-reference
class MasmCompiler(ASMCompiler):
class MasmCompiler(Compiler):
language = 'masm'
id = 'ml'
@ -215,7 +210,7 @@ class MasmCompiler(ASMCompiler):
# https://learn.microsoft.com/en-us/cpp/assembler/arm/arm-assembler-command-line-reference
class MasmARMCompiler(ASMCompiler):
class MasmARMCompiler(Compiler):
language = 'masm'
id = 'armasm'
@ -266,14 +261,14 @@ class MasmARMCompiler(ASMCompiler):
# https://downloads.ti.com/docs/esd/SPRUI04/
class TILinearAsmCompiler(TICompiler, ASMCompiler):
class TILinearAsmCompiler(TICompiler, Compiler):
language = 'linearasm'
def __init__(self, ccache: T.List[str], exelist: T.List[str], version: str,
for_machine: MachineChoice, info: MachineInfo,
linker: T.Optional[DynamicLinker] = None,
full_version: T.Optional[str] = None, is_cross: bool = False):
ASMCompiler.__init__(self, ccache, exelist, version, for_machine, info, linker, full_version, is_cross)
Compiler.__init__(self, ccache, exelist, version, for_machine, info, linker, full_version, is_cross)
TICompiler.__init__(self)
def needs_static_linker(self) -> bool:
@ -293,14 +288,14 @@ class TILinearAsmCompiler(TICompiler, ASMCompiler):
return 'd'
class MetrowerksAsmCompiler(MetrowerksCompiler, ASMCompiler):
class MetrowerksAsmCompiler(MetrowerksCompiler, Compiler):
language = 'nasm'
def __init__(self, ccache: T.List[str], exelist: T.List[str], version: str,
for_machine: 'MachineChoice', info: 'MachineInfo',
linker: T.Optional['DynamicLinker'] = None,
full_version: T.Optional[str] = None, is_cross: bool = False):
ASMCompiler.__init__(self, ccache, exelist, version, for_machine, info, linker, full_version, is_cross)
Compiler.__init__(self, ccache, exelist, version, for_machine, info, linker, full_version, is_cross)
MetrowerksCompiler.__init__(self)
self.warn_args: T.Dict[str, T.List[str]] = {