diff -p -up gcc-4.4.0-20090213/gcc/ada/Makefile.in.ada-link gcc-4.4.0-20090213/gcc/ada/Makefile.in
diff -p -up gcc-4.4.0-20090213/gcc/ada/gcc-interface/Makefile.in.ada-link gcc-4.4.0-20090213/gcc/ada/gcc-interface/Makefile.in
--- gcc-4.4.0-20090213/gcc/ada/gcc-interface/Makefile.in.ada-link	2009-02-17 13:19:11.678521981 -0500
+++ gcc-4.4.0-20090213/gcc/ada/gcc-interface/Makefile.in	2009-02-17 13:19:14.174169866 -0500
@@ -1007,6 +1007,69 @@ ifeq ($(strip $(filter-out s390% linux%,
   LIBRARY_VERSION := $(LIB_VERSION)
 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 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 = \
diff -p -up gcc-4.4.0-20090213/gcc/ada/gnat_rm.texi.ada-link gcc-4.4.0-20090213/gcc/ada/gnat_rm.texi
--- gcc-4.4.0-20090213/gcc/ada/gnat_rm.texi.ada-link	2009-01-14 06:05:45.000000000 -0500
+++ gcc-4.4.0-20090213/gcc/ada/gnat_rm.texi	2009-02-17 13:11:29.590524217 -0500
@@ -33,6 +33,10 @@ included in the section entitled ``GNU F
 
 @setchapternewpage odd
 @syncodeindex fn cp
+@dircategory Programming
+@direntry
+* gnat_rm: (gnat_rm).            GNAT Reference Manual
+@end direntry
 
 @include gcc-common.texi
 
diff -p -up gcc-4.4.0-20090213/gcc/ada/gnat_ugn.texi.ada-link gcc-4.4.0-20090213/gcc/ada/gnat_ugn.texi
--- gcc-4.4.0-20090213/gcc/ada/gnat_ugn.texi.ada-link	2009-01-14 06:05:46.000000000 -0500
+++ gcc-4.4.0-20090213/gcc/ada/gnat_ugn.texi	2009-02-17 13:11:29.601271961 -0500
@@ -120,6 +120,11 @@ Texts.  A copy of the license is include
 @syncodeindex fn cp
 @c %**end of header
 
+@dircategory Programming
+@direntry
+* gnat_ug: (gnat_ug).            GNAT User's Guide
+@end direntry
+
 @titlepage
 @title @value{EDITION} User's Guide
 @ifset vms
diff -p -up gcc-4.4.0-20090213/gcc/ada/link.c.ada-link gcc-4.4.0-20090213/gcc/ada/link.c
--- gcc-4.4.0-20090213/gcc/ada/link.c.ada-link	2009-01-14 06:05:46.000000000 -0500
+++ gcc-4.4.0-20090213/gcc/ada/link.c	2009-02-17 13:11:29.583153720 -0500
@@ -155,8 +155,8 @@ const char *__gnat_object_library_extens
 
 #elif defined (linux) || defined(__GLIBC__)
 const char *__gnat_object_file_option = "";
-const char *__gnat_run_path_option = "-Wl,-rpath,";
-char __gnat_shared_libgnat_default = STATIC;
+const char *__gnat_run_path_option = "";
+char __gnat_shared_libgnat_default = SHARED;
 int __gnat_link_max = 8192;
 unsigned char __gnat_objlist_file_supported = 1;
 unsigned char __gnat_using_gnu_linker = 1;