diff options
author | Kaveh R. Ghazi <ghazi@caip.rutgers.edu> | 1999-02-01 07:00:40 +0000 |
---|---|---|
committer | Kaveh Ghazi <ghazi@gcc.gnu.org> | 1999-02-01 07:00:40 +0000 |
commit | 9caaf519d8e51366ccd4183184d2fa3f7ed73b84 (patch) | |
tree | 570b8b7b27d55e193909beb5ec53c37b7769cbd4 /gcc | |
parent | 8a68e183019a0a1a27c0a697d7a44bb13522eb99 (diff) | |
download | gcc-9caaf519d8e51366ccd4183184d2fa3f7ed73b84.zip gcc-9caaf519d8e51366ccd4183184d2fa3f7ed73b84.tar.gz gcc-9caaf519d8e51366ccd4183184d2fa3f7ed73b84.tar.bz2 |
Makefile.in (gjavah.o): Depend on $(CONFIG_H) and system.h.
* Makefile.in (gjavah.o): Depend on $(CONFIG_H) and system.h.
* gjavah.c: Include config.h and system.h.
* javaop.h (inline): Don't define, its handled by system.h.
(WORD_TO_FLOAT, WORDS_TO_LONG, WORDS_TO_DOUBLE): Change these
from `inline' to `static inline'.
* jcf.h (inline): Don't define, its handled by system.h.
* lex.c (inline): Likewise.
From-SVN: r24952
Diffstat (limited to 'gcc')
-rw-r--r-- | gcc/java/ChangeLog | 14 | ||||
-rw-r--r-- | gcc/java/Makefile.in | 2 | ||||
-rw-r--r-- | gcc/java/gjavah.c | 11 | ||||
-rw-r--r-- | gcc/java/javaop.h | 12 | ||||
-rw-r--r-- | gcc/java/jcf.h | 3 | ||||
-rw-r--r-- | gcc/java/lex.c | 3 |
6 files changed, 23 insertions, 22 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index e23abcc..f860d5f 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,17 @@ +Mon Feb 1 09:50:48 1999 Kaveh R. Ghazi <ghazi@caip.rutgers.edu> + + * Makefile.in (gjavah.o): Depend on $(CONFIG_H) and system.h. + + * gjavah.c: Include config.h and system.h. + + * javaop.h (inline): Don't define, its handled by system.h. + (WORD_TO_FLOAT, WORDS_TO_LONG, WORDS_TO_DOUBLE): Change these + from `inline' to `static inline'. + + * jcf.h (inline): Don't define, its handled by system.h. + + * lex.c (inline): Likewise. + Sun Jan 31 20:34:29 1999 Zack Weinberg <zack@rabi.columbia.edu> * lang-specs.h: Map -Qn to -fno-ident. diff --git a/gcc/java/Makefile.in b/gcc/java/Makefile.in index adf3ce7..e76f1f2 100644 --- a/gcc/java/Makefile.in +++ b/gcc/java/Makefile.in @@ -275,7 +275,7 @@ force: parse.o: $(PARSE_C) jcf-reader.c $(CONFIG_H) $(srcdir)/../system.h jcf-dump.o: jcf-reader.c jcf.h javaop.h javaop.def -gjavah.o: jcf-reader.c jcf.h javaop.h +gjavah.o: $(CONFIG_H) $(srcdir)/../system.h jcf-reader.c jcf.h javaop.h buffer.o : buffer.c $(CONFIG_H) buffer.h $(srcdir)/../gansidecl.h \ $(srcdir)/../system.h $(srcdir)/../toplev.h class.o : class.c $(CONFIG_H) $(JAVA_TREE_H) $(RTL_H) jcf.h $(PARSE_H) \ diff --git a/gcc/java/gjavah.c b/gcc/java/gjavah.c index 34f11a6..df47777 100644 --- a/gcc/java/gjavah.c +++ b/gcc/java/gjavah.c @@ -24,16 +24,11 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ /* Written by Per Bothner <bothner@cygnus.com>, February 1996. */ -#include <stdio.h> +#include "config.h" +#include "system.h" #include "jcf.h" -#ifdef __STDC__ -#include <stdlib.h> -#endif -#include <math.h> - -#include <string.h> - #include "java-opcodes.h" +#include <math.h> /* The output file. */ FILE *out = NULL; diff --git a/gcc/java/javaop.h b/gcc/java/javaop.h index b00fd0a..cce0a61 100644 --- a/gcc/java/javaop.h +++ b/gcc/java/javaop.h @@ -1,6 +1,6 @@ /* Utility macros to handle Java(TM) byte codes. - Copyright (C) 1996 Free Software Foundation, Inc. + Copyright (C) 1996, 1998, 1999 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -82,10 +82,6 @@ union Word { #define jword uint32 #endif -#if !defined(inline) && !defined(__GC__) && !defined(__cplusplus) -#define inline static -#endif - #ifndef IMMEDIATE_u1 #define IMMEDIATE_u1 (PC++, CHECK_PC_IN_RANGE(PC), BCODE[PC-1]) #endif @@ -106,14 +102,14 @@ union Word { | (BCODE[PC-2] << 8) | (BCODE[PC-1])))) #endif -inline jfloat +static inline jfloat WORD_TO_FLOAT(jword w) { union Word wu; wu.i = w; return wu.f; } -inline jlong +static inline jlong WORDS_TO_LONG(jword hi, jword lo) { return ((jlong) hi << 32) | ((jlong)lo & (((jlong)1 << 32) -1)); @@ -125,7 +121,7 @@ union DWord { jword w[2]; }; -inline jdouble +static inline jdouble WORDS_TO_DOUBLE(jword hi, jword lo) { union DWord wu; wu.l = WORDS_TO_LONG(hi, lo); diff --git a/gcc/java/jcf.h b/gcc/java/jcf.h index 8f748b3..32f2759 100644 --- a/gcc/java/jcf.h +++ b/gcc/java/jcf.h @@ -1,6 +1,6 @@ /* Utility macros to read Java(TM) .class files and byte codes. - Copyright (C) 1996, 1998 Free Software Foundation, Inc. + Copyright (C) 1996, 97-98, 1999 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -35,7 +35,6 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ #define PTR char * #define AND ; #define DEFUN(name, arglist, args) name arglist args; -#define inline static #endif #endif /* !DEFUN */ diff --git a/gcc/java/lex.c b/gcc/java/lex.c index ff7be98..9984ab9 100644 --- a/gcc/java/lex.c +++ b/gcc/java/lex.c @@ -42,9 +42,6 @@ Addison Wesley 1996" (http://java.sun.com/docs/books/jls/html/3.doc.html) */ #include <ctype.h> #endif -#ifdef inline /* javaop.h redefines inline as static */ -#undef inline -#endif #include "keyword.h" #ifndef SEEK_SET |