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

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