From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Arthur Miller Newsgroups: gmane.emacs.devel Subject: Re: Native compiler - passing command line options to C compiler Date: Wed, 01 Sep 2021 16:23:21 +0200 Message-ID: References: <83bl5fkvky.fsf@gnu.org> <83v93njc3x.fsf@gnu.org> <831r69u5s3.fsf@gnu.org> <83wno0r02e.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="5902"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) Cc: emacs-devel@gnu.org, akrl@sdf.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Wed Sep 01 16:24:16 2021 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mLR9x-0001Bg-Rv for ged-emacs-devel@m.gmane-mx.org; Wed, 01 Sep 2021 16:24:14 +0200 Original-Received: from localhost ([::1]:51600 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mLR9w-0004WJ-1V for ged-emacs-devel@m.gmane-mx.org; Wed, 01 Sep 2021 10:24:12 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:36618) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mLR9I-0003pA-LQ for emacs-devel@gnu.org; Wed, 01 Sep 2021 10:23:32 -0400 Original-Received: from mail-oln040092072090.outbound.protection.outlook.com ([40.92.72.90]:15022 helo=EUR03-VE1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mLR9D-0004KE-IE; Wed, 01 Sep 2021 10:23:31 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nBFusMH4m8GATBP4saD0vPAhqxngudGDUuG1pQi6fL2Q2N3dx260rQZyd2XCBxlELs+/XaVI9O3tmp7u7H7B9CAxK6rMY5mJ7Wz8TCecKuKe3lW/bwI5J58hVfpRp8Ez6EQ/uzMdGYtwqO2UHtfc2vssNGOMZ15RtPZU2zAYTjvtzSU+PDu6K8nM4+vMVHF+P8yWIh5s973hcYdr9hvxy2FweAdHaRQKtlA7PXguzXiguVbL5iQzO9aqQ9dQUGWlp137uAyw+Fj+WCXe+qXVBf99noqkN4VMpfLwHQzHp3YW8RfDki+28k8o4560Ibji7yqwVw0bzvg9so9sViMg1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=stQN5XeU56p5F+ccKzdrBnym6QVCnHRsG1QtW7+uMj4=; b=WBLr+m+eDY/d6R7mpgkgzp8HhB15TRxMRlEEmCUAzJs7YuaSVunlxytrsVhOMjjSz/qm0kDqiN86uGrE70OSClMBKVT+bhuNhiC3Ipgk49q9fp7CZEZ4IPWHZUQiIEAuRkaEBGfg7HgoQXHGV0ocXDRDBUYDi+R1WgXQcBbyU6ckYHnP5po8MP8otW1Kj8wdNhWnHPk6Yiprdn1SKmHClCoRXf0SsJ7JddmGBR6CG/ca4+p6KD04gawnUMvA5P2/1FJmPviBSnEYGhyoUbqQZ6GVpI/VIPmj59OTAFZG2ThXC4VfpoAyvi9FslY8//Ory7JkvwMqHSXTB+o1wtbjpA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=live.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=stQN5XeU56p5F+ccKzdrBnym6QVCnHRsG1QtW7+uMj4=; b=JzAvA4+LSxsGmVXBtetXn52TggM8MwZKGTpxal2FqQFsaL7W6y+oHiOtzhgFURQg1zrVU/59ZAKBL4EacmMxQyTohUB8c2QIQrSJ6aWTAXVnl/kLte4jxtiSupyrV8gVvIyk2dMjhkD/ZMp7T7JBhf10reGKraCeZwMGOg6IfYie2SL6oVWiPhkGeTS1hVGzQ6q0EaFZzF1zRgU1NqB5/arGFOgLvuSy1R3xmJOApj/6iEntj3ROq6f4B8uPBldixMwmvqXwvlBTP1jlpJAJ+iwbGoNUMbQ9/6Y8mAAn94Yf3u14M+owCF6wcaetbpaWxiOfwfwjt8zNeAqfvzJ3gA== Original-Received: from VE1EUR03FT050.eop-EUR03.prod.protection.outlook.com (2a01:111:e400:7e09::4e) by VE1EUR03HT062.eop-EUR03.prod.protection.outlook.com (2a01:111:e400:7e09::276) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4457.17; Wed, 1 Sep 2021 14:23:22 +0000 Original-Received: from AM9PR09MB4977.eurprd09.prod.outlook.com (2a01:111:e400:7e09::53) by VE1EUR03FT050.mail.protection.outlook.com (2a01:111:e400:7e09::465) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.19 via Frontend Transport; Wed, 1 Sep 2021 14:23:22 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:52E76B19C2C46D62BD5295267E7D91C7D9DAE0BA7F96F31D88758A36451888C0; UpperCasedChecksum:668029C11F18E1382A97E896280D26D509650B6A155D0C130540C38547B4B63F; SizeAsReceived:7931; Count:46 Original-Received: from AM9PR09MB4977.eurprd09.prod.outlook.com ([fe80::35f2:ac79:ee50:c46c]) by AM9PR09MB4977.eurprd09.prod.outlook.com ([fe80::35f2:ac79:ee50:c46c%8]) with mapi id 15.20.4457.024; Wed, 1 Sep 2021 14:23:22 +0000 In-Reply-To: <83wno0r02e.fsf@gnu.org> (Eli Zaretskii's message of "Wed, 01 Sep 2021 14:45:45 +0300") X-TMN: [SUnNjFjqaM3mjbhJvLoFjE8e92xcl68j] X-ClientProxiedBy: AS8P189CA0025.EURP189.PROD.OUTLOOK.COM (2603:10a6:20b:31f::26) To AM9PR09MB4977.eurprd09.prod.outlook.com (2603:10a6:20b:304::20) X-Microsoft-Original-Message-ID: <87mtow74ti.fsf@live.com> X-MS-Exchange-MessageSentRepresentingType: 1 Original-Received: from pascal.homepc (81.232.177.30) by AS8P189CA0025.EURP189.PROD.OUTLOOK.COM (2603:10a6:20b:31f::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.19 via Frontend Transport; Wed, 1 Sep 2021 14:23:22 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 46 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 5e412407-2e10-4244-4ea8-08d96d540d9d X-MS-TrafficTypeDiagnostic: VE1EUR03HT062: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /ktIby3HwUhQMBaWgBVZKEjk5qAujviKeq4kt2zqB+3wJLuAdkSY+dFTORzoiyDjjLLTKxXgdDF2nvZORz+JtQQSdxK8rqsa97qZbDi9PmxKV6AUPwftC3P9BR+Lc3TE13QOhz2SsDf7b531KCpzLTBIRyY63pTvY+w6VKowKaQnxDzhw3Qb9XvDHACs0mfg4ODnbQEBfpNnWFT94AqUrRNh63OrFL/6YH91irfrR1sGRjvPwCgWgWYQVyYX2xmkhhKkE6PTbc3/AzTPVCPWip5XGhwOmuxBKVoj+CKg1XEm/dFdSqELFa7nAeajQxqMkck1ocsHCfXjva0gqEBPCRoLgF04L5RkXvQfB/IrjvNi4FGBzvMExwQz8rE1brCw08PsDnIyTgeI8IAn9eYoa/0aMsZjqBdt+sTb2XB/hyEAQ0pztiwp0grBq0I2hQS8 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: kkSXba8yc1ue5hTgvAr/mE0g3c0v6SwKZb3rM8XttOkxWzez5Gffj18Uw8JOTW9doQfJ6zKP7NF3F19Z5EYarstsl87q19iK1T4D2aqIGnq8kOYdcRzHgCN29UHzf/tubBpU9KG83ftMoruv5+Iu3g== X-OriginatorOrg: live.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5e412407-2e10-4244-4ea8-08d96d540d9d X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Sep 2021 14:23:22.6353 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: VE1EUR03FT050.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1EUR03HT062 Received-SPF: pass client-ip=40.92.72.90; envelope-from=arthur.miller@live.com; helo=EUR03-VE1-obe.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.io gmane.emacs.devel:273662 Archived-At: --=-=-= Content-Type: text/plain Eli Zaretskii writes: >> From: Arthur Miller >> Cc: akrl@sdf.org, emacs-devel@gnu.org >> Date: Wed, 01 Sep 2021 00:53:31 +0200 >> >> > No file. We no longer maintain ChangeLog files by hand, we generate >> > them from Git log. So you should include in the patch the log message >> > formatted according to ChangeLog rules, but not a patch to any >> > specific ChangeLog file. >> >> Oki, guys here is one: no Windows check, but double checks left. That is what is >> asked? Hopefully changelog works, I have tried to conform to instruction in >> CONTRIBUTING and I have tried to keep mysef breef. > > Almost there: the commit log message should mention the files and > functions where you made the changes. Look at the other log messages > in git, and you will see the difference (feel free to ask if still > unclear). > > Thanks for working on this. See if this is ok. I don't know how to get in ` into git message. My bash is complaining, but I see in some git log that Lars had quoted some names with `'. Found also one check for WINDOWS I forgott to remove. See if this one is ok: --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=ncomp-options.patch >From f4e7c83ce034e3ea5ae1c0fdd4d3c7872c978dcd Mon Sep 17 00:00:00 2001 From: Arthur Miller Date: Wed, 1 Sep 2021 16:15:42 +0200 Subject: [PATCH] Native comp add/change GCC command-line options Added support for GCC command-line options and renamed native-comp-driver-options to native-comp-backend-options to better reflect which options are passed to GCC. * lisp/emacs-lisp/comp.el: add user option 'native-comp-compiler-options' and rename 'native-comp-driver-options' to 'native-comp-backend-options' with changes needed to implement the feature and the rename. * list/emacs-lisp/bytecomp.el: adapt to the change in comp.el. * src/comp.c: add support to implement 'native-comp-compiler-options' and the rename of driver options to backend options. --- lisp/emacs-lisp/bytecomp.el | 4 +- lisp/emacs-lisp/comp.el | 36 +++++++++++---- src/comp.c | 90 +++++++++++++++++++++++++++++-------- 3 files changed, 101 insertions(+), 29 deletions(-) diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index 145cdbaa6e..c2f7b951d9 100644 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el @@ -2257,8 +2257,8 @@ byte-compile-from-buffer (push `(native-comp-speed . ,native-comp-speed) byte-native-qualities) (defvar native-comp-debug) (push `(native-comp-debug . ,native-comp-debug) byte-native-qualities) - (defvar native-comp-driver-options) - (push `(native-comp-driver-options . ,native-comp-driver-options) + (defvar native-comp-backend-options) + (push `(native-comp-backend-options . ,native-comp-backend-options) byte-native-qualities) (defvar no-native-compile) (push `(no-native-compile . ,no-native-compile) diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el index 80a1da5ad8..30febaf7d8 100644 --- a/lisp/emacs-lisp/comp.el +++ b/lisp/emacs-lisp/comp.el @@ -166,14 +166,24 @@ native-comp-async-query-on-exit :type 'boolean :version "28.1") -(defcustom native-comp-driver-options nil +(defcustom native-comp-compiler-options nil + "Command line options passed verbatim to GCC compiler. +Note that not all options are meaningful and some options might even +break your Emacs. Use at own risk. + +Passing these options is only available in libgccjit version 9 +and above." + :type '(repeat string) + :version "28.1") + +(defcustom native-comp-backend-options nil "Options passed verbatim to the native compiler's back-end driver. Note that not all options are meaningful; typically only the options affecting the assembler and linker are likely to be useful. Passing these options is only available in libgccjit version 9 and above." - :type '(repeat string) ; FIXME is this right? + :type '(repeat string) :version "28.1") (defcustom comp-libgccjit-reproducer nil @@ -755,8 +765,10 @@ comp-data-container :documentation "Default speed for this compilation unit.") (debug native-comp-debug :type number :documentation "Default debug level for this compilation unit.") - (driver-options native-comp-driver-options :type list - :documentation "Options for the GCC driver.") + (compiler-options native-comp-compiler-options :type list + :documentation "Options for the GCC compiler.") + (backend-options native-comp-backend-options :type list + :documentation "Options for the GCC driver.") (top-level-forms () :type list :documentation "List of spilled top level forms.") (funcs-h (make-hash-table :test #'equal) :type hash-table @@ -1347,7 +1359,9 @@ comp-spill-lap-function byte-native-qualities) (comp-ctxt-debug comp-ctxt) (alist-get 'native-comp-debug byte-native-qualities) - (comp-ctxt-driver-options comp-ctxt) (alist-get 'native-comp-driver-options + (comp-ctxt-compiler-options comp-ctxt) (alist-get 'native-comp-compiler-options + byte-native-qualities) + (comp-ctxt-backend-options comp-ctxt) (alist-get 'native-comp-backend-options byte-native-qualities) (comp-ctxt-top-level-forms comp-ctxt) (cl-loop @@ -3663,8 +3677,10 @@ comp-final comp-libgccjit-reproducer ,comp-libgccjit-reproducer comp-ctxt ,comp-ctxt native-comp-eln-load-path ',native-comp-eln-load-path - native-comp-driver-options - ',native-comp-driver-options + native-comp-backend-options + ',native-comp-backend-options + native-comp-compiler-options + ',native-comp-compiler-options load-path ',load-path) ,native-comp-async-env-modifier-form (message "Compiling %s..." ',output) @@ -3926,8 +3942,10 @@ comp-run-async-workers comp-libgccjit-reproducer ,comp-libgccjit-reproducer comp-async-compilation t native-comp-eln-load-path ',native-comp-eln-load-path - native-comp-driver-options - ',native-comp-driver-options + native-comp-backend-options + ',native-comp-backend-options + native-comp-compiler-options + ',native-comp-compiler-options load-path ',load-path warning-fill-column most-positive-fixnum) ,native-comp-async-env-modifier-form diff --git a/src/comp.c b/src/comp.c index 3ea2836560..7dfb4c7f23 100644 --- a/src/comp.c +++ b/src/comp.c @@ -509,7 +509,8 @@ #define NUM_CAST_TYPES 15 typedef struct { EMACS_INT speed; EMACS_INT debug; - Lisp_Object driver_options; + Lisp_Object backend_options; + Lisp_Object compiler_options; gcc_jit_context *ctxt; gcc_jit_type *void_type; gcc_jit_type *bool_type; @@ -4361,15 +4362,14 @@ DEFUN ("comp--release-ctxt", Fcomp__release_ctxt, Scomp__release_ctxt, } #pragma GCC diagnostic ignored "-Waddress" -DEFUN ("comp-native-driver-options-effective-p", - Fcomp_native_driver_options_effective_p, - Scomp_native_driver_options_effective_p, +DEFUN ("comp-native-backend-options-effective-p", + Fcomp_native_backend_options_effective_p, + Scomp_native_backend_options_effective_p, 0, 0, 0, - doc: /* Return t if `comp-native-driver-options' is effective. */) + doc: /* Return t if `comp-native-backend-options' is effective. */) (void) { -#if defined (LIBGCCJIT_HAVE_gcc_jit_context_add_driver_option) \ - || defined (WINDOWSNT) +#if defined (LIBGCCJIT_HAVE_gcc_jit_context_add_driver_option) if (gcc_jit_context_add_driver_option) return Qt; #endif @@ -4377,15 +4377,30 @@ DEFUN ("comp-native-driver-options-effective-p", } #pragma GCC diagnostic pop +#pragma GCC diagnostic ignored "-Waddress" +DEFUN ("comp-native-compiler-options-effective-p", + Fcomp_native_compiler_options_effective_p, + Scomp_native_compiler_options_effective_p, + 0, 0, 0, + doc: /* Return t if `comp-native-compiler-options' is effective. */) + (void) +{ +#if defined (LIBGCCJIT_HAVE_gcc_jit_context_add_command_line_option) + if (gcc_jit_context_add_command_line_option) + return Qt; +#endif + return Qnil; +} +#pragma GCC diagnostic pop + static void add_driver_options (void) { Lisp_Object options = Fsymbol_value (Qnative_comp_driver_options); -#if defined (LIBGCCJIT_HAVE_gcc_jit_context_add_driver_option) \ - || defined (WINDOWSNT) +#if defined (LIBGCCJIT_HAVE_gcc_jit_context_add_driver_option) load_gccjit_if_necessary (true); - if (!NILP (Fcomp_native_driver_options_effective_p ())) + if (!NILP (Fcomp_native_backend_options_effective_p ())) FOR_EACH_TAIL (options) gcc_jit_context_add_driver_option (comp.ctxt, /* FIXME: Need to encode @@ -4397,15 +4412,14 @@ add_driver_options (void) if (CONSP (options)) xsignal1 (Qnative_compiler_error, build_string ("Customizing native compiler options" - " via `comp-native-driver-options' is" + " via `comp-native-backend-options' is" " only available on libgccjit version 9" " and above.")); /* Captured `comp-native-driver-options' because file-local. */ -#if defined (LIBGCCJIT_HAVE_gcc_jit_context_add_driver_option) \ - || defined (WINDOWSNT) - options = comp.driver_options; - if (!NILP (Fcomp_native_driver_options_effective_p ())) +#if defined (LIBGCCJIT_HAVE_gcc_jit_context_add_driver_option) + options = comp.backend_options; + if (!NILP (Fcomp_native_backend_options_effective_p ())) FOR_EACH_TAIL (options) gcc_jit_context_add_driver_option (comp.ctxt, /* FIXME: Need to encode @@ -4416,6 +4430,43 @@ add_driver_options (void) #endif } +static void +add_compiler_options (void) +{ + Lisp_Object options = Fsymbol_value (Qnative_comp_compiler_options); + +#if defined (LIBGCCJIT_HAVE_gcc_jit_context_add_command_line_option) + load_gccjit_if_necessary (true); + if (!NILP (Fcomp_native_compiler_options_effective_p ())) + FOR_EACH_TAIL (options) + gcc_jit_context_add_command_line_option (comp.ctxt, + /* FIXME: Need to encode + this, but how? either + ENCODE_FILE or + ENCODE_SYSTEM. */ + SSDATA (XCAR (options))); +#endif + if (CONSP (options)) + xsignal1 (Qnative_compiler_error, + build_string ("Customizing native compiler options" + " via `comp-native-compiler-options' is" + " only available on libgccjit version 9" + " and above.")); + + /* Captured `comp-native-compiler-options' because file-local. */ +#if defined (LIBGCCJIT_HAVE_gcc_jit_context_add_command_line_option) + options = comp.compiler_options; + if (!NILP (Fcomp_native_compiler_options_effective_p ())) + FOR_EACH_TAIL (options) + gcc_jit_context_add_command_line_option (comp.ctxt, + /* FIXME: Need to encode + this, but how? either + ENCODE_FILE or + ENCODE_SYSTEM. */ + SSDATA (XCAR (options))); +#endif +} + DEFUN ("comp--compile-ctxt-to-file", Fcomp__compile_ctxt_to_file, Scomp__compile_ctxt_to_file, 1, 1, 0, @@ -4460,7 +4511,7 @@ DEFUN ("comp--compile-ctxt-to-file", Fcomp__compile_ctxt_to_file, eassert (comp.speed < INT_MAX); comp.debug = XFIXNUM (CALL1I (comp-ctxt-debug, Vcomp_ctxt)); eassert (comp.debug < INT_MAX); - comp.driver_options = CALL1I (comp-ctxt-driver-options, Vcomp_ctxt); + comp.backend_options = CALL1I (comp-ctxt-backend-options, Vcomp_ctxt); if (comp.debug) gcc_jit_context_set_bool_option (comp.ctxt, @@ -4536,6 +4587,7 @@ DEFUN ("comp--compile-ctxt-to-file", Fcomp__compile_ctxt_to_file, #endif add_driver_options (); + add_compiler_options (); if (comp.debug > 1) gcc_jit_context_dump_to_file (comp.ctxt, @@ -5241,7 +5293,8 @@ syms_of_comp (void) DEFSYM (Qnative_comp_speed, "native-comp-speed"); DEFSYM (Qnative_comp_debug, "native-comp-debug"); - DEFSYM (Qnative_comp_driver_options, "native-comp-driver-options"); + DEFSYM (Qnative_comp_backend_options, "native-comp-backend-options"); + DEFSYM (Qnative_comp_compiler_options, "native-comp-compiler-options"); DEFSYM (Qcomp_libgccjit_reproducer, "comp-libgccjit-reproducer"); /* Limple instruction set. */ @@ -5350,7 +5403,8 @@ syms_of_comp (void) defsubr (&Scomp__subr_signature); defsubr (&Scomp_el_to_eln_rel_filename); defsubr (&Scomp_el_to_eln_filename); - defsubr (&Scomp_native_driver_options_effective_p); + defsubr (&Scomp_native_backend_options_effective_p); + defsubr (&Scomp_native_compiler_options_effective_p); defsubr (&Scomp__install_trampoline); defsubr (&Scomp__init_ctxt); defsubr (&Scomp__release_ctxt); -- 2.33.0 --=-=-=--