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

--- gcc-4.0-20040919/gcc/ada/link.c.orig	2004-09-13 12:18:40.000000000 +0200
+++ gcc-4.0-20040919/gcc/ada/link.c	2004-09-26 12:24:29.079704096 +0200
@@ -164,9 +164,9 @@
 
 #elif defined (linux)
 const char *__gnat_object_file_option = "";
-const char *__gnat_run_path_option = "-Wl,-rpath,";
-char __gnat_shared_libgnat_default = STATIC;
-int __gnat_link_max = 8192;
+const char *__gnat_run_path_option = "";
+char __gnat_shared_libgnat_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";
--- gcc-4.0-20040919/gcc/ada/Makefile.in.orig	2004-09-26 11:40:30.000000000 +0200
+++ gcc-4.0-20040919/gcc/ada/Makefile.in	2004-09-26 12:29:16.913946640 +0200
@@ -139,7 +139,7 @@
 objext = .o
 exeext =
 arext  = .a
-soext  = .so
+soext  = .so.1
 shext  =
 hyphen = -
 
@@ -1413,6 +1413,31 @@
   LIBRARY_VERSION := $(LIB_VERSION)
 endif
 
+ifeq ($(strip $(filter-out sparc% linux%,$(arch) $(osys))),)
+  LIBGNAT_TARGET_PAIRS = \
+  a-intnam.ads<a-intnam-linux.ads \
+  s-inmaop.adb<s-inmaop-posix.adb \
+  s-intman.adb<s-intman-posix.adb \
+  s-osinte.adb<s-osinte-posix.adb \
+  s-osinte.ads<s-osinte-linux.ads \
+  s-osprim.adb<s-osprim-posix.adb \
+  s-taprop.adb<s-taprop-linux.adb \
+  s-taspri.ads<s-taspri-linux.ads \
+  s-tpopsp.adb<s-tpopsp-posix-foreign.adb \
+  s-parame.adb<s-parame-linux.adb \
+  system.ads<system-linux-sparc.ads
+
+  TOOLS_TARGET_PAIRS =  \
+    mlib-tgt.adb<mlib-tgt-linux.adb \
+    indepsw.adb<indepsw-linux.adb
+
+  THREADSLIB = -lpthread
+  GNATLIB_SHARED = gnatlib-shared-dual
+  GMEM_LIB = gmemlib
+  PREFIX_OBJS = $(PREFIX_REAL_OBJS)
+  LIBRARY_VERSION := $(LIB_VERSION)
+endif
+
 ifeq ($(strip $(filter-out powerpc darwin%,$(arch) $(osys))),)
   LIBGNAT_TARGET_PAIRS = \
   a-intnam.ads<a-intnam-darwin.ads \
@@ -1784,6 +1784,9 @@
 # is guaranteed to overflow the buffer.
 
 gnatlib: ../stamp-gnatlib1 ../stamp-gnatlib2
+	$(RMDIR) save
+	$(MKDIR) save
+	$(MV) *.o save/
 	$(MAKE) -C rts CC="../../xgcc -B../../" \
 	        INCLUDES="$(INCLUDES_FOR_SUBDIR) -I./../.." \
                 CFLAGS="$(GNATLIBCFLAGS_FOR_C)" \
@@ -1796,6 +1799,8 @@
 		srcdir=$(fsrcdir) \
 	        -f ../Makefile \
 	        $(GNATRTL_OBJS)
+	$(MV) save/*.o .
+	$(RMDIR) save
 	$(RM) rts/libgnat$(arext) rts/libgnarl$(arext)
 	$(AR) $(AR_FLAGS) rts/libgnat$(arext) \
 	   $(addprefix rts/,$(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS))
@@ -1821,7 +1826,7 @@
 	     THREAD_KIND="$(THREAD_KIND)" \
              gnatlib
 	$(RM) rts/libgna*$(soext)
-	cd rts; ../../xgcc -B../../ -shared $(TARGET_LIBGCC2_CFLAGS) \
+	cd rts; ../../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) \
@@ -1830,7 +1835,8 @@
 		-o libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
 		$(GNATRTL_TASKING_OBJS) \
 		$(SO_OPTS)libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
-		$(THREADSLIB)
+		$(THREADSLIB) \
+		./libgnat-$(LIBRARY_VERSION)$(soext)
 	cd rts; $(LN_S) libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
 		libgnat$(soext)
 	cd rts; $(LN_S) libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
Commit	Line	Data
5ba4f05d PS	1	--- gcc-4.0-20040919/gcc/ada/link.c.orig 2004-09-13 12:18:40.000000000 +0200
	2	+++ gcc-4.0-20040919/gcc/ada/link.c 2004-09-26 12:24:29.079704096 +0200
	3	@@ -164,9 +164,9 @@
56d7e797 JB	4
56d7e797 JB	5	#elif defined (linux)
5ba4f05d PS	6	const char *__gnat_object_file_option = "";
	7	-const char *__gnat_run_path_option = "-Wl,-rpath,";
	8	-char __gnat_shared_libgnat_default = STATIC;
	9	-int __gnat_link_max = 8192;
	10	+const char *__gnat_run_path_option = "";
	11	+char __gnat_shared_libgnat_default = SHARED;
	12	+int __gnat_link_max = 131072;
	13	unsigned char __gnat_objlist_file_supported = 1;
	14	unsigned char __gnat_using_gnu_linker = 1;
	15	const char *__gnat_object_library_extension = ".a";
	16	--- gcc-4.0-20040919/gcc/ada/Makefile.in.orig 2004-09-26 11:40:30.000000000 +0200
	17	+++ gcc-4.0-20040919/gcc/ada/Makefile.in 2004-09-26 12:29:16.913946640 +0200
	18	@@ -139,7 +139,7 @@
56d7e797 JB	19	objext = .o
	20	exeext =
	21	arext = .a
	22	-soext = .so
	23	+soext = .so.1
	24	shext =
5ba4f05d	25	hyphen = -
56d7e797	26
5ba4f05d	27	@@ -1413,6 +1413,31 @@
56d7e797 JB	28	LIBRARY_VERSION := $(LIB_VERSION)
	29	endif
	30
56d7e797	31	+ifeq ($(strip $(filter-out sparc% linux%,$(arch) $(osys))),)
e0553b4f	32	+ LIBGNAT_TARGET_PAIRS = \
5ba4f05d PS	33	+ a-intnam.ads<a-intnam-linux.ads \
	34	+ s-inmaop.adb<s-inmaop-posix.adb \
	35	+ s-intman.adb<s-intman-posix.adb \
	36	+ s-osinte.adb<s-osinte-posix.adb \
	37	+ s-osinte.ads<s-osinte-linux.ads \
	38	+ s-osprim.adb<s-osprim-posix.adb \
	39	+ s-taprop.adb<s-taprop-linux.adb \
	40	+ s-taspri.ads<s-taspri-linux.ads \
	41	+ s-tpopsp.adb<s-tpopsp-posix-foreign.adb \
	42	+ s-parame.adb<s-parame-linux.adb \
	43	+ system.ads<system-linux-sparc.ads
56d7e797	44	+
5ba4f05d PS	45	+ TOOLS_TARGET_PAIRS = \
	46	+ mlib-tgt.adb<mlib-tgt-linux.adb \
	47	+ indepsw.adb<indepsw-linux.adb
56d7e797	48	+
5ba4f05d PS	49	+ THREADSLIB = -lpthread
	50	+ GNATLIB_SHARED = gnatlib-shared-dual
	51	+ GMEM_LIB = gmemlib
	52	+ PREFIX_OBJS = $(PREFIX_REAL_OBJS)
56d7e797 JB	53	+ LIBRARY_VERSION := $(LIB_VERSION)
	54	+endif
	55	+
5ba4f05d	56	ifeq ($(strip $(filter-out powerpc darwin%,$(arch) $(osys))),)
56d7e797	57	LIBGNAT_TARGET_PAIRS = \
5ba4f05d PS	58	a-intnam.ads<a-intnam-darwin.ads \
5ba4f05d PS	59	@@ -1784,6 +1784,9 @@
56d7e797 JB	60	# is guaranteed to overflow the buffer.
	61
	62	gnatlib: ../stamp-gnatlib1 ../stamp-gnatlib2
	63	+ $(RMDIR) save
	64	+ $(MKDIR) save
	65	+ $(MV) *.o save/
	66	$(MAKE) -C rts CC="../../xgcc -B../../" \
	67	INCLUDES="$(INCLUDES_FOR_SUBDIR) -I./../.." \
	68	CFLAGS="$(GNATLIBCFLAGS_FOR_C)" \
5ba4f05d	69	@@ -1796,6 +1799,8 @@
56d7e797 JB	70	srcdir=$(fsrcdir) \
	71	-f ../Makefile \
	72	$(GNATRTL_OBJS)
	73	+ $(MV) save/*.o .
	74	+ $(RMDIR) save
	75	$(RM) rts/libgnat$(arext) rts/libgnarl$(arext)
	76	$(AR) $(AR_FLAGS) rts/libgnat$(arext) \
	77	$(addprefix rts/,$(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS))
5ba4f05d	78	@@ -1821,7 +1826,7 @@
56d7e797 JB	79	THREAD_KIND="$(THREAD_KIND)" \
56d7e797 JB	80	gnatlib
5ba4f05d	81	$(RM) rts/libgna*$(soext)
56d7e797 JB	82	- cd rts; ../../xgcc -B../../ -shared $(TARGET_LIBGCC2_CFLAGS) \
56d7e797 JB	83	+ cd rts; ../../xgcc -B../../ -shared -shared-libgcc $(TARGET_LIBGCC2_CFLAGS) \
5ba4f05d	84	-o libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
56d7e797	85	$(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS) \
5ba4f05d PS	86	$(SO_OPTS)libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
	87	@@ -1830,7 +1835,8 @@
	88	-o libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
56d7e797	89	$(GNATRTL_TASKING_OBJS) \
5ba4f05d PS	90	$(SO_OPTS)libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
	91	- $(THREADSLIB)
	92	+ $(THREADSLIB) \
56d7e797	93	+ ./libgnat-$(LIBRARY_VERSION)$(soext)
5ba4f05d PS	94	cd rts; $(LN_S) libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
	95	libgnat$(soext)
	96	cd rts; $(LN_S) libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \