git: 60857c2e5311 - stable/12 - Reapply r359582 (by emaste):
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 22 Dec 2021 10:05:45 UTC
The branch stable/12 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=60857c2e5311f278c64e272a86cb36170e128f24 commit 60857c2e5311f278c64e272a86cb36170e128f24 Author: Dimitry Andric <dim@FreeBSD.org> AuthorDate: 2020-08-06 19:15:31 +0000 Commit: Dimitry Andric <dim@FreeBSD.org> CommitDate: 2021-12-22 09:58:22 +0000 Reapply r359582 (by emaste): lldb: use lua as the default script language In the FreeBSD base system we do not have Python support in lldb, but will have Lua support. Make Lua the default. This needs to be made into a configure-time option; that is being discussed upstream and will appear in a future lldb import. For now carry this change as a tiny patch to our copy of lldb. (cherry picked from commit 497dd4e30f74769630f8cadca302bb250b8bcaf1) --- contrib/llvm-project/lldb/include/lldb/lldb-enumerations.h | 2 +- contrib/llvm-project/lldb/source/Core/CoreProperties.td | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/llvm-project/lldb/include/lldb/lldb-enumerations.h b/contrib/llvm-project/lldb/include/lldb/lldb-enumerations.h index b3e8d604913f..c9def56ff109 100644 --- a/contrib/llvm-project/lldb/include/lldb/lldb-enumerations.h +++ b/contrib/llvm-project/lldb/include/lldb/lldb-enumerations.h @@ -215,7 +215,7 @@ enum ScriptLanguage { eScriptLanguagePython, eScriptLanguageLua, eScriptLanguageUnknown, - eScriptLanguageDefault = eScriptLanguagePython + eScriptLanguageDefault = eScriptLanguageLua }; /// Register numbering types. diff --git a/contrib/llvm-project/lldb/source/Core/CoreProperties.td b/contrib/llvm-project/lldb/source/Core/CoreProperties.td index b04738175f34..8b05b126fe6f 100644 --- a/contrib/llvm-project/lldb/source/Core/CoreProperties.td +++ b/contrib/llvm-project/lldb/source/Core/CoreProperties.td @@ -39,7 +39,7 @@ let Definition = "debugger" in { Desc<"The debugger command line prompt displayed for the user.">; def ScriptLanguage: Property<"script-lang", "Enum">, Global, - DefaultEnumValue<"eScriptLanguagePython">, + DefaultEnumValue<"eScriptLanguageLua">, EnumValues<"OptionEnumValues(g_language_enumerators)">, Desc<"The script language to be used for evaluating user-written scripts.">; def StopDisassemblyCount: Property<"stop-disassembly-count", "SInt64">,