gcc-ada-link.patch

   1 diff -urNp -x '*.orig' gcc-10.2.0.org/gcc/ada/gcc-interface/Makefile.in gcc-10.2.0/gcc/ada/gcc-interface/Makefile.in
   2 --- gcc-10.2.0.org/gcc/ada/gcc-interface/Makefile.in    2021-03-21 01:36:19.711335808 +0100
   3 +++ gcc-10.2.0/gcc/ada/gcc-interface/Makefile.in        2021-03-21 01:36:41.726335808 +0100
   4 @@ -128,7 +128,7 @@ OUTPUT_OPTION = -o $@
   5  objext = .o
   6  exeext =
   7  arext  = .a
   8 -soext  = .so
   9 +soext  = .so.1
  10  shext  =
  11  hyphen = -
  12
  13 @@ -198,7 +198,7 @@ RTSDIR = rts$(subst /,_,$(MULTISUBDIR))
  14  # Link flags used to build gnat tools.  By default we prefer to statically
  15  # link with libgcc to avoid a dependency on shared libgcc (which is tricky
  16  # to deal with as it may conflict with the libgcc provided by the system).
  17 -GCC_LINK_FLAGS=-static-libstdc++ -static-libgcc
  18 +GCC_LINK_FLAGS=-static-libstdc++
  19
  20  # End of variables for you to override.
  21
  22 @@ -657,19 +657,20 @@ gnatlib-shared-default:
  23               gnatlib
  24         $(RM) $(RTSDIR)/libgna*$(soext)
  25         cd $(RTSDIR); `echo "$(GCC_FOR_TARGET)" \
  26 -                | sed -e 's,\./xgcc,../../xgcc,' -e 's,-B\./,-B../../,'` -shared $(GNATLIBCFLAGS) \
  27 +                | sed -e 's,\./xgcc,../../xgcc,' -e 's,-B\./,-B../../,'` -shared -shared-libgcc $(GNATLIBCFLAGS) \
  28                 $(PICFLAG_FOR_TARGET) \
  29                 -o libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
  30                 $(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS) \
  31                 $(SO_OPTS)libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
  32                 $(MISCLIB) -lm
  33         cd $(RTSDIR); `echo "$(GCC_FOR_TARGET)" \
  34 -                | sed -e 's,\./xgcc,../../xgcc,' -e 's,-B\./,-B../../,'` -shared $(GNATLIBCFLAGS) \
  35 +                | sed -e 's,\./xgcc,../../xgcc,' -e 's,-B\./,-B../../,'` -shared -shared-libgcc $(GNATLIBCFLAGS) \
  36                 $(PICFLAG_FOR_TARGET) \
  37                 -o libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
  38                 $(GNATRTL_TASKING_OBJS) \
  39                 $(SO_OPTS)libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
  40 -               $(THREADSLIB)
  41 +               $(THREADSLIB) \
  42 +               ./libgnat-$(LIBRARY_VERSION)$(soext)
  43         cd $(RTSDIR); $(LN_S) libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
  44                 libgnat$(soext)
  45         cd $(RTSDIR); $(LN_S) libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
  46 diff -urNp -x '*.orig' gcc-10.2.0.org/gcc/ada/link.c gcc-10.2.0/gcc/ada/link.c
  47 --- gcc-10.2.0.org/gcc/ada/link.c       2020-07-23 08:35:17.200382966 +0200
  48 +++ gcc-10.2.0/gcc/ada/link.c   2021-03-21 01:36:41.725335808 +0100
  49 @@ -129,10 +129,10 @@ const char *__gnat_default_libgcc_subdir
  50
  51  #elif defined (__linux__) || defined (__GLIBC__)
  52  const char *__gnat_object_file_option = "-Wl,@";
  53 -const char *__gnat_run_path_option = "-Wl,-rpath,";
  54 +const char *__gnat_run_path_option = "";
  55  char __gnat_shared_libgnat_default = STATIC;
  56 -char __gnat_shared_libgcc_default = STATIC;
  57 -int __gnat_link_max = 8192;
  58 +char __gnat_shared_libgcc_default = SHARED;
  59 +int __gnat_link_max = 131072;
  60  unsigned char __gnat_objlist_file_supported = 1;
  61  const char *__gnat_object_library_extension = ".a";
  62  unsigned char __gnat_separate_run_path_options = 0;