]>
Commit | Line | Data |
---|---|---|
d96f8028 JB |
1 | --- gcc-9.5.0/gcc/ada/link.c.orig 2022-09-24 15:37:06.801813536 +0200 |
2 | +++ gcc-9.5.0/gcc/ada/link.c 2022-09-24 15:42:19.873450815 +0200 | |
3 | @@ -129,10 +129,10 @@ const char *__gnat_default_libgcc_subdir | |
426f688a | 4 | |
d96f8028 | 5 | #elif defined (__linux__) || defined (__GLIBC__) |
1a8eb1fb | 6 | const char *__gnat_object_file_option = "-Wl,@"; |
29255619 | 7 | -const char *__gnat_run_path_option = "-Wl,-rpath,"; |
d96f8028 | 8 | -char __gnat_shared_libgnat_default = STATIC; |
6b25254a PS |
9 | -char __gnat_shared_libgcc_default = STATIC; |
10 | -int __gnat_link_max = 8192; | |
d96f8028 JB |
11 | +const char *__gnat_run_path_option = ""; |
12 | +char __gnat_shared_libgnat_default = SHARED; | |
6b25254a | 13 | +char __gnat_shared_libgcc_default = SHARED; |
29255619 PS |
14 | +int __gnat_link_max = 131072; |
15 | unsigned char __gnat_objlist_file_supported = 1; | |
29255619 | 16 | const char *__gnat_object_library_extension = ".a"; |
1a8eb1fb | 17 | unsigned char __gnat_separate_run_path_options = 0; |
37f6de33 PS |
18 | --- a/gcc/ada/gcc-interface/Makefile.in 2005-05-26 10:48:40.000000000 +0000 |
19 | +++ b/gcc/ada/gcc-interface/Makefile.in 2005-05-26 10:59:25.000000000 +0000 | |
6b25254a | 20 | @@ -126,7 +126,7 @@ |
426f688a JB |
21 | objext = .o |
22 | exeext = | |
23 | arext = .a | |
24 | -soext = .so | |
25 | +soext = .so.1 | |
26 | shext = | |
29255619 | 27 | hyphen = - |
426f688a | 28 | |
cd56c029 | 29 | @@ -210,7 +210,7 @@ |
6b25254a PS |
30 | # Link flags used to build gnat tools. By default we prefer to statically |
31 | # link with libgcc to avoid a dependency on shared libgcc (which is tricky | |
32 | # to deal with as it may conflict with the libgcc provided by the system). | |
cd56c029 AM |
33 | -GCC_LINK_FLAGS=-static-libstdc++ -static-libgcc |
34 | +GCC_LINK_FLAGS=-static-libstdc++ | |
468d07c5 | 35 | |
6b25254a | 36 | # End of variables for you to override. |
09aa0ab9 | 37 | |
6b25254a | 38 | @@ -2489,7 +2489,8 @@ |
29255619 | 39 | -o libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \ |
426f688a | 40 | $(GNATRTL_TASKING_OBJS) \ |
29255619 PS |
41 | $(SO_OPTS)libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \ |
42 | - $(THREADSLIB) | |
43 | + $(THREADSLIB) \ | |
426f688a | 44 | + ./libgnat-$(LIBRARY_VERSION)$(soext) |
37f6de33 | 45 | cd $(RTSDIR); $(LN_S) libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \ |
29255619 | 46 | libgnat$(soext) |
37f6de33 | 47 | cd $(RTSDIR); $(LN_S) libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \ |
cd56c029 AM |
48 | --- a/gcc/ada/gcc-interface/Makefile.in~ 2014-07-16 18:43:51.000000000 +0200 |
49 | +++ b/gcc/ada/gcc-interface/Makefile.in 2014-07-16 18:46:09.555516586 +0200 | |
50 | @@ -2811,14 +2811,14 @@ | |
ae704aa8 | 51 | gnatlib |
37f6de33 | 52 | $(RM) $(RTSDIR)/libgna*$(soext) |
b4627121 AM |
53 | cd $(RTSDIR); `echo "$(GCC_FOR_TARGET)" \ |
54 | - | sed -e 's,\./xgcc,../../xgcc,' -e 's,-B\./,-B../../,'` -shared $(GNATLIBCFLAGS) \ | |
55 | + | sed -e 's,\./xgcc,../../xgcc,' -e 's,-B\./,-B../../,'` -shared -shared-libgcc $(GNATLIBCFLAGS) \ | |
56 | $(PICFLAG_FOR_TARGET) \ | |
ae704aa8 PS |
57 | -o libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \ |
58 | $(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS) \ | |
b4627121 AM |
59 | $(SO_OPTS)libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \ |
60 | $(MISCLIB) -lm | |
61 | cd $(RTSDIR); `echo "$(GCC_FOR_TARGET)" \ | |
62 | - | sed -e 's,\./xgcc,../../xgcc,' -e 's,-B\./,-B../../,'` -shared $(GNATLIBCFLAGS) \ | |
63 | + | sed -e 's,\./xgcc,../../xgcc,' -e 's,-B\./,-B../../,'` -shared -shared-libgcc $(GNATLIBCFLAGS) \ | |
64 | $(PICFLAG_FOR_TARGET) \ | |
65 | -o libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \ | |
66 | $(GNATRTL_TASKING_OBJS) \ |