]> git.pld-linux.org Git - packages/gcc.git/blame - gcc32-ada-link.patch
- updated to 3.2.3,
[packages/gcc.git] / gcc32-ada-link.patch
CommitLineData
cbe3043d
JB
1diff -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
4@@ -158,11 +158,11 @@
5384b728 5
6 #elif defined (linux)
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";
17
18 #elif defined (__svr4__) && defined (i386)
cbe3043d
JB
19diff -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
22@@ -134,7 +134,7 @@
5384b728 23 objext = .o
24 exeext =
25 arext = .a
26-soext = .so
27+soext = .so.1
28 shext =
29
30 HOST_CC=$(CC)
cbe3043d 31@@ -1214,6 +1214,69 @@
5384b728 32 endif
33 endif
34
35+ifeq ($(strip $(filter-out alpha% linux%,$(arch) $(osys))),)
36+ MLIB_TGT=5lml-tgt
37+ MISCLIB=
38+ THREADSLIB=-lpthread
39+ GNATLIB_SHARED=gnatlib-shared-dual
40+ GMEM_LIB=gmemlib
41+ LIBRARY_VERSION := $(strip $(shell grep Library_Version $(fsrcpfx)gnatvsn.ads | sed -e 's/.*GNAT Lib v\(.*\)[ "].*/\1/'))
42+endif
43+
44+ifeq ($(strip $(filter-out sparc% linux%,$(arch) $(osys))),)
45+ MLIB_TGT=5lml-tgt
46+ MISCLIB=
47+ THREADSLIB=-lpthread
48+ GNATLIB_SHARED=gnatlib-shared-dual
49+ GMEM_LIB=gmemlib
50+ LIBRARY_VERSION := $(strip $(shell grep Library_Version $(fsrcpfx)gnatvsn.ads | sed -e 's/.*GNAT Lib v\(.*\)[ "].*/\1/'))
51+endif
52+
53+ifeq ($(strip $(filter-out ia64 linux%,$(arch) $(osys))),)
54+ MLIB_TGT=5lml-tgt
55+ MISCLIB=
56+ THREADSLIB=-lpthread
57+ GNATLIB_SHARED=gnatlib-shared-dual
58+ GMEM_LIB=gmemlib
59+ LIBRARY_VERSION := $(strip $(shell grep Library_Version $(fsrcpfx)gnatvsn.ads | sed -e 's/.*GNAT Lib v\(.*\)[ "].*/\1/'))
60+endif
cbe3043d
JB
61+
62+ifeq ($(strip $(filter-out x86_64 linux%,$(arch) $(osys))),)
63+ MLIB_TGT=5lml-tgt
64+ MISCLIB=
65+ THREADSLIB=-lpthread
66+ GNATLIB_SHARED=gnatlib-shared-dual
67+ GMEM_LIB=gmemlib
68+ LIBRARY_VERSION := $(strip $(shell grep Library_Version $(fsrcpfx)gnatvsn.ads | sed -e 's/.*GNAT Lib v\(.*\)[ "].*/\1/'))
69+endif
70+
71+ifeq ($(strip $(filter-out ppc linux%,$(arch) $(osys))),)
72+ MLIB_TGT=5lml-tgt
73+ MISCLIB=
74+ THREADSLIB=-lpthread
75+ GNATLIB_SHARED=gnatlib-shared-dual
76+ GMEM_LIB=gmemlib
77+ LIBRARY_VERSION := $(strip $(shell grep Library_Version $(fsrcpfx)gnatvsn.ads | sed -e 's/.*GNAT Lib v\(.*\)[ "].*/\1/'))
78+endif
79+
80+ifeq ($(strip $(filter-out s390 linux%,$(arch) $(osys))),)
81+ MLIB_TGT=5lml-tgt
82+ MISCLIB=
83+ THREADSLIB=-lpthread
84+ GNATLIB_SHARED=gnatlib-shared-dual
85+ GMEM_LIB=gmemlib
86+ LIBRARY_VERSION := $(strip $(shell grep Library_Version $(fsrcpfx)gnatvsn.ads | sed -e 's/.*GNAT Lib v\(.*\)[ "].*/\1/'))
87+endif
88+
89+ifeq ($(strip $(filter-out s390x linux%,$(arch) $(osys))),)
90+ MLIB_TGT=5lml-tgt
91+ MISCLIB=
92+ THREADSLIB=-lpthread
93+ GNATLIB_SHARED=gnatlib-shared-dual
94+ GMEM_LIB=gmemlib
95+ LIBRARY_VERSION := $(strip $(shell grep Library_Version $(fsrcpfx)gnatvsn.ads | sed -e 's/.*GNAT Lib v\(.*\)[ "].*/\1/'))
96+endif
5384b728 97+
98 ifeq ($(strip $(filter-out mips sgi irix%,$(targ))),)
99 ifeq ($(strip $(filter-out mips sgi irix6%,$(targ))),)
100 LIBGNAT_TARGET_PAIRS = \
cbe3043d 101@@ -2179,9 +2242,12 @@
5384b728 102
103 gnatlib: ../stamp-gnatlib1 ../stamp-gnatlib2
104 # ../xgcc -B../ -dD -E ../tconfig.h $(INCLUDES) > rts/tconfig.h
105+ $(RMDIR) save
106+ $(MKDIR) save
107+ $(MV) *.o save/
108 $(MAKE) -C rts CC="../../xgcc -B../../" \
109 INCLUDES="$(INCLUDES_FOR_SUBDIR) -I./../.." \
cbe3043d
JB
110- CFLAGS="$(GNATLIBCFLAGS) $(LIBGCC2_CFLAGS) -DIN_RTS" \
111+ CFLAGS="$(GNATLIBCFLAGS) $(TARGET_LIBGCC2_CFLAGS) -DIN_RTS" \
112 ADA_CFLAGS="$(GNATLIBCFLAGS)" \
113 srcdir=$(fsrcdir) \
114 -f ../Makefile $(LIBGNAT_OBJS)
115@@ -2192,6 +2258,8 @@
5384b728 116 srcdir=$(fsrcdir) \
117 -f ../Makefile \
118 $(GNATRTL_OBJS)
119+ $(MV) save/*.o .
120+ $(RMDIR) save
121 $(RM) rts/libgnat$(arext) rts/libgnarl$(arext)
122 $(AR) $(AR_FLAGS) rts/libgnat$(arext) \
123 $(addprefix rts/,$(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS))
cbe3043d
JB
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)" \
5384b728 130 THREAD_KIND="$(THREAD_KIND)" \
131 gnatlib
132 $(RM) rts/libgnat$(soext) rts/libgnarl$(soext)
cbe3043d 133- cd rts; ../../xgcc -B../../ -shared $(LIBGCC2_CFLAGS) \
5384b728 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
cbe3043d
JB
137- cd rts; ../../xgcc -B../../ -shared $(LIBGCC2_CFLAGS) \
138+ cd rts; ../../xgcc -B../../ -shared $(TARGET_LIBGCC2_CFLAGS) \
5384b728 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)
144
cbe3043d 145@@ -2358,62 +2426,62 @@
5384b728 146
147 ada_extra_files : treeprs.ads einfo.h sinfo.h nmake.adb nmake.ads
148
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
153
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
158
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
163
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
168
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
173
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
178
179-b_gnatls.c : $(GNATLS_OBJS)
180+b_gnatls.c : $(GNATLS_OBJS) interfac.o
181 $(GNATBIND) $(ADA_INCLUDES) -o b_gnatls.c gnatls.ali
182
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
187
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
192
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
197
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
202
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
207
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
212
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
217
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
222
This page took 0.067513 seconds and 4 git commands to generate.