1 diff -Nur gcc-3.2.2/gcc/ada/link.c gcc-3.2.2-20030218/gcc/ada/link.c
2 --- gcc-3.2.2/gcc/ada/link.c Sat May 4 05:28:18 2002
3 +++ gcc-3.2.2-20030218/gcc/ada/link.c Tue Sep 24 15:07:49 2002
7 const char *object_file_option = "";
8 -const char *run_path_option = "-Wl,-rpath,";
9 -char shared_libgnat_default = STATIC;
10 +const char *run_path_option = "";
11 +char shared_libgnat_default = SHARED;
12 int link_max = 2147483647;
13 unsigned char objlist_file_supported = 0;
14 -unsigned char using_gnu_linker = 0;
15 +unsigned char using_gnu_linker = 1;
16 const char *object_library_extension = ".a";
18 #elif defined (__svr4__) && defined (i386)
19 diff -Nur gcc-3.2.2/gcc/ada/Makefile.in gcc-3.2.2-20030218/gcc/ada/Makefile.in
20 --- gcc-3.2.2/gcc/ada/Makefile.in Wed Jan 29 18:34:08 2003
21 +++ gcc-3.2.2-20030218/gcc/ada/Makefile.in Tue Feb 18 17:05:26 2003
31 @@ -1214,6 +1214,69 @@
35 +ifeq ($(strip $(filter-out alpha% linux%,$(arch) $(osys))),)
38 + THREADSLIB=-lpthread
39 + GNATLIB_SHARED=gnatlib-shared-dual
41 + LIBRARY_VERSION := $(strip $(shell grep Library_Version $(fsrcpfx)gnatvsn.ads | sed -e 's/.*GNAT Lib v\(.*\)[ "].*/\1/'))
44 +ifeq ($(strip $(filter-out sparc% linux%,$(arch) $(osys))),)
47 + THREADSLIB=-lpthread
48 + GNATLIB_SHARED=gnatlib-shared-dual
50 + LIBRARY_VERSION := $(strip $(shell grep Library_Version $(fsrcpfx)gnatvsn.ads | sed -e 's/.*GNAT Lib v\(.*\)[ "].*/\1/'))
53 +ifeq ($(strip $(filter-out ia64 linux%,$(arch) $(osys))),)
56 + THREADSLIB=-lpthread
57 + GNATLIB_SHARED=gnatlib-shared-dual
59 + LIBRARY_VERSION := $(strip $(shell grep Library_Version $(fsrcpfx)gnatvsn.ads | sed -e 's/.*GNAT Lib v\(.*\)[ "].*/\1/'))
62 +ifeq ($(strip $(filter-out x86_64 linux%,$(arch) $(osys))),)
65 + THREADSLIB=-lpthread
66 + GNATLIB_SHARED=gnatlib-shared-dual
68 + LIBRARY_VERSION := $(strip $(shell grep Library_Version $(fsrcpfx)gnatvsn.ads | sed -e 's/.*GNAT Lib v\(.*\)[ "].*/\1/'))
71 +ifeq ($(strip $(filter-out ppc linux%,$(arch) $(osys))),)
74 + THREADSLIB=-lpthread
75 + GNATLIB_SHARED=gnatlib-shared-dual
77 + LIBRARY_VERSION := $(strip $(shell grep Library_Version $(fsrcpfx)gnatvsn.ads | sed -e 's/.*GNAT Lib v\(.*\)[ "].*/\1/'))
80 +ifeq ($(strip $(filter-out s390 linux%,$(arch) $(osys))),)
83 + THREADSLIB=-lpthread
84 + GNATLIB_SHARED=gnatlib-shared-dual
86 + LIBRARY_VERSION := $(strip $(shell grep Library_Version $(fsrcpfx)gnatvsn.ads | sed -e 's/.*GNAT Lib v\(.*\)[ "].*/\1/'))
89 +ifeq ($(strip $(filter-out s390x linux%,$(arch) $(osys))),)
92 + THREADSLIB=-lpthread
93 + GNATLIB_SHARED=gnatlib-shared-dual
95 + LIBRARY_VERSION := $(strip $(shell grep Library_Version $(fsrcpfx)gnatvsn.ads | sed -e 's/.*GNAT Lib v\(.*\)[ "].*/\1/'))
98 ifeq ($(strip $(filter-out mips sgi irix%,$(targ))),)
99 ifeq ($(strip $(filter-out mips sgi irix6%,$(targ))),)
100 LIBGNAT_TARGET_PAIRS = \
101 @@ -2179,9 +2242,12 @@
103 gnatlib: ../stamp-gnatlib1 ../stamp-gnatlib2
104 # ../xgcc -B../ -dD -E ../tconfig.h $(INCLUDES) > rts/tconfig.h
108 $(MAKE) -C rts CC="../../xgcc -B../../" \
109 INCLUDES="$(INCLUDES_FOR_SUBDIR) -I./../.." \
110 - CFLAGS="$(GNATLIBCFLAGS) $(LIBGCC2_CFLAGS) -DIN_RTS" \
111 + CFLAGS="$(GNATLIBCFLAGS) $(TARGET_LIBGCC2_CFLAGS) -DIN_RTS" \
112 ADA_CFLAGS="$(GNATLIBCFLAGS)" \
114 -f ../Makefile $(LIBGNAT_OBJS)
115 @@ -2192,6 +2258,8 @@
121 $(RM) rts/libgnat$(arext) rts/libgnarl$(arext)
122 $(AR) $(AR_FLAGS) rts/libgnat$(arext) \
123 $(addprefix rts/,$(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS))
124 @@ -2279,16 +2347,16 @@
125 gnatlib-shared-default:
126 $(MAKE) $(FLAGS_TO_PASS) \
127 GNATLIBFLAGS="$(GNATLIBFLAGS)" \
128 - GNATLIBCFLAGS="$(GNATLIBCFLAGS) $(LIBGCC2_CFLAGS)" \
129 + GNATLIBCFLAGS="$(GNATLIBCFLAGS) $(TARGET_LIBGCC2_CFLAGS)" \
130 THREAD_KIND="$(THREAD_KIND)" \
132 $(RM) rts/libgnat$(soext) rts/libgnarl$(soext)
133 - cd rts; ../../xgcc -B../../ -shared $(LIBGCC2_CFLAGS) \
134 + cd rts; ../../xgcc -B../../ -shared -shared-libgcc $(TARGET_LIBGCC2_CFLAGS) \
135 -o libgnat-$(LIBRARY_VERSION)$(soext) $(SO_OPTS)libgnat-$(LIBRARY_VERSION)$(soext) \
136 $(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS) $(MISCLIB) -lm
137 - cd rts; ../../xgcc -B../../ -shared $(LIBGCC2_CFLAGS) \
138 + cd rts; ../../xgcc -B../../ -shared $(TARGET_LIBGCC2_CFLAGS) \
139 -o libgnarl-$(LIBRARY_VERSION)$(soext) $(SO_OPTS)libgnarl-$(LIBRARY_VERSION)$(soext) \
140 - $(GNATRTL_TASKING_OBJS) $(THREADSLIB)
141 + $(GNATRTL_TASKING_OBJS) $(THREADSLIB) ./libgnat-$(LIBRARY_VERSION)$(soext)
142 cd rts; $(LN) libgnat-$(LIBRARY_VERSION)$(soext) libgnat$(soext)
143 cd rts; $(LN) libgnarl-$(LIBRARY_VERSION)$(soext) libgnarl$(soext)
145 @@ -2358,62 +2426,62 @@
147 ada_extra_files : treeprs.ads einfo.h sinfo.h nmake.adb nmake.ads
149 -b_gnat1.c : $(GNAT1_ADA_OBJS)
150 +b_gnat1.c : $(GNAT1_ADA_OBJS) interfac.o
151 $(GNATBIND) $(ADA_INCLUDES) -o b_gnat1.c -n gnat1drv.ali
152 b_gnat1.o : b_gnat1.c
154 -b_gnatb.c : $(GNATBIND_OBJS)
155 +b_gnatb.c : $(GNATBIND_OBJS) interfac.o
156 $(GNATBIND) $(ADA_INCLUDES) -o b_gnatb.c gnatbind.ali
157 b_gnatb.o : b_gnatb.c
159 -b_gnatc.c : $(GNATCMD_OBJS)
160 +b_gnatc.c : $(GNATCMD_OBJS) interfac.o
161 $(GNATBIND) $(ADA_INCLUDES) -o b_gnatc.c gnatcmd.ali
162 b_gnatc.o : b_gnatc.c
164 -b_gnatch.c : $(GNATCHOP_OBJS)
165 +b_gnatch.c : $(GNATCHOP_OBJS) interfac.o
166 $(GNATBIND) $(ADA_INCLUDES) -o b_gnatch.c gnatchop.ali
167 b_gnatch.o : b_gnatch.c
169 -b_gnatkr.c : $(GNATKR_OBJS)
170 +b_gnatkr.c : $(GNATKR_OBJS) interfac.o
171 $(GNATBIND) $(ADA_INCLUDES) -o b_gnatkr.c gnatkr.ali
172 b_gnatkr.o : b_gnatkr.c
174 -b_gnatl.c : $(GNATLINK_OBJS)
175 +b_gnatl.c : $(GNATLINK_OBJS) interfac.o
176 $(GNATBIND) $(ADA_INCLUDES) -o b_gnatl.c gnatlink.ali
177 b_gnatl.o : b_gnatl.c
179 -b_gnatls.c : $(GNATLS_OBJS)
180 +b_gnatls.c : $(GNATLS_OBJS) interfac.o
181 $(GNATBIND) $(ADA_INCLUDES) -o b_gnatls.c gnatls.ali
183 -b_gnatm.c : $(GNATMAKE_OBJS)
184 +b_gnatm.c : $(GNATMAKE_OBJS) interfac.o
185 $(GNATBIND) $(ADA_INCLUDES) -o b_gnatm.c gnatmake.ali
186 b_gnatm.o : b_gnatm.c
188 -b_gnatmem.c : $(GNATMEM_OBJS)
189 +b_gnatmem.c : $(GNATMEM_OBJS) interfac.o
190 $(GNATBIND) $(ADA_INCLUDES) -o b_gnatmem.c gnatmem.ali
191 b_gnatmem.o : b_gnatmem.c
193 -b_gnatp.c : $(GNATPREP_OBJS)
194 +b_gnatp.c : $(GNATPREP_OBJS) interfac.o
195 $(GNATBIND) $(ADA_INCLUDES) -o b_gnatp.c gnatprep.ali
196 b_gnatp.o : b_gnatp.c
198 -b_gnatpa.c : $(GNATPSTA_OBJS)
199 +b_gnatpa.c : $(GNATPSTA_OBJS) interfac.o
200 $(GNATBIND) $(ADA_INCLUDES) -o b_gnatpa.c gnatpsta.ali
201 b_gnatpa.o : b_gnatpa.c
203 -b_gnatps.c : $(GNATPSYS_OBJS)
204 +b_gnatps.c : $(GNATPSYS_OBJS) interfac.o
205 $(GNATBIND) $(ADA_INCLUDES) -o b_gnatps.c gnatpsys.ali
206 b_gnatps.o : b_gnatps.c
208 -b_gnatxref.c : $(GNATXREF_OBJS)
209 +b_gnatxref.c : $(GNATXREF_OBJS) interfac.o
210 $(GNATBIND) $(ADA_INCLUDES) -o b_gnatxref.c gnatxref.ali
211 b_gnatxref.o : b_gnatxref.c
213 -b_gnatfind.c : $(GNATFIND_OBJS)
214 +b_gnatfind.c : $(GNATFIND_OBJS) interfac.o
215 $(GNATBIND) $(ADA_INCLUDES) -o b_gnatfind.c gnatfind.ali
216 b_gnatfind.o : b_gnatfind.c
218 -b_gnatdll.c : $(GNATDLL_OBJS)
219 +b_gnatdll.c : $(GNATDLL_OBJS) interfac.o
220 $(GNATBIND) $(ADA_INCLUDES) -o b_gnatdll.c gnatdll.ali
221 b_gnatdll.o : b_gnatdll.c