mirror of
https://github.com/NationalSecurityAgency/ghidra.git
synced 2024-11-21 19:42:14 +00:00
Merge remote-tracking branch 'origin/GP-5083_d-millar_warn_def_lang'
This commit is contained in:
commit
c702d7c66d
@ -182,13 +182,17 @@ def compute_ghidra_compiler(lang):
|
||||
|
||||
# Check if the selected lang has specific compiler recommendations
|
||||
if not lang in compiler_map:
|
||||
print(f"{lang} not found in compiler map")
|
||||
return 'default'
|
||||
comp_map = compiler_map[lang]
|
||||
if comp_map == data64_compiler_map:
|
||||
print(f"Using the DATA64 compiler map")
|
||||
osabi = get_osabi()
|
||||
if osabi in comp_map:
|
||||
return comp_map[osabi]
|
||||
if None in comp_map:
|
||||
return comp_map[None]
|
||||
print(f"{osabi} not found in compiler map")
|
||||
return 'default'
|
||||
|
||||
|
||||
|
@ -164,13 +164,17 @@ def compute_ghidra_compiler(lang):
|
||||
|
||||
# Check if the selected lang has specific compiler recommendations
|
||||
if not lang in compiler_map:
|
||||
print(f"{lang} not found in compiler map")
|
||||
return 'default'
|
||||
comp_map = compiler_map[lang]
|
||||
if comp_map == data64_compiler_map:
|
||||
print(f"Using the DATA64 compiler map")
|
||||
osabi = get_osabi()
|
||||
if osabi in comp_map:
|
||||
return comp_map[osabi]
|
||||
if None in comp_map:
|
||||
return comp_map[None]
|
||||
print(f"{osabi} not found in compiler map")
|
||||
return 'default'
|
||||
|
||||
|
||||
|
@ -225,14 +225,18 @@ def compute_ghidra_compiler(lang):
|
||||
key=lambda l: compiler_map[l]
|
||||
)
|
||||
if len(matched_lang) == 0:
|
||||
print(f"{lang} not found in compiler map")
|
||||
return 'default'
|
||||
|
||||
comp_map = compiler_map[matched_lang[0]]
|
||||
if comp_map == data64_compiler_map:
|
||||
print(f"Using the DATA64 compiler map")
|
||||
osabi = get_osabi()
|
||||
if osabi in comp_map:
|
||||
return comp_map[osabi]
|
||||
if None in comp_map:
|
||||
return comp_map[None]
|
||||
print(f"{osabi} not found in compiler map")
|
||||
return 'default'
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user