mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-03-19 05:20:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Makefile.in (gjavah.o): Depend on $(CONFIG_H) and system.h.

Browse Source 
* 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
This commit is contained in:
Kaveh R. Ghazi 1999-02-01 07:00:40 +00:00 committed by Kaveh Ghazi
parent 8a68e18301
commit 9caaf519d8
6 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gcc/java/ChangeLog
View File

@ -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.

2
gcc/java/Makefile.in
View File

@ -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) \

11
gcc/java/gjavah.c
View File

@ -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;

12
gcc/java/javaop.h
View File

@ -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);

3
gcc/java/jcf.h
View File

@ -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 */

3
gcc/java/lex.c
View File

@ -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