diff --git a/gcc/ada/Makefile.in b/gcc/ada/Makefile.in
index f46e0a1dbe3af40d1e79f04f7822431434636a73..67186ec2b6bffd4ee8171812d748f8d389e6db15 100644
--- a/gcc/ada/Makefile.in
+++ b/gcc/ada/Makefile.in
@@ -813,7 +813,7 @@ ifeq ($(strip $(filter-out %86 linux%,$(arch) $(osys))),)
 
   TOOLS_TARGET_PAIRS =  \
     mlib-tgt.adb<mlib-tgt-linux.adb \
-    indepsw.adb<indepsw-linux.adb
+    indepsw.adb<indepsw-gnu.adb
 
   THREADSLIB = -lpthread
   GNATLIB_SHARED = gnatlib-shared-dual
@@ -1067,7 +1067,9 @@ ifeq ($(strip $(filter-out ibm aix%,$(manu) $(osys))),)
 endif
 
 ifeq ($(strip $(filter-out lynxos,$(osys))),)
-  TOOLS_TARGET_PAIRS=mlib-tgt.adb<mlib-tgt-lynxos.adb 
+  TOOLS_TARGET_PAIRS = \
+  mlib-tgt.adb<mlib-tgt-lynxos.adb \
+  indepsw.adb<indepsw-gnu.adb
 
   ifeq ($(strip $(filter-out %86 lynxos,$(arch) $(osys))),)
     LIBGNAT_TARGET_PAIRS = \
@@ -1321,7 +1323,7 @@ ifeq ($(strip $(filter-out powerpc% linux%,$(arch) $(osys))),)
 
   TOOLS_TARGET_PAIRS =  \
     mlib-tgt.adb<mlib-tgt-linux.adb \
-    indepsw.adb<indepsw-linux.adb
+    indepsw.adb<indepsw-gnu.adb
 
   THREADSLIB = -lpthread
   GNATLIB_SHARED = gnatlib-shared-dual
@@ -1346,7 +1348,7 @@ ifeq ($(strip $(filter-out sparc% linux%,$(arch) $(osys))),)
 
   TOOLS_TARGET_PAIRS =  \
     mlib-tgt.adb<mlib-tgt-linux.adb \
-    indepsw.adb<indepsw-linux.adb
+    indepsw.adb<indepsw-gnu.adb
 
   THREADSLIB = -lpthread
   GNATLIB_SHARED = gnatlib-shared-dual
@@ -1371,7 +1373,7 @@ ifeq ($(strip $(filter-out hppa% linux%,$(arch) $(osys))),)
 
   TOOLS_TARGET_PAIRS =  \
     mlib-tgt.adb<mlib-tgt-linux.adb \
-    indepsw.adb<indepsw-linux.adb
+    indepsw.adb<indepsw-gnu.adb
 
   THREADSLIB = -lpthread
   GNATLIB_SHARED = gnatlib-shared-dual
@@ -1396,7 +1398,7 @@ ifeq ($(strip $(filter-out %ia64 linux%,$(arch) $(osys))),)
 
   TOOLS_TARGET_PAIRS =  \
     mlib-tgt.adb<mlib-tgt-linux.adb \
-    indepsw.adb<indepsw-linux.adb
+    indepsw.adb<indepsw-gnu.adb
 
   MISCLIB=
   THREADSLIB=-lpthread
@@ -1421,7 +1423,7 @@ ifeq ($(strip $(filter-out alpha% linux%,$(arch) $(osys))),)
 
   TOOLS_TARGET_PAIRS =  \
     mlib-tgt.adb<mlib-tgt-linux.adb \
-    indepsw.adb<indepsw-linux.adb
+    indepsw.adb<indepsw-gnu.adb
 
   MISCLIB=
   THREADSLIB=-lpthread
@@ -1447,7 +1449,7 @@ ifeq ($(strip $(filter-out %x86_64 linux%,$(arch) $(osys))),)
 
   TOOLS_TARGET_PAIRS =  \
     mlib-tgt.adb<mlib-tgt-linux.adb \
-    indepsw.adb<indepsw-linux.adb
+    indepsw.adb<indepsw-gnu.adb
 
   THREADSLIB=-lpthread
   GNATLIB_SHARED=gnatlib-shared-dual
diff --git a/gcc/ada/indepsw-linux.adb b/gcc/ada/indepsw-gnu.adb
similarity index 95%
rename from gcc/ada/indepsw-linux.adb
rename to gcc/ada/indepsw-gnu.adb
index 113f5958bb7d3dba596de2efb9fd6a26d07d4a02..44cd6bf65e2c99d4873a991deba9ee38acac5fa8 100644
--- a/gcc/ada/indepsw-linux.adb
+++ b/gcc/ada/indepsw-gnu.adb
@@ -5,9 +5,9 @@
 --                              I N D E P S W                               --
 --                                                                          --
 --                                 B o d y                                  --
---                            (GNU/Linux version)                           --
+--                              (GNU version)                               --
 --                                                                          --
---            Copyright (C) 2004 Free Software Foundation, Inc.             --
+--            Copyright (C) 2005 Free Software Foundation, Inc.             --
 --                                                                          --
 -- GNAT is free software;  you can  redistribute it  and/or modify it under --
 -- terms of the  GNU General Public License as published  by the Free Soft- --
@@ -32,7 +32,7 @@
 --                                                                          --
 ------------------------------------------------------------------------------
 
---  This is the GNU/Linux version
+--  This is the GNU ld version
 
 package body Indepsw is