--- gcc/gcc/ada/gcc-interface/Makefile.in

+++ gcc/gcc/ada/gcc-interface/Makefile.in

@@ -102,7 +102,7 @@ INSTALL_DATA_DATE = cp -p

 MAKEINFO = makeinfo

 TEXI2DVI = texi2dvi

 TEXI2PDF = texi2pdf

-GNATBIND_FLAGS = -static -x

+GNATBIND_FLAGS = -shared -x

 ADA_CFLAGS =

 ADAFLAGS = -W -Wall -gnatpg -gnata

 FORCE_DEBUG_ADAFLAGS = -g

@@ -411,6 +411,11 @@ ifeq ($(TOOLSCASE),cross)

   vpath %.h   ../

 endif

+ifeq ($(strip $(filter-out hppa% unknown linux gnu,$(targ))),)

+  GNATLIB_SHARED = gnatlib-shared-dual

+  LIBRARY_VERSION := $(LIB_VERSION)

+endif

+

 # gnatmake/link tools cannot always be built with gnatmake/link for bootstrap

 # reasons: gnatmake should be built with a recent compiler, a recent compiler

 # may not generate ALI files compatible with an old gnatmake so it is important

@@ -2851,15 +2856,15 @@ gnatlib-shared-default:

 		$(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS) \

 		$(SO_OPTS)libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \

 		$(MISCLIB) -lm

+	cd $(RTSDIR); $(LN_S) libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \

+		libgnat$(soext)

 	cd $(RTSDIR); `echo "$(GCC_FOR_TARGET)" \

                 | sed -e 's,\./xgcc,../../xgcc,' -e 's,-B\./,-B../../,'` -shared $(GNATLIBCFLAGS) \

 		$(PICFLAG_FOR_TARGET) \

 		-o libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \

 		$(GNATRTL_TASKING_OBJS) \

 		$(SO_OPTS)libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \

-		$(THREADSLIB)

-	cd $(RTSDIR); $(LN_S) libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \

-		libgnat$(soext)

+		$(THREADSLIB) -L. -lgnat

 	cd $(RTSDIR); $(LN_S) libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \

 		libgnarl$(soext)

--- gcc/gcc/ada/link.c

+++ gcc/gcc/ada/link.c

@@ -128,8 +128,8 @@ const char *__gnat_default_libgcc_subdir = "lib";

 #elif defined (__linux__) || defined (__GLIBC__)

 const char *__gnat_object_file_option = "-Wl,@";

-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;

 char __gnat_shared_libgcc_default = STATIC;

 int __gnat_link_max = 8192;

 unsigned char __gnat_objlist_file_supported = 1;