Re: Native compiler - passing command line options to C compiler

[Andrea Corallo]

Arthur Miller <arthur.miller@live.com> writes:

[...]

>>
>> AFAIR that was the reason for that check so yes.
>>
>>   Andrea
>
> Ok, I have made those changes. I have removed double checks from both
> add_driver_options () and  add_compiler_options (). If it is not OK, I can 
> made
> another one and revert back this change in add_driver_options.
>
> I have also renamed native-comp-driver-options to native-comp-backend-options.
>
> I forgott to ask, which Changelog are we talking about? Changelo.3 in top 
> Emacs
> dir or some other file?
>
>>From d0c2b4f882fc67562de6ad67f6dcfdfe6378c32b Mon Sep 17 00:00:00 2001
> From: Arthur Miller <arthur.miller@live.com>
> Date: Tue, 31 Aug 2021 07:15:01 +0200
> Subject: [PATCH] Native comp: gcc cmdopts + rename driver-options to
>  backend-options.
>
> ---
>  lisp/emacs-lisp/bytecomp.el |   4 +-
>  lisp/emacs-lisp/comp.el     |  36 ++++++++---
>  src/comp.c                  | 122 ++++++++++++++++++++++++++----------
>  3 files changed, 118 insertions(+), 44 deletions(-)
>
[...]

>  #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)  \
> @@ -4377,43 +4378,95 @@ 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);
> +  Lisp_Object options = Fsymbol_value (Qnative_comp_backend_options);
>  
> -#if defined (LIBGCCJIT_HAVE_gcc_jit_context_add_driver_option)       \

This is still necessary to have the code compatible with old libgccjit.

> -  || defined (WINDOWSNT)
> -  load_gccjit_if_necessary (true);
> -  if (!NILP (Fcomp_native_driver_options_effective_p ()))
> +  if (!NILP (Fcomp_native_backend_options_effective_p ()))
> +    {
> +      load_gccjit_if_necessary (true);
> +      FOR_EACH_TAIL (options)
> +        gcc_jit_context_add_driver_option (comp.ctxt,
> +                                           /* FIXME: Need to encode
> +                                              this, but how? either
> +                                              ENCODE_FILE or
> +                                              ENCODE_SYSTEM.  */
> +                                           SSDATA (XCAR (options)));
> +    }
> +
> +  if (CONSP (options))
> +    xsignal1 (Qnative_compiler_error,
> +           build_string ("Customizing native compiler options"
> +                         " via `comp-native-backend-options' is"
> +                         " only available on libgccjit version 9"
> +                         " and above."));
> +
> +  /* Captured `comp-native-backend-options' because file-local.  */
> +  if (!NILP (Fcomp_native_backend_options_effective_p ()))
> +    {
> +      options = comp.backend_options;
> +      FOR_EACH_TAIL (options)
> +        gcc_jit_context_add_driver_option (comp.ctxt,
> +                                           /* FIXME: Need to encode
> +                                              this, but how? either
> +                                              ENCODE_FILE or
> +                                              ENCODE_SYSTEM.  */
> +                                           SSDATA (XCAR (options)));
> +    }
> +}
> +
> +static void
> +add_compiler_options (void)
> +{
> +  Lisp_Object options = Fsymbol_value (Qnative_comp_compiler_options);
> +
> +  if (!NILP (Fcomp_native_compiler_options_effective_p ()))
> +  {
> +    load_gccjit_if_necessary (true);
>      FOR_EACH_TAIL (options)
> -      gcc_jit_context_add_driver_option (comp.ctxt,
> -                                      /* FIXME: Need to encode
> -                                         this, but how? either
> -                                         ENCODE_FILE or
> -                                         ENCODE_SYSTEM.  */
> -                                      SSDATA (XCAR (options)));
> -#endif
> +        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)));
> +  }
>    if (CONSP (options))
>      xsignal1 (Qnative_compiler_error,
>             build_string ("Customizing native compiler options"
> -                         " via `comp-native-driver-options' is"
> +                         " via `comp-native-compiler-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)       \

Same

TIA

  Andrea