diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 743ba8d7eb8501201cea545832c16ece4fa884f3..98ebfe9381b28aa1dd30af8368ca14e3866cb660 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+Tue Aug 19 17:10:56 1997  Jason Merrill  <jason@yorick.cygnus.com>
+
+	* cplus-dem.c: Add 'extern' to prepends_underscore.
+
 Tue Aug 19 09:34:57 1997  Jeffrey A Law  (law@cygnus.com)
 
 	* haifa-sched.c (ISSUE_RATE): Renamed from MACHINE_issue_rate.
diff --git a/gcc/cplus-dem.c b/gcc/cplus-dem.c
index 26fbe954afd8b3d68e68ceb476d9f99e1cfe625a..5794a5bb869e02b2e97001b2f67e1584216865a7 100644
--- a/gcc/cplus-dem.c
+++ b/gcc/cplus-dem.c
@@ -2926,7 +2926,7 @@ Usage: %s [-_] [-n] [-s {gnu,lucid,arm}] [--strip-underscores]\n\
 char mbuffer[MBUF_SIZE];
 
 /* Defined in the automatically-generated underscore.c.  */
-int prepends_underscore;
+extern int prepends_underscore;
 
 int strip_underscore = 0;
 
@@ -2952,7 +2952,7 @@ main (argc, argv)
 
   strip_underscore = prepends_underscore;
 
-  while ((c = getopt_long (argc, argv, "_nsj:", long_options, (int *) 0)) != EOF)
+  while ((c = getopt_long (argc, argv, "_ns:j", long_options, (int *) 0)) != EOF)
     {
       switch (c)
 	{