[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
@@ -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 -a0../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 @@
 objext = .o
 exeext =
 arext  = .a
-soext  = .so
+soext  = .so.1
 shext  =
 hyphen = -
 
@@ -193,7 +193,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-libgcc
+GCC_LINK_FLAGS=
 
 # 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) \
@@ -2546,7 +2547,7 @@
 	     THREAD_KIND="$(THREAD_KIND)" \
              gnatlib
 	$(RM) $(RTSDIR)/libgna*$(soext)
-	cd $(RTSDIR); ../../xgcc -B../../ -shared $(TARGET_LIBGCC2_CFLAGS) \
+	cd $(RTSDIR); ../../xgcc -B../../ -shared -shared-libgcc $(TARGET_LIBGCC2_CFLAGS) \
 		-o libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
 		$(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS) \
 		$(SO_OPTS)libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) $(MISCLIB)
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
6b25254a	3	@@ -213,10 +213,10 @@
426f688a	4
6b25254a	5	#elif defined (linux) \|\| defined(__GLIBC__)
29255619 PS	6	const char *__gnat_object_file_option = "";
29255619 PS	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;
	14	unsigned char __gnat_objlist_file_supported = 1;
	15	unsigned char __gnat_using_gnu_linker = 1;
	16	const char *__gnat_object_library_extension = ".a";
37f6de33 PS	17	--- a/gcc/ada/gcc-interface/Make-lang.in 2004-09-01 12:46:47.000000000 +0200
37f6de33 PS	18	+++ b/gcc/ada/gcc-interface/Make-lang.in 2004-09-26 12:21:15.135188144 +0200
0b901dd0 PS	19	@@ -378,7 +378,7 @@
	20	ada/doctools/xgnatugn$(build_exeext): ada/xgnatugn.adb
	21	-$(MKDIR) ada/doctools
	22	$(CP) $^ ada/doctools
468d07c5 PS	23	- cd ada/doctools && $(GNATMAKE) -q xgnatugn
468d07c5 PS	24	+ cd ada/doctools && $(GNATMAKE) -q xgnatugn -a0../rts
0b901dd0 PS	25
	26	# Note that gnat_ugn_unw.texi does not depend on xgnatugn
	27	# being built so we can distribute a pregenerated gnat_ugn_unw.info
37f6de33 PS	28	--- a/gcc/ada/gcc-interface/Makefile.in 2005-05-26 10:48:40.000000000 +0000
37f6de33 PS	29	+++ b/gcc/ada/gcc-interface/Makefile.in 2005-05-26 10:59:25.000000000 +0000
6b25254a	30	@@ -126,7 +126,7 @@
426f688a JB	31	objext = .o
	32	exeext =
	33	arext = .a
	34	-soext = .so
	35	+soext = .so.1
	36	shext =
29255619	37	hyphen = -
426f688a	38
6b25254a PS	39	@@ -193,7 +193,7 @@
	40	# Link flags used to build gnat tools. By default we prefer to statically
	41	# link with libgcc to avoid a dependency on shared libgcc (which is tricky
	42	# to deal with as it may conflict with the libgcc provided by the system).
	43	-GCC_LINK_FLAGS=-static-libgcc
	44	+GCC_LINK_FLAGS=
468d07c5	45
6b25254a	46	# End of variables for you to override.
09aa0ab9	47
6b25254a	48	@@ -2489,7 +2489,8 @@
29255619	49	-o libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
426f688a	50	$(GNATRTL_TASKING_OBJS) \
29255619 PS	51	$(SO_OPTS)libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
	52	- $(THREADSLIB)
	53	+ $(THREADSLIB) \
426f688a	54	+ ./libgnat-$(LIBRARY_VERSION)$(soext)
37f6de33	55	cd $(RTSDIR); $(LN_S) libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
29255619	56	libgnat$(soext)
37f6de33	57	cd $(RTSDIR); $(LN_S) libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
6b25254a	58	@@ -2546,7 +2547,7 @@
ae704aa8 PS	59	THREAD_KIND="$(THREAD_KIND)" \
ae704aa8 PS	60	gnatlib
37f6de33 PS	61	$(RM) $(RTSDIR)/libgna*$(soext)
	62	- cd $(RTSDIR); ../../xgcc -B../../ -shared $(TARGET_LIBGCC2_CFLAGS) \
	63	+ cd $(RTSDIR); ../../xgcc -B../../ -shared -shared-libgcc $(TARGET_LIBGCC2_CFLAGS) \
ae704aa8 PS	64	-o libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
	65	$(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS) \
	66	$(SO_OPTS)libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) $(MISCLIB)