From bedc8d0abccbed8a58e47241efef331e11201cce Mon Sep 17 00:00:00 2001 From: Jung-uk Kim Date: Thu, 27 Sep 2012 00:18:41 +0000 Subject: [PATCH] Tidy up patches. No functional change. --- java/openjdk6/files/alsa-enable.patch | 4 ++-- java/openjdk6/files/patch-set | 25 +++++++++++++++++++------ java/openjdk6/files/patch-test | 9 --------- 3 files changed, 21 insertions(+), 17 deletions(-) diff --git a/java/openjdk6/files/alsa-enable.patch b/java/openjdk6/files/alsa-enable.patch index 686f029b88dc..3d455bd4c7e8 100644 --- a/java/openjdk6/files/alsa-enable.patch +++ b/java/openjdk6/files/alsa-enable.patch @@ -23,8 +23,8 @@ void getALSAVersion(char* buffer, int len) { if (!hasGottenALSAVersion) { +#ifdef __FreeBSD__ -+ // XXX We do not use ALSA drivers. Just copy the library version. -+ strcpy(ALSAVersionString, SND_LIB_VERSION_STR); ++ // XXX We do not use ALSA drivers. Just copy the library version. ++ strcpy(ALSAVersionString, SND_LIB_VERSION_STR); +#else // get alsa version from proc interface FILE* file; diff --git a/java/openjdk6/files/patch-set b/java/openjdk6/files/patch-set index 29b77e0fe555..58f1c4cf38cf 100644 --- a/java/openjdk6/files/patch-set +++ b/java/openjdk6/files/patch-set @@ -5837,23 +5837,36 @@ } inline struct dirent* os::readdir(DIR* dirp, dirent *dbuf) ---- hotspot/src/os/bsd/vm/vmError_bsd.cpp 2012-05-01 17:15:07.000000000 -0400 -+++ hotspot/src/os/bsd/vm/vmError_bsd.cpp 2012-09-26 17:05:10.000000000 -0400 -@@ -44,7 +44,7 @@ +--- hotspot/src/os/bsd/vm/vmError_bsd.cpp 2012-09-26 19:40:10.000000000 -0400 ++++ hotspot/src/os/bsd/vm/vmError_bsd.cpp 2012-09-26 19:43:30.000000000 -0400 +@@ -34,6 +34,12 @@ + #include + #include + ++#ifdef __FreeBSD__ ++#define GDB_LAUNCHER "gdb /proc/%d/file %d" ++#else ++#define GDB_LAUNCHER "gdb /proc/%d/exe %d" ++#endif ++ + void VMError::show_message_box(char *buf, int buflen) { + bool yes; + do { +@@ -44,7 +50,7 @@ jio_snprintf(p, buflen - len, "\n\n" "Do you want to debug the problem?\n\n" - "To debug, run 'gdb /proc/%d/exe %d'; then switch to thread " INTX_FORMAT " (" INTPTR_FORMAT ")\n" -+ "To debug, run 'gdb /proc/%d/file %d'; then switch to thread " INTX_FORMAT " (" INTPTR_FORMAT ")\n" ++ "To debug, run '" GDB_LAUNCHER "'; then switch to thread " INTX_FORMAT " (" INTPTR_FORMAT ")\n" "Enter 'yes' to launch gdb automatically (PATH must include gdb)\n" "Otherwise, press RETURN to abort...", os::current_process_id(), os::current_process_id(), -@@ -54,7 +54,7 @@ +@@ -54,7 +60,7 @@ if (yes) { // yes, user asked VM to launch debugger - jio_snprintf(buf, buflen, "gdb /proc/%d/exe %d", -+ jio_snprintf(buf, buflen, "gdb /proc/%d/file %d", ++ jio_snprintf(buf, buflen, GDB_LAUNCHER, os::current_process_id(), os::current_process_id()); os::fork_and_exec(buf); diff --git a/java/openjdk6/files/patch-test b/java/openjdk6/files/patch-test index 6a803ba8d970..0824417df8ec 100644 --- a/java/openjdk6/files/patch-test +++ b/java/openjdk6/files/patch-test @@ -130,15 +130,6 @@ sc.socket().shutdownInput(); --- jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Launcher.c 2012-05-01 17:18:45.000000000 -0400 +++ jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Launcher.c 2012-09-26 19:07:59.000000000 -0400 -@@ -123,7 +123,7 @@ - - /* - * We need to close all file descriptors except for serviceFd. To -- * get the list of open file descriptos we read through /proc/self/fd -+ * get the list of open file descriptos we read through /dev/fd - * but to open this requires a file descriptor. We could use a specific - * file descriptor and fdopendir but Linux doesn't seem to support - * fdopendir. Instead we use opendir and make an assumption on the @@ -135,7 +135,7 @@ } close(thisFd);