aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Oliva <oliva@dcc.unicamp.br>1998-11-26 16:20:19 +0000
committerAlexandre Oliva <oliva@gcc.gnu.org>1998-11-26 16:20:19 +0000
commit076b41ee483989ab61d0b54510d7dd31b4df1d47 (patch)
tree8f345bf62fd4b6d8641a8e0e57044929e096ba08
parentc5941a9f1d719d41596a7829a7cc49f46770da65 (diff)
downloadgcc-076b41ee483989ab61d0b54510d7dd31b4df1d47.zip
gcc-076b41ee483989ab61d0b54510d7dd31b4df1d47.tar.gz
gcc-076b41ee483989ab61d0b54510d7dd31b4df1d47.tar.bz2
jcf-path.c (add_entry): recognize ".jar" too
* jcf-path.c (add_entry): recognize ".jar" too * lang-specs.h: ditto From-SVN: r23907
-rw-r--r--gcc/java/ChangeLog5
-rw-r--r--gcc/java/jcf-path.c3
-rw-r--r--gcc/java/lang-specs.h1
3 files changed, 8 insertions, 1 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index f6910f3..f7ee1c6 100644
--- 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 159b09f..81da015 100644
--- 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 456dc2b..71c0ae9 100644
--- 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}\