Merge remote-tracking branch

'origin/GP-4704_d-millar_endianness_fix--SQUASHED' into patch
(Closes #6656)
This commit is contained in:
Ryan Kurtz 2024-06-20 14:25:51 -04:00
commit 627e3f14fa

View File

@ -104,7 +104,7 @@ def get_arch():
def get_endian(): def get_endian():
parm = gdb.parameter('endian') parm = gdb.parameter('endian')
if parm != 'auto': if not parm in ['', 'auto', 'default']:
return parm return parm
# Once again, we have to hack using the human-readable 'show' # Once again, we have to hack using the human-readable 'show'
show = gdb.execute('show endian', to_string=True) show = gdb.execute('show endian', to_string=True)
@ -132,7 +132,7 @@ def get_osabi():
def compute_ghidra_language(): def compute_ghidra_language():
# First, check if the parameter is set # First, check if the parameter is set
lang = gdb.parameter('ghidra-language') lang = gdb.parameter('ghidra-language')
if lang != 'auto': if not lang in ['', 'auto', 'default']:
return lang return lang
# Get the list of possible languages for the arch. We'll need to sift # Get the list of possible languages for the arch. We'll need to sift
@ -157,7 +157,7 @@ def compute_ghidra_language():
def compute_ghidra_compiler(lang): def compute_ghidra_compiler(lang):
# First, check if the parameter is set # First, check if the parameter is set
comp = gdb.parameter('ghidra-compiler') comp = gdb.parameter('ghidra-compiler')
if comp != 'auto': if not comp in ['', 'auto', 'default']:
return comp return comp
# Check if the selected lang has specific compiler recommendations # Check if the selected lang has specific compiler recommendations