- fixed branch.diff, bug-111413.patch already in branch.diff

[packages/gcc.git] / gcc-ada-link.patch

diff --git a/gcc-ada-link.patch b/gcc-ada-link.patch
index e3df27e6eba9f29b872422406e2f77740bd0d4b9..f59ce30af8251d07d40338316f362c628649e5da 100644 (file)
--- a/gcc-ada-link.patch
+++ b/gcc-ada-link.patch
@@ -1,33 +1,7 @@
---- a/gcc/ada/link.c   2004-09-13 12:18:40.000000000 +0200
-+++ b/gcc/ada/link.c   2004-09-26 12:24:29.079704096 +0200
-@@ -213,10 +213,10 @@
- 
- #elif defined (linux) || defined(__GLIBC__)
- const char *__gnat_object_file_option = "";
--const char *__gnat_run_path_option = "-Wl,-rpath,";
-+const char *__gnat_run_path_option = "";
- char __gnat_shared_libgnat_default = STATIC;
--char __gnat_shared_libgcc_default = STATIC;
--int __gnat_link_max = 8192;
-+char __gnat_shared_libgcc_default = SHARED;
-+int __gnat_link_max = 131072;
- unsigned char __gnat_objlist_file_supported = 1;
- unsigned char __gnat_using_gnu_linker = 1;
- const char *__gnat_object_library_extension = ".a";
---- a/gcc/ada/gcc-interface/Make-lang.in       2004-09-01 12:46:47.000000000 +0200
-+++ b/gcc/ada/gcc-interface/Make-lang.in       2004-09-26 12:21:15.135188144 +0200
-@@ -378,7 +378,7 @@
- ada/doctools/xgnatugn$(build_exeext): ada/xgnatugn.adb
-       -$(MKDIR) ada/doctools
-       $(CP) $^ ada/doctools
--      cd ada/doctools && $(GNATMAKE) -q xgnatugn
-+      cd ada/doctools && $(GNATMAKE) -q xgnatugn -aO../rts
- 
- # Note that gnat_ugn_unw.texi does not depend on xgnatugn 
- # being built so we can distribute a pregenerated gnat_ugn_unw.info
---- a/gcc/ada/gcc-interface/Makefile.in        2005-05-26 10:48:40.000000000 +0000
-+++ b/gcc/ada/gcc-interface/Makefile.in        2005-05-26 10:59:25.000000000 +0000
-@@ -126,7 +126,7 @@
+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
+--- gcc-10.2.0.org/gcc/ada/gcc-interface/Makefile.in   2021-03-21 01:36:19.711335808 +0100
++++ gcc-10.2.0/gcc/ada/gcc-interface/Makefile.in       2021-03-21 01:36:41.726335808 +0100
+@@ -128,7 +128,7 @@ OUTPUT_OPTION = -o $@
  objext = .o
  exeext =
  arext  = .a
@@ -36,16 +10,29 @@
  shext  =
  hyphen = -
  
-@@ -193,7 +193,7 @@
+@@ -198,7 +198,7 @@ RTSDIR = rts$(subst /,_,$(MULTISUBDIR))
  # Link flags used to build gnat tools.  By default we prefer to statically
  # link with libgcc to avoid a dependency on shared libgcc (which is tricky
  # to deal with as it may conflict with the libgcc provided by the system).
--GCC_LINK_FLAGS=-static-libgcc
-+GCC_LINK_FLAGS=
+-GCC_LINK_FLAGS=-static-libstdc++ -static-libgcc
++GCC_LINK_FLAGS=-static-libstdc++
  
  # End of variables for you to override.
  
-@@ -2489,7 +2489,8 @@
+@@ -670,18 +670,19 @@
+            LN_S="$(LN_S)" \
+              gnatlib
+       $(RM) $(RTSDIR)/libgna*$(soext)
+-      cd $(RTSDIR); $(GCC_FOR_ADA_RTS) -shared $(GNATLIBCFLAGS) \
++      cd $(RTSDIR); $(GCC_FOR_ADA_RTS) -shared -shared-libgcc $(GNATLIBCFLAGS) \
+               $(PICFLAG_FOR_TARGET) \
+               -o libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
+               $(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS) \
+               $(SO_OPTS)libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
+               $(MISCLIB) -lm
+-      cd $(RTSDIR); $(GCC_FOR_ADA_RTS) -shared $(GNATLIBCFLAGS) \
++      cd $(RTSDIR); $(GCC_FOR_ADA_RTS) -shared -shared-libgcc $(GNATLIBCFLAGS) \
+               $(PICFLAG_FOR_TARGET) \
                -o libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
                $(GNATRTL_TASKING_OBJS) \
                $(SO_OPTS)libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
@@ -55,15 +42,20 @@
        cd $(RTSDIR); $(LN_S) libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
                libgnat$(soext)
        cd $(RTSDIR); $(LN_S) libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
---- a/gcc/ada/gcc-interface/Makefile.in~       2011-03-27 13:01:06.697666231 +0200
-+++ b/gcc/ada/gcc-interface/Makefile.in        2011-03-27 13:08:55.725801177 +0200
-@@ -2500,7 +2500,7 @@
-            THREAD_KIND="$(THREAD_KIND)" \
-              gnatlib
-       $(RM) $(RTSDIR)/libgna*$(soext)
--      cd $(RTSDIR); ../../xgcc -B../../ -shared $(GNATLIBCFLAGS) \
-+      cd $(RTSDIR); ../../xgcc -B../../ -shared -shared-libgcc $(GNATLIBCFLAGS) \
-               $(TARGET_LIBGCC2_CFLAGS) \
-               -o libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
-               $(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS) \
-
+diff -urNp -x '*.orig' gcc-10.2.0.org/gcc/ada/link.c gcc-10.2.0/gcc/ada/link.c
+--- gcc-10.2.0.org/gcc/ada/link.c      2020-07-23 08:35:17.200382966 +0200
++++ gcc-10.2.0/gcc/ada/link.c  2021-03-21 01:36:41.725335808 +0100
+@@ -129,10 +129,10 @@ const char *__gnat_default_libgcc_subdir
+ 
+ #elif defined (__linux__) || defined (__GLIBC__)
+ const char *__gnat_object_file_option = "-Wl,@";
+-const char *__gnat_run_path_option = "-Wl,-rpath,";
++const char *__gnat_run_path_option = "";
+ char __gnat_shared_libgnat_default = STATIC;
+-char __gnat_shared_libgcc_default = STATIC;
+-int __gnat_link_max = 8192;
++char __gnat_shared_libgcc_default = SHARED;
++int __gnat_link_max = 131072;
+ unsigned char __gnat_objlist_file_supported = 1;
+ const char *__gnat_object_library_extension = ".a";
+ unsigned char __gnat_separate_run_path_options = 0;