ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-06 05:04:20 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix incorrect EXPORT definition for Windows/x86_64 in boot-javahome.cpp

Browse Source 
We should define EXPORT to be __declspec(dllexport) on Windows
regardless of architecture, not just non-x86_64 arches.  This fixes
errors to to embedded JAVA_HOME files not being found in openjdk-src
builds, e.g. lib/currency.data.
This commit is contained in:
Joel Dice 2014-04-09 14:34:22 -06:00
parent f7614bf8a7
commit 8f4ed4dd4f
3 changed files with 9 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/boot-javahome.cpp
View File

@ -8,22 +8,13 @@
There is NO WARRANTY for this software. See license.txt for There is NO WARRANTY for this software. See license.txt for
details. */ details. */
#ifdef _MSC_VER #include "avian/common.h"
typedef unsigned char uint8_t;
#else
# include "stdint.h"
#endif
#ifdef BOOT_JAVAHOME #ifdef BOOT_JAVAHOME
#if (! defined __x86_64__) && ((defined __MINGW32__) || (defined _MSC_VER)) #if (! defined __x86_64__) && ((defined __MINGW32__) || (defined _MSC_VER))
# define EXPORT __declspec(dllexport)
# define SYMBOL(x) binary_javahome_jar_##x # define SYMBOL(x) binary_javahome_jar_##x
#else #else
# define EXPORT __attribute__ ((visibility("default"))) \
__attribute__ ((used))
# define SYMBOL(x) _binary_javahome_jar_##x # define SYMBOL(x) _binary_javahome_jar_##x
#endif #endif
@ -32,7 +23,7 @@ extern "C" {
extern const uint8_t SYMBOL(start)[]; extern const uint8_t SYMBOL(start)[];
extern const uint8_t SYMBOL(end)[]; extern const uint8_t SYMBOL(end)[];
EXPORT const uint8_t* AVIAN_EXPORT const uint8_t*
javahomeJar(unsigned* size) javahomeJar(unsigned* size)
{ {
*size = SYMBOL(end) - SYMBOL(start); *size = SYMBOL(end) - SYMBOL(start);

25
src/boot.cpp
View File

@ -8,29 +8,14 @@
There is NO WARRANTY for this software. See license.txt for There is NO WARRANTY for this software. See license.txt for
details. */ details. */
#include "stdlib.h" #include <stdlib.h>
#ifdef _MSC_VER #include "avian/common.h"
typedef unsigned char uint8_t;
#else // not _MSC_VER
# include "stdint.h"
// since we aren't linking against libstdc++, we must implement this // since we aren't linking against libstdc++, we must implement this
// ourselves: // ourselves:
extern "C" void __cxa_pure_virtual(void) { abort(); } extern "C" void __cxa_pure_virtual(void) { abort(); }
#endif // not _MSC_VER
#if (defined __MINGW32__) || (defined _MSC_VER)
# define EXPORT __declspec(dllexport)
#else
# define EXPORT __attribute__ ((visibility("default"))) \
__attribute__ ((used))
#endif
#ifdef BOOT_IMAGE #ifdef BOOT_IMAGE
#if (! defined __x86_64__) && ((defined __MINGW32__) || (defined _MSC_VER)) #if (! defined __x86_64__) && ((defined __MINGW32__) || (defined _MSC_VER))
@ -46,7 +31,7 @@ extern "C" {
extern const uint8_t BOOTIMAGE_SYMBOL(start)[]; extern const uint8_t BOOTIMAGE_SYMBOL(start)[];
extern const uint8_t BOOTIMAGE_SYMBOL(end)[]; extern const uint8_t BOOTIMAGE_SYMBOL(end)[];
EXPORT const uint8_t* AVIAN_EXPORT const uint8_t*
bootimageBin(unsigned* size) bootimageBin(unsigned* size)
{ {
*size = BOOTIMAGE_SYMBOL(end) - BOOTIMAGE_SYMBOL(start); *size = BOOTIMAGE_SYMBOL(end) - BOOTIMAGE_SYMBOL(start);
@ -56,7 +41,7 @@ extern "C" {
extern const uint8_t CODEIMAGE_SYMBOL(start)[]; extern const uint8_t CODEIMAGE_SYMBOL(start)[];
extern const uint8_t CODEIMAGE_SYMBOL(end)[]; extern const uint8_t CODEIMAGE_SYMBOL(end)[];
EXPORT const uint8_t* AVIAN_EXPORT const uint8_t*
codeimageBin(unsigned* size) codeimageBin(unsigned* size)
{ {
*size = CODEIMAGE_SYMBOL(end) - CODEIMAGE_SYMBOL(start); *size = CODEIMAGE_SYMBOL(end) - CODEIMAGE_SYMBOL(start);
@ -82,7 +67,7 @@ extern "C" {
extern const uint8_t SYMBOL(start)[]; extern const uint8_t SYMBOL(start)[];
extern const uint8_t SYMBOL(end)[]; extern const uint8_t SYMBOL(end)[];
EXPORT const uint8_t* AVIAN_EXPORT const uint8_t*
classpathJar(unsigned* size) classpathJar(unsigned* size)
{ {
*size = SYMBOL(end) - SYMBOL(start); *size = SYMBOL(end) - SYMBOL(start);

13
src/embedded-loader.cpp
View File

@ -13,24 +13,15 @@
#include <stdint.h> #include <stdint.h>
#include "avian/embed.h" #include "avian/embed.h"
#include "avian/common.h"
#include "jni.h" #include "jni.h"
#if (defined __MINGW32__) || (defined _MSC_VER)
# define EXPORT __declspec(dllexport)
# ifdef _MSC_VER
# define not !
# endif
#else
# define EXPORT __attribute__ ((visibility("default"))) \
__attribute__ ((used))
#endif
extern "C" { extern "C" {
// since we aren't linking against libstdc++, we must implement this // since we aren't linking against libstdc++, we must implement this
// ourselves: // ourselves:
void __cxa_pure_virtual(void) { abort(); } void __cxa_pure_virtual(void) { abort(); }
EXPORT const uint8_t* AVIAN_EXPORT const uint8_t*
bootJar(unsigned* size) bootJar(unsigned* size)
{ {
if(HRSRC hResInfo = FindResourceW(NULL, RESID_BOOT_JAR, reinterpret_cast<LPCWSTR>(RT_RCDATA))) if(HRSRC hResInfo = FindResourceW(NULL, RESID_BOOT_JAR, reinterpret_cast<LPCWSTR>(RT_RCDATA)))