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 powerpc 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)) @@ -2041,6 +2041,7 @@ cd rts; ../../xgcc -B../../ -shared $(TARGET_LIBGCC2_CFLAGS) \ -o libgnarl-$(LIBRARY_VERSION)$(soext) \ $(GNATRTL_TASKING_OBJS) \ + ./libgnat-$(LIBRARY_VERSION)$(soext) \ $(SO_OPTS)libgnarl-$(LIBRARY_VERSION)$(soext) $(THREADSLIB) cd rts; $(LN_S) libgnat-$(LIBRARY_VERSION)$(soext) libgnat$(soext) cd rts; $(LN_S) libgnarl-$(LIBRARY_VERSION)$(soext) libgnarl$(soext)