diff options
| author | Alexandre Petit-Bianco <apbianco@cygnus.com> | 1999-05-14 13:44:11 +0000 |
|---|---|---|
| committer | Alexandre Petit-Bianco <apbianco@cygnus.com> | 1999-05-14 13:44:11 +0000 |
| commit | a1d19ee4f014952d461c5a7e855f0ea9158c768c (patch) | |
| tree | aeb2b02f82b5fb61f83f6de55a92a5cd53d09b08 | |
| parent | 6aba1706a66318688439ef9153bcafc7a69d3bed (diff) | |
Fri May 14 12:31:08 1999 Alexandre Petit-Bianco <apbianco@cygnus.com>
* xref.c (xref_set_current_fp): New function, defined.
* xref.h (xref_set_current_fp): New function, prototyped.
Fri May 14 11:57:54 1999 Alexandre Petit-Bianco <apbianco@cygnus.com>
* check-init.c (check_init): Take into account that
LABELED_BLOCK_STMT can be empty.
git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@26935 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/java/ChangeLog | 13 | ||||
| -rw-r--r-- | gcc/java/check-init.c | 3 | ||||
| -rw-r--r-- | gcc/java/lang.c | 10 | ||||
| -rw-r--r-- | gcc/java/xref.c | 7 | ||||
| -rw-r--r-- | gcc/java/xref.h | 1 |
5 files changed, 22 insertions, 12 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index cf33bd55339..61ccfe6b3f9 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,10 +1,21 @@ +Fri May 14 12:31:08 1999 Alexandre Petit-Bianco <apbianco@cygnus.com> + + * xref.c (xref_set_current_fp): New function, defined. + * xref.h (xref_set_current_fp): New function, prototyped. + +Fri May 14 11:57:54 1999 Alexandre Petit-Bianco <apbianco@cygnus.com> + + * check-init.c (check_init): Take into account that + LABELED_BLOCK_STMT can be empty. + Thu May 13 18:30:48 1999 Alexandre Petit-Bianco <apbianco@cygnus.com> * parse.y (java_check_regular_methods): Warning check on not overriding methods with default access in other packages does not apply to `<clinit>'. (java_complete_lhs): If block body is an empty_stmt_node, replace - it by NULL_TREE. This avoid gcc generating an irrelevant warning. + it by NULL_TREE. This prevents gcc from generating an irrelevant + warning. Thu May 13 13:23:38 1999 Alexandre Petit-Bianco <apbianco@cygnus.com> diff --git a/gcc/java/check-init.c b/gcc/java/check-init.c index 071faf74924..67e2524cf9b 100644 --- a/gcc/java/check-init.c +++ b/gcc/java/check-init.c @@ -475,7 +475,8 @@ check_init (exp, before) struct alternatives alt; BEGIN_ALTERNATIVES (before, alt); alt.block = exp; - check_init (LABELED_BLOCK_BODY (exp), before); + if (LABELED_BLOCK_BODY (exp)) + check_init (LABELED_BLOCK_BODY (exp), before); done_alternative (before, &alt); END_ALTERNATIVES (before, alt); return; diff --git a/gcc/java/lang.c b/gcc/java/lang.c index df3a199af62..cd6fb3bd569 100644 --- a/gcc/java/lang.c +++ b/gcc/java/lang.c @@ -173,16 +173,6 @@ lang_decode_option (argc, argv) } #undef ARG -#define XARG "-fxref=" - if (strncmp (p, XARG, sizeof (XARG) - 1) == 0) - { - if (!(flag_emit_xref = xref_flag_value (p + sizeof (XARG) - 1))) - error ("Unkown xref format `%s'", p + sizeof (XARG) - 1); - else - return 1; - } -#undef XARG - if (p[0] == '-' && p[1] == 'f') { /* Some kind of -f option. diff --git a/gcc/java/xref.c b/gcc/java/xref.c index 0e269bf6b66..8835e8dfcac 100644 --- a/gcc/java/xref.c +++ b/gcc/java/xref.c @@ -66,6 +66,13 @@ xref_get_data (flag) return xref_table [flag-1].data; } +void +xref_set_current_fp (fp) + FILE *fp; +{ + xref_table [flag_emit_xref-1].fp = fp; +} + /* Branch to the right xref "back-end". */ void diff --git a/gcc/java/xref.h b/gcc/java/xref.h index 042122b4ec7..7a98834c2db 100644 --- a/gcc/java/xref.h +++ b/gcc/java/xref.h @@ -28,6 +28,7 @@ int xref_flag_value PROTO ((char *)); void expand_xref PROTO ((tree)); void xref_set_data PROTO ((int, void *)); void *xref_get_data PROTO ((int)); +void xref_set_current_fp PROTO ((FILE *)); /* flag_emit_xref range of possible values. */ |