diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0be039bb59e..c989b952d7b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2005-04-13  Bernd Schmidt  <bernd.schmidt@analog.com>
+
+	* config/bfin/bfin.c (bfin_lib_id_given): New static variable.
+	(bfin_handle_options): Set it if -mshared-library-id= is seen.
+	* config/bfin/bfin.opt (mshared-library-id=): Lose
+	Var(bfin_lib_id_given).
+
 2005-04-13  Matt Thomas  <matt@3am-software.com>
  
  	* config/rs6000/sysv4.h (NO_IMPLICIT_EXTERN_C): undefine before
diff --git a/gcc/config/bfin/bfin.c b/gcc/config/bfin/bfin.c
index c4287a1f917..559ebb7744d 100644
--- a/gcc/config/bfin/bfin.c
+++ b/gcc/config/bfin/bfin.c
@@ -69,6 +69,8 @@ static int arg_regs[] = FUNCTION_ARG_REGISTERS;
 
 /* The value passed to -mshared-library-id=.  */
 static int bfin_library_id;
+/* Nonzero if -mshared-library-id was given.  */
+static int bfin_lib_id_given;
 
 static void
 bfin_globalize_label (FILE *stream, const char *name)
@@ -1725,6 +1727,7 @@ bfin_handle_option (size_t code, const char *arg, int value)
 	       arg, MAX_LIBRARY_ID);
       else
 	bfin_library_id = value;
+      bfin_lib_id_given = 1;
       return true;
 
     default:
diff --git a/gcc/config/bfin/bfin.opt b/gcc/config/bfin/bfin.opt
index 8a07bc3187b..827947d5e6a 100644
--- a/gcc/config/bfin/bfin.opt
+++ b/gcc/config/bfin/bfin.opt
@@ -36,5 +36,5 @@ Target Report Mask(ID_SHARED_LIBRARY)
 Enabled ID based shared library
 
 mshared-library-id=
-Target RejectNegative Joined UInteger Var(bfin_lib_id_given)
+Target RejectNegative Joined UInteger
 ID of shared library to build