Mercurial > hg > truffle
comparison src/share/vm/utilities/vmError.cpp @ 3960:f08d439fab8c
7089790: integrate bsd-port changes
Reviewed-by: kvn, twisti, jrose
Contributed-by: Kurt Miller <kurt@intricatesoftware.com>, Greg Lewis <glewis@eyesbeyond.com>, Jung-uk Kim <jkim@freebsd.org>, Christos Zoulas <christos@zoulas.com>, Landon Fuller <landonf@plausible.coop>, The FreeBSD Foundation <board@freebsdfoundation.org>, Michael Franz <mvfranz@gmail.com>, Roger Hoover <rhoover@apple.com>, Alexander Strange <astrange@apple.com>
author | never |
---|---|
date | Sun, 25 Sep 2011 16:03:29 -0700 |
parents | da091bb67459 |
children | 53074c2c4600 |
comparison
equal
deleted
inserted
replaced
3959:eda6988c0d81 | 3960:f08d439fab8c |
---|---|
43 const char *env_list[] = { | 43 const char *env_list[] = { |
44 // All platforms | 44 // All platforms |
45 "JAVA_HOME", "JRE_HOME", "JAVA_TOOL_OPTIONS", "_JAVA_OPTIONS", "CLASSPATH", | 45 "JAVA_HOME", "JRE_HOME", "JAVA_TOOL_OPTIONS", "_JAVA_OPTIONS", "CLASSPATH", |
46 "JAVA_COMPILER", "PATH", "USERNAME", | 46 "JAVA_COMPILER", "PATH", "USERNAME", |
47 | 47 |
48 // Env variables that are defined on Solaris/Linux | 48 // Env variables that are defined on Solaris/Linux/BSD |
49 "LD_LIBRARY_PATH", "LD_PRELOAD", "SHELL", "DISPLAY", | 49 "LD_LIBRARY_PATH", "LD_PRELOAD", "SHELL", "DISPLAY", |
50 "HOSTTYPE", "OSTYPE", "ARCH", "MACHTYPE", | 50 "HOSTTYPE", "OSTYPE", "ARCH", "MACHTYPE", |
51 | 51 |
52 // defined on Linux | 52 // defined on Linux |
53 "LD_ASSUME_KERNEL", "_JAVA_SR_SIGNUM", | 53 "LD_ASSUME_KERNEL", "_JAVA_SR_SIGNUM", |
54 | |
55 // defined on Darwin | |
56 "DYLD_LIBRARY_PATH", "DYLD_FALLBACK_LIBRARY_PATH", | |
57 "DYLD_FRAMEWORK_PATH", "DYLD_FALLBACK_FRAMEWORK_PATH", | |
58 "DYLD_INSERT_LIBRARIES", | |
54 | 59 |
55 // defined on Windows | 60 // defined on Windows |
56 "OS", "PROCESSOR_IDENTIFIER", "_ALT_JAVA_HOME_DIR", | 61 "OS", "PROCESSOR_IDENTIFIER", "_ALT_JAVA_HOME_DIR", |
57 | 62 |
58 (const char *)0 | 63 (const char *)0 |
956 | 961 |
957 char* cmd; | 962 char* cmd; |
958 const char* ptr = OnError; | 963 const char* ptr = OnError; |
959 while ((cmd = next_OnError_command(buffer, sizeof(buffer), &ptr)) != NULL){ | 964 while ((cmd = next_OnError_command(buffer, sizeof(buffer), &ptr)) != NULL){ |
960 out.print_raw ("# Executing "); | 965 out.print_raw ("# Executing "); |
961 #if defined(LINUX) | 966 #if defined(LINUX) || defined(_ALLBSD_SOURCE) |
962 out.print_raw ("/bin/sh -c "); | 967 out.print_raw ("/bin/sh -c "); |
963 #elif defined(SOLARIS) | 968 #elif defined(SOLARIS) |
964 out.print_raw ("/usr/bin/sh -c "); | 969 out.print_raw ("/usr/bin/sh -c "); |
965 #endif | 970 #endif |
966 out.print_raw ("\""); | 971 out.print_raw ("\""); |