On Tue, Mar 18, 2025 at 6:18 PM Iain Sandoe <iains....@gmail.com> wrote:
>
> Tested on x86_64 linux/darwin, aarch64 linux,
> OK for trunk?
LGTM.
Richard.
> thanks
> Iain
>
> --- 8< ---
>
> EXEC_LIB is no longer defined anywhere, so that the dependent code is
> now dead. The rpath code (if required) would need to be conditional
> since rpath support is not available on all hosts. Remove now and then
> address if/when it is needed (other drivers do not do this).
>
> gcc/cobol/ChangeLog:
>
> * gcobolspec.cc (append_rpath): Remove.
> (lang_specific_driver): Remove hard-wired rpath and library
> names.
>
> Signed-off-by: Iain Sandoe <i...@sandoe.co.uk>
> ---
> gcc/cobol/gcobolspec.cc | 38 +-------------------------------------
> 1 file changed, 1 insertion(+), 37 deletions(-)
>
> diff --git a/gcc/cobol/gcobolspec.cc b/gcc/cobol/gcobolspec.cc
> index 5bd68531bc4..4ae8e2cfd9e 100644
> --- a/gcc/cobol/gcobolspec.cc
> +++ b/gcc/cobol/gcobolspec.cc
> @@ -140,21 +140,6 @@ append_rdynamic()
> return;
> }
>
> -static void
> -append_rpath()
> - {
> -#ifdef EXEC_LIB
> - // Handing append_option() something on the stack Just Doesn't Work
> - if( strlen(EXEC_LIB) )
> - {
> - static char ach[256];
> - snprintf(ach, sizeof(ach), "-rpath=%s", EXEC_LIB);
> - append_option (OPT_Wl_, ach, 1);
> - }
> -#endif
> - return;
> - }
> -
> static void
> append_allow_multiple_definition()
> {
> @@ -250,9 +235,6 @@ lang_specific_driver (struct cl_decoded_option
> **in_decoded_options,
>
> int index_libgcobol_a = 0;
>
> - // This is for the -Wl,-rpath=<EXEC_LIB>
> - bool need_rpath = true;
> -
> bool no_files_error = true;
>
> #ifdef NOISY
> @@ -339,16 +321,6 @@ lang_specific_driver (struct cl_decoded_option
> **in_decoded_options,
> {
> need_allow_multiple_definition = false;
> }
> - if( strstr(decoded_options[i].orig_option_with_args_text, "-rpath") )
> - {
> - // The caller is doing something with -rpath. Assume they know
> what
> - // they are doing
> -
> - // On second thought, always install our rpath. It goes at the
> end,
> - // so if the user specifies and rpath that they prefer, it'll get
> - // taken first.
> - need_rpath = true;
> - }
> break;
>
> case OPT_nostdlib:
> @@ -616,12 +588,9 @@ lang_specific_driver (struct cl_decoded_option
> **in_decoded_options,
>
> if( need_libgcobol )
> {
> -#ifdef EXEC_LIB
> - append_option(OPT_L, EXEC_LIB, 1);
> -#endif
> add_arg_lib(COBOL_LIBRARY, static_libgcobol);
> }
> - if( need_libmath )
> + if( need_libmath)
> {
> add_arg_lib(MATH_LIBRARY, static_in_general);
> }
> @@ -649,11 +618,6 @@ lang_specific_driver (struct cl_decoded_option
> **in_decoded_options,
> append_allow_multiple_definition();
> }
>
> - if( need_rpath && (n_infiles || n_outfiles) )
> - {
> - append_rpath();
> - }
> -
> if( prior_main )
> {
> char ach[] = "\"-main\" without a source file";
> --
> 2.39.2 (Apple Git-143)
>
