1.1 --- a/src/os/linux/vm/os_linux.cpp Thu Jan 27 16:11:27 2011 -0800
1.2 +++ b/src/os/linux/vm/os_linux.cpp Tue Feb 01 11:23:19 2011 -0500
1.3 @@ -2509,8 +2509,10 @@
1.4 return end;
1.5 }
1.6
1.7 -extern "C" void numa_warn(int number, char *where, ...) { }
1.8 -extern "C" void numa_error(char *where) { }
1.9 +// Something to do with the numa-aware allocator needs these symbols
1.10 +extern "C" JNIEXPORT void numa_warn(int number, char *where, ...) { }
1.11 +extern "C" JNIEXPORT void numa_error(char *where) { }
1.12 +extern "C" JNIEXPORT int fork1() { return fork(); }
1.13
1.14
1.15 // If we are running with libnuma version > 2, then we should
1.16 @@ -3483,7 +3485,7 @@
1.17 // Note that the VM will print warnings if it detects conflicting signal
1.18 // handlers, unless invoked with the option "-XX:+AllowUserSignalHandlers".
1.19 //
1.20 -extern "C" int
1.21 +extern "C" JNIEXPORT int
1.22 JVM_handle_linux_signal(int signo, siginfo_t* siginfo,
1.23 void* ucontext, int abort_if_unrecognized);
1.24
1.25 @@ -4678,44 +4680,6 @@
1.26 }
1.27 }
1.28
1.29 -extern "C" {
1.30 -
1.31 -/**
1.32 - * NOTE: the following code is to keep the green threads code
1.33 - * in the libjava.so happy. Once the green threads is removed,
1.34 - * these code will no longer be needed.
1.35 - */
1.36 -int
1.37 -jdk_waitpid(pid_t pid, int* status, int options) {
1.38 - return waitpid(pid, status, options);
1.39 -}
1.40 -
1.41 -int
1.42 -fork1() {
1.43 - return fork();
1.44 -}
1.45 -
1.46 -int
1.47 -jdk_sem_init(sem_t *sem, int pshared, unsigned int value) {
1.48 - return sem_init(sem, pshared, value);
1.49 -}
1.50 -
1.51 -int
1.52 -jdk_sem_post(sem_t *sem) {
1.53 - return sem_post(sem);
1.54 -}
1.55 -
1.56 -int
1.57 -jdk_sem_wait(sem_t *sem) {
1.58 - return sem_wait(sem);
1.59 -}
1.60 -
1.61 -int
1.62 -jdk_pthread_sigmask(int how , const sigset_t* newmask, sigset_t* oldmask) {
1.63 - return pthread_sigmask(how , newmask, oldmask);
1.64 -}
1.65 -
1.66 -}
1.67
1.68 // Refer to the comments in os_solaris.cpp park-unpark.
1.69 //
