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 $@
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++
20 # End of variables for you to override.
25 $(RM) $(RTSDIR)/libgna*$(soext)
26 - cd $(RTSDIR); $(GCC_FOR_ADA_RTS) -shared $(GNATLIBCFLAGS) \
27 + cd $(RTSDIR); $(GCC_FOR_ADA_RTS) -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) \
33 - cd $(RTSDIR); $(GCC_FOR_ADA_RTS) -shared $(GNATLIBCFLAGS) \
34 + cd $(RTSDIR); $(GCC_FOR_ADA_RTS) -shared -shared-libgcc $(GNATLIBCFLAGS) \
35 $(PICFLAG_FOR_TARGET) \
36 -o libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
37 $(GNATRTL_TASKING_OBJS) \
38 $(SO_OPTS)libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
41 + ./libgnat-$(LIBRARY_VERSION)$(soext)
42 cd $(RTSDIR); $(LN_S) libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
44 cd $(RTSDIR); $(LN_S) libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
45 diff -urNp -x '*.orig' gcc-10.2.0.org/gcc/ada/link.c gcc-10.2.0/gcc/ada/link.c
46 --- gcc-10.2.0.org/gcc/ada/link.c 2020-07-23 08:35:17.200382966 +0200
47 +++ gcc-10.2.0/gcc/ada/link.c 2021-03-21 01:36:41.725335808 +0100
48 @@ -129,10 +129,10 @@ const char *__gnat_default_libgcc_subdir
50 #elif defined (__linux__) || defined (__GLIBC__)
51 const char *__gnat_object_file_option = "-Wl,@";
52 -const char *__gnat_run_path_option = "-Wl,-rpath,";
53 +const char *__gnat_run_path_option = "";
54 char __gnat_shared_libgnat_default = STATIC;
55 -char __gnat_shared_libgcc_default = STATIC;
56 -int __gnat_link_max = 8192;
57 +char __gnat_shared_libgcc_default = SHARED;
58 +int __gnat_link_max = 131072;
59 unsigned char __gnat_objlist_file_supported = 1;
60 const char *__gnat_object_library_extension = ".a";
61 unsigned char __gnat_separate_run_path_options = 0;