--- gcc/ada/link.c.jj	Tue May  7 12:50:23 2002
+++ gcc/ada/link.c	Wed Jun  5 14:45:32 2002
@@ -158,11 +158,11 @@ const char *object_library_extension = "
 
 #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)
--- gcc/ada/Makefile.in.jj	Wed Jun  5 16:06:56 2002
+++ gcc/ada/Makefile.in	Wed Jun  5 16:27:33 2002
@@ -1214,6 +1214,33 @@ ifeq ($(strip $(filter-out %86 linux%,$(
   endif
 endif
 
+ifeq ($(strip $(filter-out alpha% linux%,$(arch) $(osys))),)
+  MLIB_TGT=5lml-tgt
+  SYMLIB=
+  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
+  SYMLIB=
+  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
+  SYMLIB=
+  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 = \
--- gcc/ada/gnat_rm.texi.jj	Tue Apr 23 20:27:39 2002
+++ gcc/ada/gnat_rm.texi	Thu Jun  6 14:30:21 2002
@@ -31,6 +31,10 @@
 @settitle GNAT Reference Manual
 @setchapternewpage odd
 @syncodeindex fn cp
+@dircategory Programming
+@direntry
+* gnat_rm: (gnat_rm).            GNAT Reference Manual
+@end direntry
 
 @titlepage
 
--- gcc/ada/gnat_ug.texi.jj	Tue May  7 12:50:03 2002
+++ gcc/ada/gnat_ug.texi	Thu Jun  6 14:30:33 2002
@@ -75,6 +75,11 @@
 @syncodeindex fn cp
 @c %**end of header
 
+@dircategory Programming
+@direntry
+* gnat_ug: (gnat_ug).            GNAT User's Guide
+@end direntry
+
 @titlepage
 
 @ifset vms