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 powerpc 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,6 +2242,9 @@
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) $(TARGET_LIBGCC2_CFLAGS) -DIN_RTS" \
111 @@ -2192,6 +2258,8 @@
117 $(RM) rts/libgnat$(arext) rts/libgnarl$(arext)
118 $(AR) $(AR_FLAGS) rts/libgnat$(arext) \
119 $(addprefix rts/,$(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS))
120 @@ -2041,6 +2041,7 @@
121 cd rts; ../../xgcc -B../../ -shared $(TARGET_LIBGCC2_CFLAGS) \
122 -o libgnarl-$(LIBRARY_VERSION)$(soext) \
123 $(GNATRTL_TASKING_OBJS) \
124 + ./libgnat-$(LIBRARY_VERSION)$(soext) \
125 $(SO_OPTS)libgnarl-$(LIBRARY_VERSION)$(soext) $(THREADSLIB)
126 cd rts; $(LN_S) libgnat-$(LIBRARY_VERSION)$(soext) libgnat$(soext)
127 cd rts; $(LN_S) libgnarl-$(LIBRARY_VERSION)$(soext) libgnarl$(soext)