[packages/gcc3.4.git] / gcc3.4-ada-link.patch

--- gcc-3.4.0/gcc/ada/link.c.orig	Mon Jan 12 12:45:24 2004
+++ gcc-3.4.0/gcc/ada/link.c	Tue Jun  1 15:57:42 2004
@@ -165,9 +165,9 @@
 
 #elif defined (linux)
 const char *object_file_option = "";
-const char *run_path_option = "-Wl,-rpath,";
-char shared_libgnat_default = STATIC;
-int link_max = 8192;
+const char *run_path_option = "";
+char shared_libgnat_default = SHARED;
+int link_max = 131072;
 unsigned char objlist_file_supported = 1;
 unsigned char using_gnu_linker = 1;
 const char *object_library_extension = ".a";
--- gcc-3.4.0/gcc/ada/Makefile.in.orig	Mon Apr 26 11:19:09 2004
+++ gcc-3.4.0/gcc/ada/Makefile.in	Tue Jun  1 15:58:33 2004
@@ -142,7 +142,7 @@
 objext = .o
 exeext =
 arext  = .a
-soext  = .so
+soext  = .so.1
 shext  =
 
 # Define this as & to perform parallel make on a Sequent.
@@ -1269,6 +1269,90 @@
   LIBRARY_VERSION := $(LIB_VERSION)
 endif
 
+ifeq ($(strip $(filter-out alpha% linux%,$(arch) $(osys))),)
+  LIBGNAT_TARGET_PAIRS = \
+  a-intnam.ads<4lintnam.ads \
+  s-inmaop.adb<7sinmaop.adb \
+  s-intman.adb<7sintman.adb \
+  s-osinte.ads<5iosinte.ads \
+  s-osinte.adb<5iosinte.adb \
+  s-osprim.adb<7sosprim.adb \
+  s-taprop.adb<5itaprop.adb \
+  s-tpopsp.adb<5atpopsp.adb \
+  s-taspri.ads<5itaspri.ads \
+  system.ads<5nsystem.ads
+  TOOLS_TARGET_PAIRS=mlib-tgt.adb<5lml-tgt.adb
+  THREADSLIB=-lpthread
+  GNATLIB_SHARED=gnatlib-shared-dual
+  PREFIX_OBJS=$(PREFIX_REAL_OBJS)
+  LIBRARY_VERSION := $(LIB_VERSION)
+endif
+
+ifeq ($(strip $(filter-out sparc% linux%,$(arch) $(osys))),)
+  LIBGNAT_TARGET_PAIRS = \
+  a-intnam.ads<4lintnam.ads \
+  s-inmaop.adb<7sinmaop.adb \
+  s-intman.adb<7sintman.adb \
+  s-osinte.ads<5iosinte.ads \
+  s-osinte.adb<5iosinte.adb \
+  s-osprim.adb<7sosprim.adb \
+  s-taprop.adb<5itaprop.adb \
+  s-tpopsp.adb<5atpopsp.adb \
+  s-taspri.ads<5itaspri.ads
+#  system.ads<5ssystem.ads  (Tick and Stack_Check_Probes differ)
+  TOOLS_TARGET_PAIRS=mlib-tgt.adb<5lml-tgt.adb
+  THREADSLIB=-lpthread
+  GNATLIB_SHARED=gnatlib-shared-dual
+  PREFIX_OBJS=$(PREFIX_REAL_OBJS)
+  LIBRARY_VERSION := $(LIB_VERSION)
+endif
+
+ifeq ($(strip $(filter-out ppc% linux%,$(arch) $(osys))),)
+  LIBGNAT_TARGET_PAIRS = \
+  a-intnam.ads<4lintnam.ads \
+  s-inmaop.adb<7sinmaop.adb \
+  s-intman.adb<7sintman.adb \
+  s-osinte.ads<5iosinte.ads \
+  s-osinte.adb<5iosinte.adb \
+  s-osprim.adb<7sosprim.adb \
+  s-taprop.adb<5itaprop.adb \
+  s-tpopsp.adb<5atpopsp.adb \
+  s-taspri.ads<5itaspri.ads
+#  system.ads<59system.ads  (???)
+  TOOLS_TARGET_PAIRS=mlib-tgt.adb<5lml-tgt.adb
+  THREADSLIB=-lpthread
+  GNATLIB_SHARED=gnatlib-shared-dual
+  PREFIX_OBJS=$(PREFIX_REAL_OBJS)
+  LIBRARY_VERSION := $(LIB_VERSION)
+endif
+
+ifeq ($(strip $(filter-out powerpc% linux%,$(arch) $(osys))),)
+  LIBGNAT_TARGET_PAIRS = \
+  a-intnam.ads<4lintnam.ads \
+  s-inmaop.adb<7sinmaop.adb \
+  s-intman.adb<7sintman.adb \
+  s-osinte.ads<5iosinte.ads \
+  s-osinte.adb<5iosinte.adb \
+  s-osprim.adb<7sosprim.adb \
+  s-taprop.adb<5itaprop.adb \
+  s-tpopsp.adb<5atpopsp.adb \
+  s-taspri.ads<5itaspri.ads
+#  system.ads<59system.ads  (???)
+  TOOLS_TARGET_PAIRS=mlib-tgt.adb<5lml-tgt.adb
+  THREADSLIB=-lpthread
+  GNATLIB_SHARED=gnatlib-shared-dual
+  PREFIX_OBJS=$(PREFIX_REAL_OBJS)
+  LIBRARY_VERSION := $(LIB_VERSION)
+endif
+
+ifeq ($(strip $(filter-out s390% linux%,$(arch) $(osys))),)
+  TOOLS_TARGET_PAIRS=mlib-tgt.adb<5lml-tgt.adb
+  THREADSLIB=-lpthread
+  GNATLIB_SHARED=gnatlib-shared-dual
+  PREFIX_OBJS=$(PREFIX_REAL_OBJS)
+  LIBRARY_VERSION := $(LIB_VERSION)
+endif
+
 ifeq ($(strip $(filter-out %x86_64 linux%,$(arch) $(osys))),)
   LIBGNAT_TARGET_PAIRS = \
   a-intnam.ads<4lintnam.ads \
@@ -1767,6 +1840,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)" \
@@ -1779,6 +1855,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))
@@ -1891,14 +1969,15 @@
 	     THREAD_KIND="$(THREAD_KIND)" \
              gnatlib
 	$(RM) rts/libgnat$(soext) rts/libgnarl$(soext)
-	cd rts; ../../xgcc -B../../ -shared $(TARGET_LIBGCC2_CFLAGS) \
+	cd rts; ../../xgcc -B../../ -shared -shared-libgcc $(TARGET_LIBGCC2_CFLAGS) \
 		-o libgnat-$(LIBRARY_VERSION)$(soext) \
 		$(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS) \
 		$(SO_OPTS)libgnat-$(LIBRARY_VERSION)$(soext) $(MISCLIB) -lm
 	cd rts; ../../xgcc -B../../ -shared $(TARGET_LIBGCC2_CFLAGS) \
 		-o libgnarl-$(LIBRARY_VERSION)$(soext) \
 		$(GNATRTL_TASKING_OBJS) \
-		$(SO_OPTS)libgnarl-$(LIBRARY_VERSION)$(soext) $(THREADSLIB)
+		$(SO_OPTS)libgnarl-$(LIBRARY_VERSION)$(soext) $(THREADSLIB) \
+		./libgnat-$(LIBRARY_VERSION)$(soext)
 	cd rts; $(LN_S) libgnat-$(LIBRARY_VERSION)$(soext) libgnat$(soext)
 	cd rts; $(LN_S) libgnarl-$(LIBRARY_VERSION)$(soext) libgnarl$(soext)
Commit	Line	Data
8a43a6d0	1	--- gcc-3.4.0/gcc/ada/link.c.orig Mon Jan 12 12:45:24 2004
	2	+++ gcc-3.4.0/gcc/ada/link.c Tue Jun 1 15:57:42 2004
	3	@@ -165,9 +165,9 @@
	4
	5	#elif defined (linux)
	6	const char *object_file_option = "";
	7	-const char *run_path_option = "-Wl,-rpath,";
	8	-char shared_libgnat_default = STATIC;
	9	-int link_max = 8192;
	10	+const char *run_path_option = "";
	11	+char shared_libgnat_default = SHARED;
	12	+int link_max = 131072;
	13	unsigned char objlist_file_supported = 1;
	14	unsigned char using_gnu_linker = 1;
	15	const char *object_library_extension = ".a";
	16	--- gcc-3.4.0/gcc/ada/Makefile.in.orig Mon Apr 26 11:19:09 2004
	17	+++ gcc-3.4.0/gcc/ada/Makefile.in Tue Jun 1 15:58:33 2004
	18	@@ -142,7 +142,7 @@
	19	objext = .o
	20	exeext =
	21	arext = .a
	22	-soext = .so
	23	+soext = .so.1
	24	shext =
	25
	26	# Define this as & to perform parallel make on a Sequent.
	27	@@ -1269,6 +1269,90 @@
	28	LIBRARY_VERSION := $(LIB_VERSION)
	29	endif
	30
	31	+ifeq ($(strip $(filter-out alpha% linux%,$(arch) $(osys))),)
	32	+ LIBGNAT_TARGET_PAIRS = \
	33	+ a-intnam.ads<4lintnam.ads \
	34	+ s-inmaop.adb<7sinmaop.adb \
	35	+ s-intman.adb<7sintman.adb \
	36	+ s-osinte.ads<5iosinte.ads \
	37	+ s-osinte.adb<5iosinte.adb \
	38	+ s-osprim.adb<7sosprim.adb \
	39	+ s-taprop.adb<5itaprop.adb \
	40	+ s-tpopsp.adb<5atpopsp.adb \
	41	+ s-taspri.ads<5itaspri.ads \
	42	+ system.ads<5nsystem.ads
	43	+ TOOLS_TARGET_PAIRS=mlib-tgt.adb<5lml-tgt.adb
	44	+ THREADSLIB=-lpthread
	45	+ GNATLIB_SHARED=gnatlib-shared-dual
	46	+ PREFIX_OBJS=$(PREFIX_REAL_OBJS)
	47	+ LIBRARY_VERSION := $(LIB_VERSION)
	48	+endif
	49	+
	50	+ifeq ($(strip $(filter-out sparc% linux%,$(arch) $(osys))),)
	51	+ LIBGNAT_TARGET_PAIRS = \
	52	+ a-intnam.ads<4lintnam.ads \
	53	+ s-inmaop.adb<7sinmaop.adb \
	54	+ s-intman.adb<7sintman.adb \
	55	+ s-osinte.ads<5iosinte.ads \
	56	+ s-osinte.adb<5iosinte.adb \
	57	+ s-osprim.adb<7sosprim.adb \
	58	+ s-taprop.adb<5itaprop.adb \
	59	+ s-tpopsp.adb<5atpopsp.adb \
	60	+ s-taspri.ads<5itaspri.ads
	61	+# system.ads<5ssystem.ads (Tick and Stack_Check_Probes differ)
	62	+ TOOLS_TARGET_PAIRS=mlib-tgt.adb<5lml-tgt.adb
	63	+ THREADSLIB=-lpthread
	64	+ GNATLIB_SHARED=gnatlib-shared-dual
65	+ PREFIX_OBJS=$(PREFIX_REAL_OBJS)
66	+ LIBRARY_VERSION := $(LIB_VERSION)
67	+endif
68	+
69	+ifeq ($(strip $(filter-out ppc% linux%,$(arch) $(osys))),)
70	+ LIBGNAT_TARGET_PAIRS = \
71	+ a-intnam.ads<4lintnam.ads \
72	+ s-inmaop.adb<7sinmaop.adb \
73	+ s-intman.adb<7sintman.adb \
74	+ s-osinte.ads<5iosinte.ads \
75	+ s-osinte.adb<5iosinte.adb \
76	+ s-osprim.adb<7sosprim.adb \
77	+ s-taprop.adb<5itaprop.adb \
78	+ s-tpopsp.adb<5atpopsp.adb \
79	+ s-taspri.ads<5itaspri.ads
80	+# system.ads<59system.ads (???)
81	+ TOOLS_TARGET_PAIRS=mlib-tgt.adb<5lml-tgt.adb
82	+ THREADSLIB=-lpthread
83	+ GNATLIB_SHARED=gnatlib-shared-dual
84	+ PREFIX_OBJS=$(PREFIX_REAL_OBJS)
85	+ LIBRARY_VERSION := $(LIB_VERSION)
86	+endif
87	+
88	+ifeq ($(strip $(filter-out powerpc% linux%,$(arch) $(osys))),)
89	+ LIBGNAT_TARGET_PAIRS = \
90	+ a-intnam.ads<4lintnam.ads \
91	+ s-inmaop.adb<7sinmaop.adb \
92	+ s-intman.adb<7sintman.adb \
93	+ s-osinte.ads<5iosinte.ads \
94	+ s-osinte.adb<5iosinte.adb \
95	+ s-osprim.adb<7sosprim.adb \
96	+ s-taprop.adb<5itaprop.adb \
97	+ s-tpopsp.adb<5atpopsp.adb \
98	+ s-taspri.ads<5itaspri.ads
99	+# system.ads<59system.ads (???)
100	+ TOOLS_TARGET_PAIRS=mlib-tgt.adb<5lml-tgt.adb
101	+ THREADSLIB=-lpthread
102	+ GNATLIB_SHARED=gnatlib-shared-dual
103	+ PREFIX_OBJS=$(PREFIX_REAL_OBJS)
104	+ LIBRARY_VERSION := $(LIB_VERSION)
105	+endif
106	+
107	+ifeq ($(strip $(filter-out s390% linux%,$(arch) $(osys))),)
108	+ TOOLS_TARGET_PAIRS=mlib-tgt.adb<5lml-tgt.adb
109	+ THREADSLIB=-lpthread
110	+ GNATLIB_SHARED=gnatlib-shared-dual
111	+ PREFIX_OBJS=$(PREFIX_REAL_OBJS)
112	+ LIBRARY_VERSION := $(LIB_VERSION)
113	+endif
114	+
115	ifeq ($(strip $(filter-out %x86_64 linux%,$(arch) $(osys))),)
116	LIBGNAT_TARGET_PAIRS = \
117	a-intnam.ads<4lintnam.ads \
118	@@ -1767,6 +1840,9 @@
119	# is guaranteed to overflow the buffer.
120
121	gnatlib: ../stamp-gnatlib1 ../stamp-gnatlib2
122	+ $(RMDIR) save
123	+ $(MKDIR) save
124	+ $(MV) *.o save/
125	$(MAKE) -C rts CC="../../xgcc -B../../" \
126	INCLUDES="$(INCLUDES_FOR_SUBDIR) -I./../.." \
127	CFLAGS="$(GNATLIBCFLAGS_FOR_C)" \
128	@@ -1779,6 +1855,8 @@
129	srcdir=$(fsrcdir) \
130	-f ../Makefile \
131	$(GNATRTL_OBJS)
132	+ $(MV) save/*.o .
133	+ $(RMDIR) save
134	$(RM) rts/libgnat$(arext) rts/libgnarl$(arext)
135	$(AR) $(AR_FLAGS) rts/libgnat$(arext) \
136	$(addprefix rts/,$(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS))
137	@@ -1891,14 +1969,15 @@
138	THREAD_KIND="$(THREAD_KIND)" \
139	gnatlib
140	$(RM) rts/libgnat$(soext) rts/libgnarl$(soext)
141	- cd rts; ../../xgcc -B../../ -shared $(TARGET_LIBGCC2_CFLAGS) \
142	+ cd rts; ../../xgcc -B../../ -shared -shared-libgcc $(TARGET_LIBGCC2_CFLAGS) \
143	-o libgnat-$(LIBRARY_VERSION)$(soext) \
144	$(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS) \
145	$(SO_OPTS)libgnat-$(LIBRARY_VERSION)$(soext) $(MISCLIB) -lm
146	cd rts; ../../xgcc -B../../ -shared $(TARGET_LIBGCC2_CFLAGS) \
147	-o libgnarl-$(LIBRARY_VERSION)$(soext) \
148	$(GNATRTL_TASKING_OBJS) \
149	- $(SO_OPTS)libgnarl-$(LIBRARY_VERSION)$(soext) $(THREADSLIB)
150	+ $(SO_OPTS)libgnarl-$(LIBRARY_VERSION)$(soext) $(THREADSLIB) \
151	+ ./libgnat-$(LIBRARY_VERSION)$(soext)
152	cd rts; $(LN_S) libgnat-$(LIBRARY_VERSION)$(soext) libgnat$(soext)
153	cd rts; $(LN_S) libgnarl-$(LIBRARY_VERSION)$(soext) libgnarl$(soext)
154