aboutsummaryrefslogtreecommitdiff
path: root/gcc/java
diff options
context:
space:
mode:
authorZack Weinberg <zack@wolery.cumb.org>2000-07-13 07:14:13 +0000
committerZack Weinberg <zack@gcc.gnu.org>2000-07-13 07:14:13 +0000
commitea414c9749d55f53d308783f203952f1239596b7 (patch)
treeb97fcab509348e7c18c9ecbc2cb4f89b06acf1c4 /gcc/java
parent450624947fdcedff2808937c1788894353f288a0 (diff)
downloadgcc-ea414c9749d55f53d308783f203952f1239596b7.zip
gcc-ea414c9749d55f53d308783f203952f1239596b7.tar.gz
gcc-ea414c9749d55f53d308783f203952f1239596b7.tar.bz2
gcc.c (do_spec_1): Add new %B operator.
* gcc.c (do_spec_1): Add new %B operator. (set_input): Prepare for %B. (link_command_spec): Move up with the other tm.h- overrideable specs. Factor out the portion conditional on LINK_LIBGCC_SPECIAL into a new spec, %(link_libgcc). (struct compiler): Just have a single spec string. All users updated. (default_compilers): Remove unnecessary braces. (static_specs): Update. (trad_capable_cpp, cpp_options, cc1_options, asm_options): New named specs. (C and assembly specs): Use the new named specs, as appropriate. * objc/lang-specs.h, ch/lang-specs.h, cp/lang-specs.h, f/lang-specs.h, java/lang-specs.h: Use the new named specs. Remove unnecessary braces. From-SVN: r35008
Diffstat (limited to 'gcc/java')
-rw-r--r--gcc/java/ChangeLog4
-rw-r--r--gcc/java/lang-specs.h24
2 files changed, 12 insertions, 16 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 621fbcc..0edfafb 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,7 @@
+2000-07-13 Zack Weinberg <zack@wolery.cumb.org>
+
+ * lang-specs.h: Use the new named specs. Remove unnecessary braces.
+
2000-07-12 Mark Mitchell <mark@codesourcery.com>
* parse-scan.c: Remove.
diff --git a/gcc/java/lang-specs.h b/gcc/java/lang-specs.h
index 019fca6..c033018 100644
--- a/gcc/java/lang-specs.h
+++ b/gcc/java/lang-specs.h
@@ -25,20 +25,12 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
/* This is the contribution to the `default_compilers' array in gcc.c for
Java. */
- {".java", {"@java"} },
- {".class", {"@java"} },
- {".zip", {"@java"} },
- {".jar", {"@java"} },
+ {".java", "@java" },
+ {".class", "@java" },
+ {".zip", "@java" },
+ {".jar", "@java" },
{"@java",
- {"%{!E:jc1 %i %1 %(jc1) %{!Q:-quiet} %{d*} %{m*} %{a}\
- %{g*} %{O*} %{W*} %{w} %{pedantic*} %{ansi}\
- %{traditional} %{v:-version} %{pg:-p} %{p}\
- %{f*} %{+e*} %{aux-info*} %{Qn:-fno-ident}\
- %{I*}\
- %{MD} %{MMD} %{M} %{MM}\
- %{fjni:%{femit-class-file:%e-fjni and -femit-class-file are incompatible}}\
- %{pg:%{fomit-frame-pointer:%e-pg and -fomit-frame-pointer are incompatible}}\
- %{S:%W{o*}%{!o*:-o %b.s}}%{!S:-o %{|!pipe:%g.s}} |\n\
- %{!S:as %a %Y\
- %{c:%W{o*}%{!o*:-o %w%b%O}}%{!c:-o %d%w%u%O}\
- %{!pipe:%g.s} %A\n }}"}},
+ "%{fjni:%{femit-class-file:%e-fjni and -femit-class-file are incompatible}}\
+ %{!E:jc1 %i %(cc1_options) %{+e*} %{MD} %{MMD} %{M} %{MM}\
+ %{!S:-o %{|!pipe:%g.s} |\n\
+ as %(asm_options) %{!pipe:%g.s} %A }}"},