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 = "
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";
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 =
29 @@ -1214,6 +1214,33 @@ ifeq ($(strip $(filter-out %86 linux%,$(
33 +ifeq ($(strip $(filter-out alpha% linux%,$(arch) $(osys))),)
36 + THREADSLIB=-lpthread
37 + GNATLIB_SHARED=gnatlib-shared-dual
39 + LIBRARY_VERSION := $(strip $(shell grep Library_Version $(fsrcpfx)gnatvsn.ads | sed -e 's/.*GNAT Lib v\(.*\)[ "].*/\1/'))
42 +ifeq ($(strip $(filter-out sparc% linux%,$(arch) $(osys))),)
45 + THREADSLIB=-lpthread
46 + GNATLIB_SHARED=gnatlib-shared-dual
48 + LIBRARY_VERSION := $(strip $(shell grep Library_Version $(fsrcpfx)gnatvsn.ads | sed -e 's/.*GNAT Lib v\(.*\)[ "].*/\1/'))
51 +ifeq ($(strip $(filter-out ia64 linux%,$(arch) $(osys))),)
54 + THREADSLIB=-lpthread
55 + GNATLIB_SHARED=gnatlib-shared-dual
57 + LIBRARY_VERSION := $(strip $(shell grep Library_Version $(fsrcpfx)gnatvsn.ads | sed -e 's/.*GNAT Lib v\(.*\)[ "].*/\1/'))
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
65 gnatlib: ../stamp-gnatlib1 ../stamp-gnatlib2
66 # ../xgcc -B../ -dD -E ../tconfig.h $(INCLUDES) > rts/tconfig.h
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
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)" \
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)
97 @@ -2358,62 +2363,62 @@ TREE_H = $(srcdir)/../tree.h $(srcdir)/.
99 ada_extra_files : treeprs.ads einfo.h sinfo.h nmake.adb nmake.ads
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
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
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
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
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
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
131 -b_gnatls.c : $(GNATLS_OBJS)
132 +b_gnatls.c : $(GNATLS_OBJS) interfac.o
133 $(GNATBIND) $(ADA_INCLUDES) -o b_gnatls.c gnatls.ali
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
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
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
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
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
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
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
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
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
178 @settitle GNAT Reference Manual
179 @setchapternewpage odd
181 +@dircategory Programming
183 +* gnat_rm: (gnat_rm). GNAT Reference Manual
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
194 +@dircategory Programming
196 +* gnat_ug: (gnat_ug). GNAT User's Guide