Author: jim
Date: 2005-03-13 23:08:56 -0700 (Sun, 13 Mar 2005)
New Revision: 870
Added:
trunk/jdk/
trunk/jdk/jdk-1.5.0-gcc_3.4.2+-2.patch
Removed:
trunk/cracklib/Linux-PAM-0.78-new_cracklib-1.patch
Log:
Added: jdk-1.5.0-gcc_3.4.2+-2.patch
Deleted: trunk/cracklib/Linux-PAM-0.78-new_cracklib-1.patch
===================================================================
--- trunk/cracklib/Linux-PAM-0.78-new_cracklib-1.patch 2005-03-14 06:04:57 UTC
(rev 869)
+++ trunk/cracklib/Linux-PAM-0.78-new_cracklib-1.patch 2005-03-14 06:08:56 UTC
(rev 870)
@@ -1,29 +0,0 @@
-Submitted By: Jim Gifford (patches at jg555 dot com)
-Date: 2005-02-17
-Initial Package Version: 2.8pre2
-Origin: Jim Gifford
-Upstream Status: Sent
-Description: Fixes Configure issue with new Cracklib
-
---- Linux-PAM-0.78/configure.orig 2005-02-17 21:26:04.607712448 +0000
-+++ Linux-PAM-0.78/configure 2005-02-17 21:26:34.092230120 +0000
-@@ -5996,7 +5996,7 @@
- echo "$as_me:$LINENO: checking path to cracklib dictionary" >&5
- echo $ECHO_N "checking path to cracklib dictionary... $ECHO_C" >&6
- DICT_DIR_CANDIDATES="/usr/lib /usr/share/dict /usr/share/lib \
-- /usr/local/lib /usr/local/share/lib"
-+ /usr/local/lib /usr/local/share/lib /usr/share/cracklib"
- DICT_FILE_CANDIDATES="pw_dict cracklib_dict"
- CRACKLIB_DICTPATH=""
- for d in $DICT_DIR_CANDIDATES ; do
---- Linux-PAM-0.78/configure.in.orig 2005-02-17 21:26:11.271699368 +0000
-+++ Linux-PAM-0.78/configure.in 2005-02-17 21:26:47.592177816 +0000
-@@ -263,7 +263,7 @@
- dnl Look for cracklib dictionary
- AC_MSG_CHECKING(path to cracklib dictionary)
- DICT_DIR_CANDIDATES="/usr/lib /usr/share/dict /usr/share/lib \
-- /usr/local/lib /usr/local/share/lib"
-+ /usr/local/lib /usr/local/share/lib /usr/share/cracklib"
- DICT_FILE_CANDIDATES="pw_dict cracklib_dict"
- CRACKLIB_DICTPATH=""
- for d in $DICT_DIR_CANDIDATES ; do
Added: trunk/jdk/jdk-1.5.0-gcc_3.4.2+-2.patch
===================================================================
--- trunk/jdk/jdk-1.5.0-gcc_3.4.2+-2.patch 2005-03-14 06:04:57 UTC (rev
869)
+++ trunk/jdk/jdk-1.5.0-gcc_3.4.2+-2.patch 2005-03-14 06:08:56 UTC (rev
870)
@@ -0,0 +1,223 @@
+Submitted By: DJ Lucas (dj AT linuxfromscratch DOT org)
+Date: 2005-03-11
+Initial Package Version: 1.5.0
+Origin: DJ Lucas (preprocessor macro fixes), Hamish Greig (assembler code
+ fixes) and portions of the previous j2sdk-1.4.2 gcc33 and asm patches
+Upstream Status: Not submitted
+Description: Fixes syntax for use with gcc-3.4.2. Note: this will not work for
+ gcc-3.4.0 or gcc-3.4.1.
+
+diff -Naur jdk-build-orig/hotspot/src/cpu/i486/vm/i486.ad
jdk-build/hotspot/src/cpu/i486/vm/i486.ad
+--- jdk-build-orig/hotspot/src/cpu/i486/vm/i486.ad 2004-10-19
13:41:32.000000000 -0500
++++ jdk-build/hotspot/src/cpu/i486/vm/i486.ad 2004-11-23 21:04:35.733661056
-0600
+@@ -246,10 +246,10 @@
+ static jlong fp_signmask_pool[(4+1)*2]; // 4*128bits(data) +
128bits(alignment)
+
+ // Static initialization during VM startup.
+-static jlong *float_signmask_pool = double_quadword(&fp_signmask_pool[1*2],
0x7FFFFFFF7FFFFFFF, 0x7FFFFFFF7FFFFFFF);
+-static jlong *double_signmask_pool = double_quadword(&fp_signmask_pool[2*2],
0x7FFFFFFFFFFFFFFF, 0x7FFFFFFFFFFFFFFF);
+-static jlong *float_signflip_pool = double_quadword(&fp_signmask_pool[3*2],
0x8000000080000000, 0x8000000080000000);
+-static jlong *double_signflip_pool = double_quadword(&fp_signmask_pool[4*2],
0x8000000000000000, 0x8000000000000000);
++static jlong *float_signmask_pool = double_quadword(&fp_signmask_pool[1*2],
0x7FFFFFFF7FFFFFFFULL, 0x7FFFFFFF7FFFFFFFULL);
++static jlong *double_signmask_pool = double_quadword(&fp_signmask_pool[2*2],
0x7FFFFFFFFFFFFFFFULL, 0x7FFFFFFFFFFFFFFFULL);
++static jlong *float_signflip_pool = double_quadword(&fp_signmask_pool[3*2],
0x8000000080000000ULL, 0x8000000080000000ULL);
++static jlong *double_signflip_pool = double_quadword(&fp_signmask_pool[4*2],
0x8000000000000000ULL, 0x8000000000000000ULL);
+
+ // !!!!! Special hack to get all type of calls to specify the byte offset
+ // from the start of the call to the point where the return address
+diff -Naur
jdk-build-orig/hotspot/src/os_cpu/linux_i486/vm/atomic_linux_i486.inline.hpp
jdk-build/hotspot/src/os_cpu/linux_i486/vm/atomic_linux_i486.inline.hpp
+---
jdk-build-orig/hotspot/src/os_cpu/linux_i486/vm/atomic_linux_i486.inline.hpp
2004-10-19 13:41:46.000000000 -0500
++++ jdk-build/hotspot/src/os_cpu/linux_i486/vm/atomic_linux_i486.inline.hpp
2004-11-23 21:16:41.012401928 -0600
+@@ -111,7 +111,7 @@
+ "cmpxchg8b (%5); xchgl %%ebx, %1"
+ : "=A" (old_value), "=r" (lo)
+ : "1" (lo), "c" (hi), "A" (compare_value), "r" (dest),
"m" (mp)
+- : "%ebx", "cc", "memory");
++ : "cc", "memory");
+ return old_value;
+ }
+
+diff -Naur jdk-build-orig/hotspot/src/share/vm/prims/jvmtiEventController.cpp
jdk-build/hotspot/src/share/vm/prims/jvmtiEventController.cpp
+--- jdk-build-orig/hotspot/src/share/vm/prims/jvmtiEventController.cpp
2004-10-19 13:42:32.000000000 -0500
++++ jdk-build/hotspot/src/share/vm/prims/jvmtiEventController.cpp
2004-11-23 21:04:35.751658320 -0600
+@@ -10,7 +10,7 @@
+ # include "incls/_jvmtiEventController.cpp.incl"
+
+ #ifdef JVMTI_TRACE
+-#define EC_TRACE(out) if (JvmtiTrace::trace_event_controller()) {
SafeResourceMark rm; tty->print_cr##out; } while (0)
++#define EC_TRACE(out) if (JvmtiTrace::trace_event_controller()) {
SafeResourceMark rm; tty->print_cr out; } while (0)
+ #else
+ #define EC_TRACE(out)
+ #endif /*JVMTI_TRACE */
+diff -Naur jdk-build-orig/hotspot/src/share/vm/prims/jvmtiExport.cpp
jdk-build/hotspot/src/share/vm/prims/jvmtiExport.cpp
+--- jdk-build-orig/hotspot/src/share/vm/prims/jvmtiExport.cpp 2004-10-19
13:42:32.000000000 -0500
++++ jdk-build/hotspot/src/share/vm/prims/jvmtiExport.cpp 2004-11-23
21:04:35.754657864 -0600
+@@ -13,8 +13,8 @@
+ extern struct JVMDI_Interface_1_ jvmdiTrace_Interface; // temporary
+
+ #ifdef JVMTI_TRACE
+-#define EVT_TRACE(evt,out) if ((JvmtiTrace::event_trace_flags(evt) &
JvmtiTrace::SHOW_EVENT_SENT) != 0) { SafeResourceMark rm; tty->print_cr##out; }
+-#define EVT_TRIG_TRACE(evt,out) if ((JvmtiTrace::event_trace_flags(evt) &
JvmtiTrace::SHOW_EVENT_TRIGGER) != 0) { SafeResourceMark rm;
tty->print_cr##out; }
++#define EVT_TRACE(evt,out) if ((JvmtiTrace::event_trace_flags(evt) &
JvmtiTrace::SHOW_EVENT_SENT) != 0) { SafeResourceMark rm; tty->print_cr out; }
++#define EVT_TRIG_TRACE(evt,out) if ((JvmtiTrace::event_trace_flags(evt) &
JvmtiTrace::SHOW_EVENT_TRIGGER) != 0) { SafeResourceMark rm; tty->print_cr out;
}
+ #else
+ #define EVT_TRIG_TRACE(evt,out)
+ #define EVT_TRACE(evt,out)
+diff -Naur jdk-build-orig/hotspot/src/share/vm/runtime/classFileParser.cpp
jdk-build/hotspot/src/share/vm/runtime/classFileParser.cpp
+--- jdk-build-orig/hotspot/src/share/vm/runtime/classFileParser.cpp
2004-10-19 13:42:34.000000000 -0500
++++ jdk-build/hotspot/src/share/vm/runtime/classFileParser.cpp 2004-11-23
21:04:35.759657104 -0600
+@@ -16,6 +16,9 @@
+
+ // We add assert in debug mode when class format is not checked.
+
++#undef inline
++#undef __inline
++
+ #ifdef ASSERT
+ void inline assert_property(bool b, const char* msg, TRAPS) {
+ if (!b) { fatal(msg); }
+diff -Naur jdk-build-orig/hotspot/src/share/vm/runtime/globals_extension.hpp
jdk-build/hotspot/src/share/vm/runtime/globals_extension.hpp
+--- jdk-build-orig/hotspot/src/share/vm/runtime/globals_extension.hpp
2004-10-19 13:42:35.000000000 -0500
++++ jdk-build/hotspot/src/share/vm/runtime/globals_extension.hpp
2004-11-23 21:04:35.759657104 -0600
+@@ -110,7 +110,9 @@
+
+ #define FLAG_SET_DEFAULT(name, value) ((name) = (value))
+
+-#define FLAG_SET(type, name, value)
(CommandLineFlagsEx::##type##AtPut(FLAG_MEMBER_WITH_TYPE(name,type),
(type)(value)))
++//#define FLAG_SET(type, name, value)
(CommandLineFlagsEx::##type##AtPut(FLAG_MEMBER_WITH_TYPE(name,type),
(type)(value)))
++
++#define FLAG_SET(type, name, value)
(CommandLineFlagsEx::type##AtPut(FLAG_MEMBER_WITH_TYPE(name,type),
(type)(value)))
+
+ // Can't put the following in CommandLineFlags because
+ // of a circular dependency on the enum definition.
+diff -Naur jdk-build-orig/hotspot/src/share/vm/runtime/thread.hpp
jdk-build/hotspot/src/share/vm/runtime/thread.hpp
+--- jdk-build-orig/hotspot/src/share/vm/runtime/thread.hpp 2004-10-19
13:42:40.000000000 -0500
++++ jdk-build/hotspot/src/share/vm/runtime/thread.hpp 2004-11-23
21:04:35.762656648 -0600
+@@ -459,9 +459,53 @@
+ static ByteSize stack_base_offset() { return
byte_offset_of(Thread, _stack_base ); }
+ static ByteSize stack_size_offset() { return
byte_offset_of(Thread, _stack_size ); }
+
+-#define TLAB_FIELD_OFFSET(name) \
+- static ByteSize tlab_##name##_offset() { return
byte_offset_of(Thread, _tlab) + ThreadLocalAllocBuffer::##name##_offset(); }
++// Expanded macro...see below that I couldn't fix in definition.
++
++static ByteSize tlab_start_offset()
++{
++return byte_offset_of(Thread, _tlab) + ThreadLocalAllocBuffer::start_offset();
++}
++
++static ByteSize tlab_end_offset()
++{
++return byte_offset_of(Thread, _tlab) + ThreadLocalAllocBuffer::end_offset();
++}
+
++static ByteSize tlab_top_offset()
++{
++return byte_offset_of(Thread, _tlab) + ThreadLocalAllocBuffer::top_offset();
++}
++
++static ByteSize tlab_size_offset()
++{
++return byte_offset_of(Thread, _tlab) + ThreadLocalAllocBuffer::size_offset();
++}
++
++static ByteSize tlab_refill_waste_limit_offset()
++{
++return byte_offset_of(Thread, _tlab) +
ThreadLocalAllocBuffer::refill_waste_limit_offset();
++}
++
++static ByteSize tlab_number_of_refills_offset()
++{
++return byte_offset_of(Thread, _tlab) +
ThreadLocalAllocBuffer::number_of_refills_offset();
++}
++
++static ByteSize tlab_fast_refill_waste_offset()
++{
++return byte_offset_of(Thread, _tlab) +
ThreadLocalAllocBuffer::fast_refill_waste_offset();
++}
++
++static ByteSize tlab_slow_allocations_offset()
++{
++return byte_offset_of(Thread, _tlab) +
ThreadLocalAllocBuffer::slow_allocations_offset();
++}
++
++/* Origingal unmodified macro that I couldn't figure
++ out how to fix like I should have...any takers? ;-)
++ #define TLAB_FIELD_OFFSET(name) \
++ static ByteSize tlab_##name##_offset() { return
byte_offset_of(Thread, _tlab) + ThreadLocalAllocBuffer::##name##_offset(); }
++
+ TLAB_FIELD_OFFSET(start)
+ TLAB_FIELD_OFFSET(end)
+ TLAB_FIELD_OFFSET(top)
+@@ -470,8 +514,9 @@
+ TLAB_FIELD_OFFSET(number_of_refills)
+ TLAB_FIELD_OFFSET(fast_refill_waste)
+ TLAB_FIELD_OFFSET(slow_allocations)
+-
++
+ #undef TLAB_FIELD_OFFSET
++*/
+
+ };
+
+diff -Naur jdk-build-orig/share/plugin/mozilla_headers_ns610/nscore.h
jdk-build/share/plugin/mozilla_headers_ns610/nscore.h
+--- jdk-build-orig/share/plugin/mozilla_headers_ns610/nscore.h 2001-05-21
11:34:20.000000000 -0500
++++ jdk-build/share/plugin/mozilla_headers_ns610/nscore.h 2004-11-23
21:04:35.000000000 -0600
+@@ -192,6 +192,10 @@
+ #define HAVE_CPP_2BYTE_WCHAR_T
+ #endif
+
++#if defined(__GNUC__)
++ #define HAVE_CPP_MODERN_SPECIALIZE_TEMPLATE_SYNTAX
++#endif
++
+ /* until we get an autoconf test for this, we'll assume it's on (since
we're using it already) */
+ #define HAVE_CPP_TYPENAME
+
+diff -Naur jdk-build-orig/share/plugin/mozilla_headers_ns7/nscore.h
jdk-build/share/plugin/mozilla_headers_ns7/nscore.h
+--- jdk-build-orig/share/plugin/mozilla_headers_ns7/nscore.h 2002-09-07
12:12:44.000000000 -0500
++++ jdk-build/share/plugin/mozilla_headers_ns7/nscore.h 2004-11-23
21:04:35.000000000 -0600
+@@ -202,6 +202,10 @@
+ #define HAVE_CPP_2BYTE_WCHAR_T
+ #endif
+
++#if defined(__GNUC__)
++ #define HAVE_CPP_MODERN_SPECIALIZE_TEMPLATE_SYNTAX
++#endif
++
+ /* until we get an autoconf test for this, we'll assume it's on (since
we're using it already) */
+ #define HAVE_CPP_TYPENAME
+
+--- jdk-build-orig/hotspot/src/share/vm/memory/dump.cpp 2004-10-19
13:42:14.000000000 -0500
++++ jdk-build/hotspot/src/share/vm/memory/dump.cpp 2004-11-23
23:01:48.764150856 -0600
+@@ -1035,7 +1035,7 @@
+ // Support for a simple checksum of the contents of the class list
+ // file to prevent trivial tampering. The algorithm matches that in
+ // the MakeClassList program used by the J2SE build process.
+-#define JSUM_SEED ((jlong)0xcafebabebabecafe)
++#define JSUM_SEED ((jlong)0xcafebabebabecafeULL)
+ static jlong
+ jsum(jlong start, const char *buf, const int len)
+ {
+--- jdk-build-orig/j2se/src/solaris/bin/java_md.c 2004-10-19
14:01:43.000000000 -0500
++++ jdk-build/j2se/src/solaris/bin/java_md.c 2004-11-25 22:53:11.781016448
-0600
+@@ -1136,7 +1136,7 @@
+ : /* Inputs */
+ "m" (arg)
+ : /* Clobbers */
+- "%eax", "%ebx", "%ecx", "%edx"
++ "%eax", "%ecx", "%edx"
+ );
+ *eaxp = value_of_eax;
+ *ebxp = value_of_ebx;
+--- jdk-orig/j2se/src/share/native/sun/font/bidi/uchardir.c 2004-10-19
14:00:29.000000000 -0500
++++ jdk/j2se/src/share/native/sun/font/bidi/uchardir.c 2005-03-10
20:20:50.000000000 -0600
+@@ -34,6 +34,8 @@
+
+ #include "uchardir.h"
+
++static UCharDirection u_getDirectionInternal(uint32_t);
++
+ /* new 4.0 surrogate data */
+ static uint32_t ASCII_START = 0x0;
+ static uint32_t ASCII_LIMIT = 0x80;
--
http://linuxfromscratch.org/mailman/listinfo/patches
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
