Changeset 309 for trunk/openjdk/hotspot/agent/src/os

Timestamp:

Feb 13, 2012, 10:07:12 PM (14 years ago)

Author:

dmik

Message:

trunk: Merged in openjdk6 b24 from branches/vendor/oracle.

Location:

trunk/openjdk

Files:

• . (modified) (1 prop)
• hotspot/agent/src/os/linux/libproc_impl.c (modified) (1 diff)
• hotspot/agent/src/os/linux/ps_core.c (modified) (1 diff)
• hotspot/agent/src/os/linux/ps_proc.c (modified) (2 diffs)
• hotspot/agent/src/os/linux/symtab.c (modified) (1 diff)
• hotspot/agent/src/os/linux/symtab.h (modified) (1 diff)

trunk/openjdk/hotspot/agent/src/os/linux/libproc_impl.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *

trunk/openjdk/hotspot/agent/src/os/linux/ps_core.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *

trunk/openjdk/hotspot/agent/src/os/linux/ps_proc.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -122 +122 @@
 #endif
 
-#ifdef _LP64
-#ifdef PTRACE_GETREGS64
+#if defined(_LP64) && defined(PTRACE_GETREGS64)
 #define PTRACE_GETREGS_REQ PTRACE_GETREGS64
-#endif
-#else
-#if defined(PTRACE_GETREGS) || defined(PT_GETREGS)
+#elif defined(PTRACE_GETREGS)
 #define PTRACE_GETREGS_REQ PTRACE_GETREGS
-#endif
-#endif /* _LP64 */
+#elif defined(PT_GETREGS)
+#define PTRACE_GETREGS_REQ PT_GETREGS
+#endif
 
 #ifdef PTRACE_GETREGS_REQ

trunk/openjdk/hotspot/agent/src/os/linux/symtab.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *

trunk/openjdk/hotspot/agent/src/os/linux/symtab.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *