From nobody Wed Dec 22 10:05:45 2021 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id BA1DE190561C; Wed, 22 Dec 2021 10:05:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JJpqd0Vqzz4YYT; Wed, 22 Dec 2021 10:05:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9BDC01B2C9; Wed, 22 Dec 2021 10:05:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BMA5jFn091778; Wed, 22 Dec 2021 10:05:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BMA5jKg091777; Wed, 22 Dec 2021 10:05:45 GMT (envelope-from git) Date: Wed, 22 Dec 2021 10:05:45 GMT Message-Id: <202112221005.1BMA5jKg091777@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 60857c2e5311 - stable/12 - Reapply r359582 (by emaste): List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 60857c2e5311f278c64e272a86cb36170e128f24 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640167550; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EcH4B/k1GjiX6zjHrEoLM4iqJuJd+X2I5PQi7rg5nD0=; b=axNexmfQI/VgwNMqinytN/TDjAGlCSkLVYp00dMYJkEsDzF2zdCtRQEbdLbOm5gB4CYNRh T/rev1BTl2ApvlP+rLrBKUCflDMn+jp27oCVVIG5RbeOsjR2L60DDSjOyGA7C8kdEwIdV7 Vsvip3ZZ1+pZh0Ma8XQGqq+7XEybTEn+tzvSfXvrhCAbTpGr9hLvV1pCalSYD9b73yQAiq 6gBoJGk0MfxWfE4xROpTPsoQjTcCJmx218wWWqNdKzKJLxEbyT8aqnO8gB4tLmLfqwYhcX 48UAysSaMFVFSNHwSYpMOk2vKIeKXRGN5d4MV8ws3twTC7paqQ6TGyarG2rOUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640167550; a=rsa-sha256; cv=none; b=RpwSRRZ9tHg0W7R+ac6ys551imgj+rtNYMgVfBJu/OBCmUzzBMrWzsONGGcY1WoTnyGjNq kM+b7iYnK2cqvQ8lWTZiwcuN2BBh3k/QoGmpNkMp9nBVjR/msnWptglCmliEY2jG6YRVOv sRHMrn8rYlkRXW+xW7l/0HJz4p8D5of2mJqYeMmzocOnQTB24HVxN1L5hmzQIYaazCvHTH SpDcJMHZKMlQG2Kgcy8IpFRULWYOG1izBf2O8WKDOlq4nROpchI4CqyppeBDej571JwHrz 7x1r7J5qxLAooMiRfH3Gn/HlBXdS5rk6tG3jeToQ10leJi5tOUEz0ndpN6YyYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=60857c2e5311f278c64e272a86cb36170e128f24 commit 60857c2e5311f278c64e272a86cb36170e128f24 Author: Dimitry Andric AuthorDate: 2020-08-06 19:15:31 +0000 Commit: Dimitry Andric 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">,