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

--- gcc/ada/link.c.jj	Tue May  7 12:50:23 2002
+++ gcc/ada/link.c	Wed Jun  5 14:45:32 2002
@@ -158,11 +158,11 @@ const char *object_library_extension = "
 
 #elif defined (linux)
 const char *object_file_option = "";
-const char *run_path_option = "-Wl,-rpath,";
-char shared_libgnat_default = STATIC;
+const char *run_path_option = "";
+char shared_libgnat_default = SHARED;
 int link_max = 2147483647;
 unsigned char objlist_file_supported = 0;
-unsigned char using_gnu_linker = 0;
+unsigned char using_gnu_linker = 1;
 const char *object_library_extension = ".a";
 
 #elif defined (__svr4__) && defined (i386)
--- gcc/ada/Makefile.in.jj	Wed Jun  5 16:06:56 2002
+++ gcc/ada/Makefile.in	Wed Jun  5 16:27:33 2002
@@ -134,7 +134,7 @@ MISCLIB =
 objext = .o
 exeext =
 arext  = .a
-soext  = .so
+soext  = .so.1
 shext  =
 
 HOST_CC=$(CC)
@@ -1214,6 +1214,33 @@ ifeq ($(strip $(filter-out %86 linux%,$(
   endif
 endif
 
+ifeq ($(strip $(filter-out alpha% linux%,$(arch) $(osys))),)
+  MLIB_TGT=5lml-tgt
+  MISCLIB=
+  THREADSLIB=-lpthread
+  GNATLIB_SHARED=gnatlib-shared-dual
+  GMEM_LIB=gmemlib
+  LIBRARY_VERSION := $(strip $(shell grep Library_Version $(fsrcpfx)gnatvsn.ads | sed -e 's/.*GNAT Lib v\(.*\)[ "].*/\1/'))
+endif
+
+ifeq ($(strip $(filter-out sparc% linux%,$(arch) $(osys))),)
+  MLIB_TGT=5lml-tgt
+  MISCLIB=
+  THREADSLIB=-lpthread
+  GNATLIB_SHARED=gnatlib-shared-dual
+  GMEM_LIB=gmemlib
+  LIBRARY_VERSION := $(strip $(shell grep Library_Version $(fsrcpfx)gnatvsn.ads | sed -e 's/.*GNAT Lib v\(.*\)[ "].*/\1/'))
+endif
+
+ifeq ($(strip $(filter-out ia64 linux%,$(arch) $(osys))),)
+  MLIB_TGT=5lml-tgt
+  MISCLIB=
+  THREADSLIB=-lpthread
+  GNATLIB_SHARED=gnatlib-shared-dual
+  GMEM_LIB=gmemlib
+  LIBRARY_VERSION := $(strip $(shell grep Library_Version $(fsrcpfx)gnatvsn.ads | sed -e 's/.*GNAT Lib v\(.*\)[ "].*/\1/'))
+endif
+
 ifeq ($(strip $(filter-out mips sgi irix%,$(targ))),)
   ifeq ($(strip $(filter-out mips sgi irix6%,$(targ))),)
     LIBGNAT_TARGET_PAIRS = \
@@ -2179,6 +2179,9 @@ endif
 
 gnatlib: ../stamp-gnatlib1 ../stamp-gnatlib2
 #	../xgcc -B../ -dD -E ../tconfig.h $(INCLUDES) > rts/tconfig.h
+	$(RMDIR) save
+	$(MKDIR) save
+	$(MV) *.o save/
 	$(MAKE) -C rts CC="../../xgcc -B../../" \
 	        INCLUDES="$(INCLUDES_FOR_SUBDIR) -I./../.." \
                 CFLAGS="$(GNATLIBCFLAGS) $(TARGET_LIBGCC2_CFLAGS) -DIN_RTS" \
@@ -2192,6 +2195,8 @@ gnatlib: ../stamp-gnatlib1 ../stamp-gnat
 		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))
@@ -2315,12 +2315,12 @@ gnatlib-shared-default:
 	     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) $(SO_OPTS)libgnat-$(LIBRARY_VERSION)$(soext) \
 		$(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS) $(MISCLIB) -lm
 	cd rts; ../../xgcc -B../../ -shared $(TARGET_LIBGCC2_CFLAGS) \
 		-o libgnarl-$(LIBRARY_VERSION)$(soext) $(SO_OPTS)libgnarl-$(LIBRARY_VERSION)$(soext) \
-		$(GNATRTL_TASKING_OBJS) $(THREADSLIB)
+		$(GNATRTL_TASKING_OBJS) $(THREADSLIB) ./libgnat-$(LIBRARY_VERSION)$(soext)
 	cd rts; $(LN) libgnat-$(LIBRARY_VERSION)$(soext) libgnat$(soext)
 	cd rts; $(LN) libgnarl-$(LIBRARY_VERSION)$(soext) libgnarl$(soext)
 
@@ -2358,62 +2363,62 @@ TREE_H = $(srcdir)/../tree.h $(srcdir)/.
 
 ada_extra_files : treeprs.ads einfo.h sinfo.h nmake.adb nmake.ads
 
-b_gnat1.c : $(GNAT1_ADA_OBJS)
+b_gnat1.c : $(GNAT1_ADA_OBJS) interfac.o
 	$(GNATBIND) $(ADA_INCLUDES) -o b_gnat1.c -n gnat1drv.ali
 b_gnat1.o : b_gnat1.c
 
-b_gnatb.c : $(GNATBIND_OBJS)
+b_gnatb.c : $(GNATBIND_OBJS) interfac.o
 	$(GNATBIND) $(ADA_INCLUDES) -o b_gnatb.c gnatbind.ali
 b_gnatb.o : b_gnatb.c
 
-b_gnatc.c : $(GNATCMD_OBJS)
+b_gnatc.c : $(GNATCMD_OBJS) interfac.o
 	$(GNATBIND) $(ADA_INCLUDES) -o b_gnatc.c gnatcmd.ali
 b_gnatc.o : b_gnatc.c
 
-b_gnatch.c : $(GNATCHOP_OBJS)
+b_gnatch.c : $(GNATCHOP_OBJS) interfac.o
 	$(GNATBIND) $(ADA_INCLUDES) -o b_gnatch.c gnatchop.ali
 b_gnatch.o : b_gnatch.c
 
-b_gnatkr.c : $(GNATKR_OBJS)
+b_gnatkr.c : $(GNATKR_OBJS) interfac.o
 	$(GNATBIND) $(ADA_INCLUDES) -o b_gnatkr.c gnatkr.ali
 b_gnatkr.o : b_gnatkr.c
 
-b_gnatl.c : $(GNATLINK_OBJS)
+b_gnatl.c : $(GNATLINK_OBJS) interfac.o
 	$(GNATBIND) $(ADA_INCLUDES) -o b_gnatl.c gnatlink.ali
 b_gnatl.o : b_gnatl.c
 
-b_gnatls.c : $(GNATLS_OBJS)
+b_gnatls.c : $(GNATLS_OBJS) interfac.o
 	$(GNATBIND) $(ADA_INCLUDES) -o b_gnatls.c gnatls.ali
 
-b_gnatm.c : $(GNATMAKE_OBJS)
+b_gnatm.c : $(GNATMAKE_OBJS) interfac.o
 	$(GNATBIND) $(ADA_INCLUDES) -o b_gnatm.c gnatmake.ali
 b_gnatm.o : b_gnatm.c
 
-b_gnatmem.c : $(GNATMEM_OBJS)
+b_gnatmem.c : $(GNATMEM_OBJS) interfac.o
 	$(GNATBIND) $(ADA_INCLUDES) -o b_gnatmem.c gnatmem.ali
 b_gnatmem.o : b_gnatmem.c
 
-b_gnatp.c : $(GNATPREP_OBJS)
+b_gnatp.c : $(GNATPREP_OBJS) interfac.o
 	$(GNATBIND) $(ADA_INCLUDES) -o b_gnatp.c gnatprep.ali
 b_gnatp.o : b_gnatp.c
 
-b_gnatpa.c : $(GNATPSTA_OBJS)
+b_gnatpa.c : $(GNATPSTA_OBJS) interfac.o
 	$(GNATBIND) $(ADA_INCLUDES) -o b_gnatpa.c gnatpsta.ali
 b_gnatpa.o : b_gnatpa.c
 
-b_gnatps.c : $(GNATPSYS_OBJS)
+b_gnatps.c : $(GNATPSYS_OBJS) interfac.o
 	$(GNATBIND) $(ADA_INCLUDES) -o b_gnatps.c gnatpsys.ali
 b_gnatps.o : b_gnatps.c
 
-b_gnatxref.c : $(GNATXREF_OBJS)
+b_gnatxref.c : $(GNATXREF_OBJS) interfac.o
 	$(GNATBIND) $(ADA_INCLUDES) -o b_gnatxref.c gnatxref.ali
 b_gnatxref.o : b_gnatxref.c
 
-b_gnatfind.c : $(GNATFIND_OBJS)
+b_gnatfind.c : $(GNATFIND_OBJS) interfac.o
 	$(GNATBIND) $(ADA_INCLUDES) -o b_gnatfind.c gnatfind.ali
 b_gnatfind.o : b_gnatfind.c
 
-b_gnatdll.c : $(GNATDLL_OBJS)
+b_gnatdll.c : $(GNATDLL_OBJS) interfac.o
 	$(GNATBIND) $(ADA_INCLUDES) -o b_gnatdll.c gnatdll.ali
 b_gnatdll.o : b_gnatdll.c
 
--- gcc/ada/gnat_rm.texi.jj	Tue Apr 23 20:27:39 2002
+++ gcc/ada/gnat_rm.texi	Thu Jun  6 14:30:21 2002
@@ -31,6 +31,10 @@
 @settitle GNAT Reference Manual
 @setchapternewpage odd
 @syncodeindex fn cp
+@dircategory Programming
+@direntry
+* gnat_rm: (gnat_rm).            GNAT Reference Manual
+@end direntry
 
 @titlepage
 
--- gcc/ada/gnat_ug.texi.jj	Tue May  7 12:50:03 2002
+++ gcc/ada/gnat_ug.texi	Thu Jun  6 14:30:33 2002
@@ -75,6 +75,11 @@
 @syncodeindex fn cp
 @c %**end of header
 
+@dircategory Programming
+@direntry
+* gnat_ug: (gnat_ug).            GNAT User's Guide
+@end direntry
+
 @titlepage
 
 @ifset vms
Commit	Line	Data
5384b728	1	--- gcc/ada/link.c.jj Tue May 7 12:50:23 2002
	2	+++ gcc/ada/link.c Wed Jun 5 14:45:32 2002
	3	@@ -158,11 +158,11 @@ const char *object_library_extension = "
	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	+const char *run_path_option = "";
	10	+char shared_libgnat_default = SHARED;
	11	int link_max = 2147483647;
	12	unsigned char objlist_file_supported = 0;
	13	-unsigned char using_gnu_linker = 0;
	14	+unsigned char using_gnu_linker = 1;
	15	const char *object_library_extension = ".a";
	16
	17	#elif defined (__svr4__) && defined (i386)
	18	--- gcc/ada/Makefile.in.jj Wed Jun 5 16:06:56 2002
	19	+++ gcc/ada/Makefile.in Wed Jun 5 16:27:33 2002
	20	@@ -134,7 +134,7 @@ MISCLIB =
	21	objext = .o
	22	exeext =
	23	arext = .a
	24	-soext = .so
	25	+soext = .so.1
	26	shext =
	27
	28	HOST_CC=$(CC)
	29	@@ -1214,6 +1214,33 @@ ifeq ($(strip $(filter-out %86 linux%,$(
	30	endif
	31	endif
	32
	33	+ifeq ($(strip $(filter-out alpha% linux%,$(arch) $(osys))),)
	34	+ MLIB_TGT=5lml-tgt
	35	+ MISCLIB=
	36	+ THREADSLIB=-lpthread
	37	+ GNATLIB_SHARED=gnatlib-shared-dual
	38	+ GMEM_LIB=gmemlib
	39	+ LIBRARY_VERSION := $(strip $(shell grep Library_Version $(fsrcpfx)gnatvsn.ads \| sed -e 's/.GNAT Lib v\(.\)[ "].*/\1/'))
	40	+endif
	41	+
	42	+ifeq ($(strip $(filter-out sparc% linux%,$(arch) $(osys))),)
	43	+ MLIB_TGT=5lml-tgt
	44	+ MISCLIB=
	45	+ THREADSLIB=-lpthread
	46	+ GNATLIB_SHARED=gnatlib-shared-dual
	47	+ GMEM_LIB=gmemlib
	48	+ LIBRARY_VERSION := $(strip $(shell grep Library_Version $(fsrcpfx)gnatvsn.ads \| sed -e 's/.GNAT Lib v\(.\)[ "].*/\1/'))
	49	+endif
	50	+
	51	+ifeq ($(strip $(filter-out ia64 linux%,$(arch) $(osys))),)
	52	+ MLIB_TGT=5lml-tgt
	53	+ MISCLIB=
	54	+ THREADSLIB=-lpthread
	55	+ GNATLIB_SHARED=gnatlib-shared-dual
	56	+ GMEM_LIB=gmemlib
	57	+ LIBRARY_VERSION := $(strip $(shell grep Library_Version $(fsrcpfx)gnatvsn.ads \| sed -e 's/.GNAT Lib v\(.\)[ "].*/\1/'))
	58	+endif
	59	+
	60	ifeq ($(strip $(filter-out mips sgi irix%,$(targ))),)
	61	ifeq ($(strip $(filter-out mips sgi irix6%,$(targ))),)
	62	LIBGNAT_TARGET_PAIRS = \
	63	@@ -2179,6 +2179,9 @@ endif
	64
65	gnatlib: ../stamp-gnatlib1 ../stamp-gnatlib2
66	# ../xgcc -B../ -dD -E ../tconfig.h $(INCLUDES) > rts/tconfig.h
67	+ $(RMDIR) save
68	+ $(MKDIR) save
69	+ $(MV) *.o save/
70	$(MAKE) -C rts CC="../../xgcc -B../../" \
71	INCLUDES="$(INCLUDES_FOR_SUBDIR) -I./../.." \
72	CFLAGS="$(GNATLIBCFLAGS) $(TARGET_LIBGCC2_CFLAGS) -DIN_RTS" \
73	@@ -2192,6 +2195,8 @@ gnatlib: ../stamp-gnatlib1 ../stamp-gnat
74	srcdir=$(fsrcdir) \
75	-f ../Makefile \
76	$(GNATRTL_OBJS)
77	+ $(MV) save/*.o .
78	+ $(RMDIR) save
79	$(RM) rts/libgnat$(arext) rts/libgnarl$(arext)
80	$(AR) $(AR_FLAGS) rts/libgnat$(arext) \
81	$(addprefix rts/,$(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS))
82	@@ -2315,12 +2315,12 @@ gnatlib-shared-default:
83	THREAD_KIND="$(THREAD_KIND)" \
84	gnatlib
85	$(RM) rts/libgnat$(soext) rts/libgnarl$(soext)
86	- cd rts; ../../xgcc -B../../ -shared $(TARGET_LIBGCC2_CFLAGS) \
87	+ cd rts; ../../xgcc -B../../ -shared -shared-libgcc $(TARGET_LIBGCC2_CFLAGS) \
88	-o libgnat-$(LIBRARY_VERSION)$(soext) $(SO_OPTS)libgnat-$(LIBRARY_VERSION)$(soext) \
89	$(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS) $(MISCLIB) -lm
90	cd rts; ../../xgcc -B../../ -shared $(TARGET_LIBGCC2_CFLAGS) \
91	-o libgnarl-$(LIBRARY_VERSION)$(soext) $(SO_OPTS)libgnarl-$(LIBRARY_VERSION)$(soext) \
92	- $(GNATRTL_TASKING_OBJS) $(THREADSLIB)
93	+ $(GNATRTL_TASKING_OBJS) $(THREADSLIB) ./libgnat-$(LIBRARY_VERSION)$(soext)
94	cd rts; $(LN) libgnat-$(LIBRARY_VERSION)$(soext) libgnat$(soext)
95	cd rts; $(LN) libgnarl-$(LIBRARY_VERSION)$(soext) libgnarl$(soext)
96
97	@@ -2358,62 +2363,62 @@ TREE_H = $(srcdir)/../tree.h $(srcdir)/.
98
99	ada_extra_files : treeprs.ads einfo.h sinfo.h nmake.adb nmake.ads
100
101	-b_gnat1.c : $(GNAT1_ADA_OBJS)
102	+b_gnat1.c : $(GNAT1_ADA_OBJS) interfac.o
103	$(GNATBIND) $(ADA_INCLUDES) -o b_gnat1.c -n gnat1drv.ali
104	b_gnat1.o : b_gnat1.c
105
106	-b_gnatb.c : $(GNATBIND_OBJS)
107	+b_gnatb.c : $(GNATBIND_OBJS) interfac.o
108	$(GNATBIND) $(ADA_INCLUDES) -o b_gnatb.c gnatbind.ali
109	b_gnatb.o : b_gnatb.c
110
111	-b_gnatc.c : $(GNATCMD_OBJS)
112	+b_gnatc.c : $(GNATCMD_OBJS) interfac.o
113	$(GNATBIND) $(ADA_INCLUDES) -o b_gnatc.c gnatcmd.ali
114	b_gnatc.o : b_gnatc.c
115
116	-b_gnatch.c : $(GNATCHOP_OBJS)
117	+b_gnatch.c : $(GNATCHOP_OBJS) interfac.o
118	$(GNATBIND) $(ADA_INCLUDES) -o b_gnatch.c gnatchop.ali
119	b_gnatch.o : b_gnatch.c
120
121	-b_gnatkr.c : $(GNATKR_OBJS)
122	+b_gnatkr.c : $(GNATKR_OBJS) interfac.o
123	$(GNATBIND) $(ADA_INCLUDES) -o b_gnatkr.c gnatkr.ali
124	b_gnatkr.o : b_gnatkr.c
125
126	-b_gnatl.c : $(GNATLINK_OBJS)
127	+b_gnatl.c : $(GNATLINK_OBJS) interfac.o
128	$(GNATBIND) $(ADA_INCLUDES) -o b_gnatl.c gnatlink.ali
129	b_gnatl.o : b_gnatl.c
130
131	-b_gnatls.c : $(GNATLS_OBJS)
132	+b_gnatls.c : $(GNATLS_OBJS) interfac.o
133	$(GNATBIND) $(ADA_INCLUDES) -o b_gnatls.c gnatls.ali
134
135	-b_gnatm.c : $(GNATMAKE_OBJS)
136	+b_gnatm.c : $(GNATMAKE_OBJS) interfac.o
137	$(GNATBIND) $(ADA_INCLUDES) -o b_gnatm.c gnatmake.ali
138	b_gnatm.o : b_gnatm.c
139
140	-b_gnatmem.c : $(GNATMEM_OBJS)
141	+b_gnatmem.c : $(GNATMEM_OBJS) interfac.o
142	$(GNATBIND) $(ADA_INCLUDES) -o b_gnatmem.c gnatmem.ali
143	b_gnatmem.o : b_gnatmem.c
144
145	-b_gnatp.c : $(GNATPREP_OBJS)
146	+b_gnatp.c : $(GNATPREP_OBJS) interfac.o
147	$(GNATBIND) $(ADA_INCLUDES) -o b_gnatp.c gnatprep.ali
148	b_gnatp.o : b_gnatp.c
149
150	-b_gnatpa.c : $(GNATPSTA_OBJS)
151	+b_gnatpa.c : $(GNATPSTA_OBJS) interfac.o
152	$(GNATBIND) $(ADA_INCLUDES) -o b_gnatpa.c gnatpsta.ali
153	b_gnatpa.o : b_gnatpa.c
154
155	-b_gnatps.c : $(GNATPSYS_OBJS)
156	+b_gnatps.c : $(GNATPSYS_OBJS) interfac.o
157	$(GNATBIND) $(ADA_INCLUDES) -o b_gnatps.c gnatpsys.ali
158	b_gnatps.o : b_gnatps.c
159
160	-b_gnatxref.c : $(GNATXREF_OBJS)
161	+b_gnatxref.c : $(GNATXREF_OBJS) interfac.o
162	$(GNATBIND) $(ADA_INCLUDES) -o b_gnatxref.c gnatxref.ali
163	b_gnatxref.o : b_gnatxref.c
164
165	-b_gnatfind.c : $(GNATFIND_OBJS)
166	+b_gnatfind.c : $(GNATFIND_OBJS) interfac.o
167	$(GNATBIND) $(ADA_INCLUDES) -o b_gnatfind.c gnatfind.ali
168	b_gnatfind.o : b_gnatfind.c
169
170	-b_gnatdll.c : $(GNATDLL_OBJS)
171	+b_gnatdll.c : $(GNATDLL_OBJS) interfac.o
172	$(GNATBIND) $(ADA_INCLUDES) -o b_gnatdll.c gnatdll.ali
173	b_gnatdll.o : b_gnatdll.c
174
175	--- gcc/ada/gnat_rm.texi.jj Tue Apr 23 20:27:39 2002
176	+++ gcc/ada/gnat_rm.texi Thu Jun 6 14:30:21 2002
177	@@ -31,6 +31,10 @@
178	@settitle GNAT Reference Manual
179	@setchapternewpage odd
180	@syncodeindex fn cp
181	+@dircategory Programming
182	+@direntry
183	+* gnat_rm: (gnat_rm). GNAT Reference Manual
184	+@end direntry
185
186	@titlepage
187
188	--- gcc/ada/gnat_ug.texi.jj Tue May 7 12:50:03 2002
189	+++ gcc/ada/gnat_ug.texi Thu Jun 6 14:30:33 2002
190	@@ -75,6 +75,11 @@
191	@syncodeindex fn cp
192	@c %**end of header
193
194	+@dircategory Programming
195	+@direntry
196	+* gnat_ug: (gnat_ug). GNAT User's Guide
197	+@end direntry
198	+
199	@titlepage
200
201	@ifset vms