diff options
| author | Anthony Green <green@cygnus.com> | 2000-04-22 17:09:39 +0000 |
|---|---|---|
| committer | Anthony Green <green@gcc.gnu.org> | 2000-04-22 17:09:39 +0000 |
| commit | 1143c0a03fac4518d8ab72b375269b88302dfc49 (patch) | |
| tree | 174f5778c3674a19984c0ecaef26fd9c1b42d71f /libjava/include | |
| parent | 3fb304e7e478d72e3e90492bfa57b6af9c2942df (diff) | |
| download | gcc-1143c0a03fac4518d8ab72b375269b88302dfc49.zip gcc-1143c0a03fac4518d8ab72b375269b88302dfc49.tar.gz gcc-1143c0a03fac4518d8ab72b375269b88302dfc49.tar.bz2 | |
+ 2000-04-22 Anthony Green <green@cygnus.com> + + * include/jvm.h (__builtin_expect): Define as unused for now.
+ 2000-04-22 Anthony Green <green@cygnus.com>
+
+ * include/jvm.h (__builtin_expect): Define as unused for now.
+ * java/lang/natObject.cc (_Jv_MonitorEnter): Add __builtin_expect.
+ (notify): Ditto.
+ (notifyAll): Ditto.
+ (wait): Ditto.
+ (_Jv_MonitorExit): Ditto.
+ * boehm.cc (_Jv_MarkObj): Ditto.
+ (_Jv_MarkObj): Ditto.
+ (_Jv_MarkArray): Ditto.
+ (_Jv_AllocBytes): Ditto.
+ * prims.cc (_Jv_AllocObject): Ditto.
+ (_Jv_NewObjectArray): Ditto.
+ (_Jv_NewPrimArray): Ditto.
+ (_Jv_Malloc): Ditto.
+ (_Jv_Realloc): Ditto.
+ (_Jv_MallocUnchecked): Ditto.
+ (_Jv_divI): Ditto.
+ (_Jv_remI): Ditto.
+ (_Jv_divJ): Ditto.
+ (_Jv_remJ): Ditto.
+
+ * include/Makefile.in: Rebuilt.
+ * include/Makefile.am (include_HEADERS): Add jvmpi.h.
+
From-SVN: r33339
Diffstat (limited to 'libjava/include')
| -rw-r--r-- | libjava/include/Makefile.am | 2 | ||||
| -rw-r--r-- | libjava/include/Makefile.in | 6 | ||||
| -rw-r--r-- | libjava/include/jvm.h | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/libjava/include/Makefile.am b/libjava/include/Makefile.am index 5a951de..8e3f18f 100644 --- a/libjava/include/Makefile.am +++ b/libjava/include/Makefile.am @@ -2,4 +2,4 @@ AUTOMAKE_OPTIONS = foreign no-installinfo -include_HEADERS = jni.h +include_HEADERS = jni.h jvmpi.h diff --git a/libjava/include/Makefile.in b/libjava/include/Makefile.in index 8deca2b..d348658 100644 --- a/libjava/include/Makefile.in +++ b/libjava/include/Makefile.in @@ -116,7 +116,7 @@ libgcj_basedir = @libgcj_basedir@ AUTOMAKE_OPTIONS = foreign no-installinfo -include_HEADERS = jni.h +include_HEADERS = jni.h jvmpi.h mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = @@ -127,7 +127,7 @@ DIST_COMMON = ./stamp-h.in Makefile.am Makefile.in config.h.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best all: all-redirect .SUFFIXES: @@ -224,7 +224,7 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$/$$file $(distdir)/$$file; \ + cp -pr $$d/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ diff --git a/libjava/include/jvm.h b/libjava/include/jvm.h index c9cae93..8660443 100644 --- a/libjava/include/jvm.h +++ b/libjava/include/jvm.h @@ -11,6 +11,9 @@ details. */ #ifndef __JAVA_JVM_H__ #define __JAVA_JVM_H__ +// FIXME: __builtin_expect doesn't work yet. +#define __builtin_expect(A,B) (A) + #include <gcj/javaprims.h> #include <java-assert.h> |