jcf-path.c (add_entry): recognize ".jar" too

	* jcf-path.c (add_entry): recognize ".jar" too
	* lang-specs.h: ditto

From-SVN: r23907

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index f6910f36c5f5fc05ee26004ea153ff60e713db27..f7ee1c61d4bb843589f15fb417b007e4f2d4f57e 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,8 @@
+Wed Nov 26 22:03:58 1998  Alexandre Oliva  <oliva@dcc.unicamp.br>
+
+       * jcf-path.c (add_entry): recognize ".jar" too
+       * lang-specs.h: ditto
+
 Thu Nov 26 12:44:07 1998  Per Bothner  <bothner@cygnus.com>
 
        * jcf-write.c (generate_bytecode_insns):  In Call_EXPR, handle

diff --git a/gcc/java/jcf-path.c b/gcc/java/jcf-path.c
index 159b09f9f71f110330a58a1b1cf1049392078b98..81da01517b8114b780d5aef107bd1a0d3839e82a 100644 (file)
--- a/gcc/java/jcf-path.c
+++ b/gcc/java/jcf-path.c
@@ -141,7 +141,8 @@ add_entry (entp, filename, is_system)
   n->next = NULL;
 
   len = strlen (filename);
-  if (len > 4 && ! strcmp (filename + len - 4, ".zip"))
+  if (len > 4 && (! strcmp (filename + len - 4, ".zip")
+                 || ! strcmp (filename + len - 4, ".jar")))
     {
       n->flags |= FLAG_ZIP;
       /* If the user uses -classpath then he'll have to include

diff --git a/gcc/java/lang-specs.h b/gcc/java/lang-specs.h
index 456dc2b5b7eb71ca962cb0df4b85f333b5221125..71c0ae9103bda12f723243ed9cfd857e91e7acf0 100644 (file)
--- a/gcc/java/lang-specs.h
+++ b/gcc/java/lang-specs.h
@@ -27,6 +27,7 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
   {".java",   {"@java"} },
   {".class",  {"@java"} },
   {".zip",    {"@java"} },
+  {".jar",    {"@java"} },
   {"@java",
    {"%{!E:jc1 %i %1 %{!Q:-quiet} %{d*} %{m*} %{a}\
                    %{g*} %{O*} %{W*} %{w} %{pedantic*} %{ansi}\