jvspec.c (THREAD_NAME): Renamed -lqthreads to -lgcjcoop.

	* jvspec.c (THREAD_NAME): Renamed -lqthreads to -lgcjcoop.
	(GC_NAME): Renamed -lgc to -lgcjgc.

From-SVN: r25135

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 0bfb8074cd81edb3e27365d08134174f5dc94a19..3cf54e53c79a0ff5938cb0a5f4688cda980369c7 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,8 @@
+1999-02-10  Tom Tromey  <tromey@cygnus.com>
+
+       * jvspec.c (THREAD_NAME): Renamed -lqthreads to -lgcjcoop.
+       (GC_NAME): Renamed -lgc to -lgcjgc.
+
 Tue Feb  9 19:31:09 1999  Alexandre Petit-Bianco  <apbianco@cygnus.com>
 
        * lex.c (java_lang_cloneable): Initialize.

diff --git a/gcc/java/jvspec.c b/gcc/java/jvspec.c
index 2d09db3e5a5526e2140aee8abd1c336f25c72134..b63ebcd62574adb8b421eea80a594a58cefe092b 100644 (file)
--- a/gcc/java/jvspec.c
+++ b/gcc/java/jvspec.c
@@ -32,11 +32,11 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 #if defined (WITH_THREAD_posix) || defined (WITH_THREAD_pthreads)
 #define THREAD_NAME "-lpthread"
 #elif defined (WITH_THREAD_qt)
-#define THREAD_NAME "-lqthreads"
+#define THREAD_NAME "-lgcjcoop"
 #endif
 
 #if defined (WITH_GC_boehm)
-#define GC_NAME "-lgc"
+#define GC_NAME "-lgcjgc"
 #endif
 
 /* This bit is set if we saw a `-xfoo' language specification.  */
@@ -45,7 +45,7 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 #define MATHLIB                (1<<2)
 /* This bit is set if they did `-lc'.  */
 #define WITHLIBC       (1<<3)
-/* This bit is set if they did `-lgc'.  */
+/* This bit is set if they did `-lgcjgc'.  */
 #define GCLIB          (1<<4)
 /* This bit is set if they did `-lpthread' (or added some other thread
    library).  */
@@ -148,7 +148,7 @@ lang_specific_driver (fn, in_argc, in_argv, in_added_libraries)
   /* "-lc" if it appears on the command line.  */
   char *saw_libc = 0;
 
-  /* "-lgc" if it appears on the command line.  */
+  /* "-lgcjgc" if it appears on the command line.  */
   char *saw_gc = 0;
 
   /* Saw `-l' option for the thread library.  */
@@ -453,7 +453,7 @@ lang_specific_driver (fn, in_argc, in_argv, in_added_libraries)
          saw_libc = argv[i];
        }
 
-      /* And -ljava must come before -lgc.  */
+      /* And -ljava must come before -lgcjgc.  */
       if (!saw_gc && (args[i] & GCLIB) && library)
        {
          --j;

diff --git a/gcc/java/parse.c b/gcc/java/parse.c
index 151b26101012adf80e13177dc790e1192a91da7d..0bc95693b62f9f5342d30ff8df5f96eaac970dda 100644 (file)
--- a/gcc/java/parse.c
+++ b/gcc/java/parse.c
@@ -2254,7 +2254,7 @@ static const short yycheck[] = {     3,
 #define YYPURE 1
 
 /* -*-C-*-  Note some compilers choke on comments on `#line' lines.  */
-#line 3 "/usr/cygnus/gnupro-98r2/share/bison.simple"
+#line 3 "/usr/share/misc/bison.simple"
 
 /* Skeleton output parser for bison,
    Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc.
@@ -2271,7 +2271,7 @@ static const short yycheck[] = {     3,
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 /* As a special exception, when this file is copied by Bison into a
    Bison output file, you may use that output file without restriction.
@@ -2447,7 +2447,7 @@ __yy_memcpy (char *to, char *from, int count)
 #endif
 #endif
 \f
-#line 196 "/usr/cygnus/gnupro-98r2/share/bison.simple"
+#line 196 "/usr/share/misc/bison.simple"
 
 /* The user can define YYPARSE_PARAM as the name of an argument to be passed
    into yyparse.  The argument should have type void *.
@@ -4705,7 +4705,7 @@ case 492:
     break;}
 }
    /* the action file gets copied in in place of this dollarsign */
-#line 498 "/usr/cygnus/gnupro-98r2/share/bison.simple"
+#line 498 "/usr/share/misc/bison.simple"
 \f
   yyvsp -= yylen;
   yyssp -= yylen;