diff -Nur gcc-3.2.2/gcc/ada/link.c gcc-3.2.2-20030218/gcc/ada/link.c --- gcc-3.2.2/gcc/ada/link.c Sat May 4 05:28:18 2002 +++ gcc-3.2.2-20030218/gcc/ada/link.c Tue Sep 24 15:07:49 2002 @@ -158,11 +158,11 @@ #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) diff -Nur gcc-3.2.2/gcc/ada/Makefile.in gcc-3.2.2-20030218/gcc/ada/Makefile.in --- gcc-3.2.2/gcc/ada/Makefile.in Wed Jan 29 18:34:08 2003 +++ gcc-3.2.2-20030218/gcc/ada/Makefile.in Tue Feb 18 17:05:26 2003 @@ -134,7 +134,7 @@ objext = .o exeext = arext = .a -soext = .so +soext = .so.1 shext = HOST_CC=$(CC) @@ -1214,6 +1214,69 @@ 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 x86_64 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 ppc 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 s390 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 s390x 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 +2242,9 @@ 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 +2258,8 @@ 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)) @@ -2288,7 +2358,7 @@ $(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 +2426,62 @@ 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