From f22167fdbf6231b2a4348e2599c4128dabdd5ad7 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Tue, 27 Jan 2009 11:09:23 +0100 Subject: [PATCH] re PR libgcj/38872 (libgcj.so dropped _Jv_CreateJavaVM and _Jv_GetStringChars symbols) PR libgcj/38872 * gcj/javaprims.h (_Jv_CreateJavaVM): Change to extern "C" symbol. * libjgc_bc.c (_Jv_GetStringChars): Remove. From-SVN: r143698 --- libjava/ChangeLog | 6 ++++++ libjava/gcj/javaprims.h | 6 +++--- libjava/libgcj_bc.c | 3 +-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index ebef09f..d28dcc8 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2009-01-26 Jakub Jelinek + + PR libgcj/38872 + * gcj/javaprims.h (_Jv_CreateJavaVM): Change to extern "C" symbol. + * libjgc_bc.c (_Jv_GetStringChars): Remove. + 2009-01-12 Andrew Haley * sun/misc/natUnsafe.cc (spinlock contructor): Call sched_yield(). diff --git a/libjava/gcj/javaprims.h b/libjava/gcj/javaprims.h index 313ecc0..3a0c964 100644 --- a/libjava/gcj/javaprims.h +++ b/libjava/gcj/javaprims.h @@ -1,8 +1,8 @@ // javaprims.h - Main external header file for libgcj. -*- c++ -*- -/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 - Free Software Foundation +/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, + 2008, 2009 Free Software Foundation This file is part of libgcj. @@ -919,7 +919,7 @@ struct _Jv_VMInitArgs jboolean ignoreUnrecognized; }; -extern jint _Jv_CreateJavaVM (struct _Jv_VMInitArgs*); +extern "C" jint _Jv_CreateJavaVM (struct _Jv_VMInitArgs*); void _Jv_ThreadRun (java::lang::Thread* thread); diff --git a/libjava/libgcj_bc.c b/libjava/libgcj_bc.c index 7073d73..e8da443 100644 --- a/libjava/libgcj_bc.c +++ b/libjava/libgcj_bc.c @@ -1,6 +1,6 @@ /* libgcj_bc.c */ -/* Copyright (C) 2006 Free Software Foundation +/* Copyright (C) 2006, 2009 Free Software Foundation This file is part of libgcj. @@ -89,7 +89,6 @@ void _Jv_AttachCurrentThreadAsDaemon () {} void _Jv_CreateJavaVM () {} void _Jv_DetachCurrentThread () {} void _Jv_Free () {} -void _Jv_GetStringChars () {} void _Jv_GetStringUTFLength () {} void _Jv_GetStringUTFRegion () {} void _Jv_Malloc () {} -- 2.7.4