diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d4078a345a..9340f33fa6 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,12 @@
+2002-04-25  Jason Thorpe  <thorpej@wasabisystems.com>
+
+	* alpha-tdep.c (alpha_skip_prologue_internal): Remove
+	GDB_TARGET_HAS_SHARED_LIBS #ifdef and update comment to
+	indicate that the condition it was testing is always true.
+	* config/alpha/nm-linux.h (GDB_TARGET_HAS_SHARED_LIBS): Remove.
+	* config/alpha/nm-nbsd.h (GDB_TARGET_HAS_SHARED_LIBS): Ditto.
+	* config/alpha/nm-osf.h (GDB_TARGET_HAS_SHARED_LIBS): Ditto.
+
 2002-04-25  Jason Thorpe  <thorpej@wasabisystems.com>
 
 	* alpha-tdep.h (gdbarch_tdep): Add jb_pc and jb_elt_size members.
diff --git a/gdb/alpha-tdep.c b/gdb/alpha-tdep.c
index 81c932c57b..6145e91f2d 100644
--- a/gdb/alpha-tdep.c
+++ b/gdb/alpha-tdep.c
@@ -1356,16 +1356,15 @@ alpha_skip_prologue_internal (CORE_ADDR pc, int lenient)
   CORE_ADDR post_prologue_pc;
   char buf[4];
 
-#ifdef GDB_TARGET_HAS_SHARED_LIBS
   /* Silently return the unaltered pc upon memory errors.
      This could happen on OSF/1 if decode_line_1 tries to skip the
      prologue for quickstarted shared library functions when the
      shared library is not yet mapped in.
      Reading target memory is slow over serial lines, so we perform
-     this check only if the target has shared libraries.  */
+     this check only if the target has shared libraries (which all
+     Alpha targets do).  */
   if (target_read_memory (pc, buf, 4))
     return pc;
-#endif
 
   /* See if we can determine the end of the prologue via the symbol table.
      If so, then return either PC, or the PC after the prologue, whichever
diff --git a/gdb/config/alpha/nm-linux.h b/gdb/config/alpha/nm-linux.h
index 05ac551812..c59b88cb21 100644
--- a/gdb/config/alpha/nm-linux.h
+++ b/gdb/config/alpha/nm-linux.h
@@ -41,10 +41,6 @@
 
 #define CANNOT_STEP_BREAKPOINT
 
-/* GNU/Linux has shared libraries.  */
-
-#define GDB_TARGET_HAS_SHARED_LIBS
-
 /* Given a pointer to either a gregset_t or fpregset_t, return a
    pointer to the first register.  */
 #define ALPHA_REGSET_BASE(regsetp)  ((long *) (regsetp))
diff --git a/gdb/config/alpha/nm-nbsd.h b/gdb/config/alpha/nm-nbsd.h
index aab9edf5c3..ef6ab313a6 100644
--- a/gdb/config/alpha/nm-nbsd.h
+++ b/gdb/config/alpha/nm-nbsd.h
@@ -30,7 +30,4 @@
 /* The Alpha does not step over a breakpoint.  */
 #define CANNOT_STEP_BREAKPOINT
 
-/* NetBSD/alpha has shared libraries.  */
-#define GDB_TARGET_HAS_SHARED_LIBS
-
 #endif /* NM_NBSD_H */
diff --git a/gdb/config/alpha/nm-osf.h b/gdb/config/alpha/nm-osf.h
index 1316603c5b..20b5ae4a39 100644
--- a/gdb/config/alpha/nm-osf.h
+++ b/gdb/config/alpha/nm-osf.h
@@ -34,10 +34,6 @@
 
 #define CANNOT_STEP_BREAKPOINT
 
-/* OSF/1 has shared libraries.  */
-
-#define GDB_TARGET_HAS_SHARED_LIBS
-
 /* Support for shared libraries.  */
 
 #include "solib.h"