Class.h (next): Updated documentation.
* java/lang/Class.h (next): Updated documentation. Renamed to 'next_or_version'. * java/lang/natClassLoader.cc (_Jv_RegisterClasses): Use _Jv_CheckABIVersion. (_Jv_RegisterClasses_Counted): Likewise. (_Jv_RegisterClassHookDefault): Fix starting condition of duplicate-checking loop. * include/jvm.h (GCJ_VERSION): New define. (GCJ_BINARYCOMPAT_ADDITION): Likewise. (_Jv_CheckABIVersion): New function. From-SVN: r94173
This commit is contained in:
parent
635b0f2a72
commit
8bf0438795
4 changed files with 43 additions and 15 deletions
|
@ -566,4 +566,19 @@ extern void (*_Jv_JVMPI_Notify_THREAD_END) (JVMPI_Event *event);
|
|||
|
||||
extern void _Jv_RegisterBootstrapPackages ();
|
||||
|
||||
|
||||
// This is used to find ABI versions we recognize.
|
||||
#define GCJ_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 10)
|
||||
#define GCJ_BINARYCOMPAT_ADDITION 5
|
||||
|
||||
inline bool
|
||||
_Jv_CheckABIVersion (unsigned long value)
|
||||
{
|
||||
// For this release, recognize just our defined C++ ABI and our
|
||||
// defined BC ABI. (In the future we may recognize past BC ABIs as
|
||||
// well.)
|
||||
return (value == GCJ_VERSION
|
||||
|| value == (GCJ_VERSION + GCJ_BINARYCOMPAT_ADDITION));
|
||||
}
|
||||
|
||||
#endif /* __JAVA_JVM_H__ */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue