cvs commit: patches/j2sdk j2sdk-1.4.2-gcc33-1.patch j2sdk-1.4.2-optimize-1.patch j2sdk-1.4.2-remove-fixed-paths-1.patch j2sdk-1.4.2-use-included-motif-1.patch

jim at linuxfromscratch.org jim at linuxfromscratch.org
Tue Oct 14 10:03:32 PDT 2003


jim         03/10/14 11:03:32

  Added:       j2sdk    j2sdk-1.4.2-gcc33-1.patch
                        j2sdk-1.4.2-optimize-1.patch
                        j2sdk-1.4.2-remove-fixed-paths-1.patch
                        j2sdk-1.4.2-use-included-motif-1.patch
  Log:
  Added: Java 1.4.2 patches
  
  Revision  Changes    Path
  1.1                  patches/j2sdk/j2sdk-1.4.2-gcc33-1.patch
  
  Index: j2sdk-1.4.2-gcc33-1.patch
  ===================================================================
  Submitted By: Jim Gifford (jim at linuxfromscratch dot org)
  Date: 2003-10-07
  Initial Package Version: 1.4.2
  Origin: Jim Gifford
  Description: Fixes Long Long errors
  	     Removes ## from variables
  
   
  diff -Naur java.orig/hotspot/src/cpu/i486/vm/i486.ad java/hotspot/src/cpu/i486/vm/i486.ad
  --- java.orig/hotspot/src/cpu/i486/vm/i486.ad	2003-09-11 01:40:13.000000000 +0000
  +++ java/hotspot/src/cpu/i486/vm/i486.ad	2003-10-08 02:51:46.000000000 +0000
  @@ -230,18 +230,18 @@
   // These masks are used to provide 128-bit aligned bitmasks to the XMM
   // instructions, to allow sign-masking or sign-bit flipping.  They allow
   // fast versions of NegF/NegD and AbsF/AbsD.
  -static jlong float_signmask_pool[3] =  {0x7FFFFFFF7FFFFFFF,
  -                                        0x7FFFFFFF7FFFFFFF,
  -                                        0x7FFFFFFF7FFFFFFF};
  -static jlong double_signmask_pool[3] = {0x7FFFFFFFFFFFFFFF,
  -                                        0x7FFFFFFFFFFFFFFF,
  -                                        0x7FFFFFFFFFFFFFFF};
  -static jlong float_signflip_pool[3] =  {0x8000000080000000,
  -                                        0x8000000080000000,
  -                                        0x8000000080000000};
  -static jlong double_signflip_pool[3] = {0x8000000000000000,
  -                                        0x8000000000000000,
  -                                        0x8000000000000000};
  +static jlong float_signmask_pool[3] =  {0x7FFFFFFF7FFFFFFFLL,
  +                                        0x7FFFFFFF7FFFFFFFLL,
  +                                        0x7FFFFFFF7FFFFFFFLL};
  +static jlong double_signmask_pool[3] = {0x7FFFFFFFFFFFFFFFLL,
  +                                        0x7FFFFFFFFFFFFFFFLL,
  +                                        0x7FFFFFFFFFFFFFFFLL};
  +static jlong float_signflip_pool[3] =  {0x8000000080000000LL,
  +                                        0x8000000080000000LL,
  +                                        0x8000000080000000LL};
  +static jlong double_signflip_pool[3] = {0x8000000000000000LL,
  +                                        0x8000000000000000LL,
  +                                        0x8000000000000000LL};
   
   // !!!!! 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 java.orig/hotspot/src/share/vm/runtime/jvmdiInterfaceSupport.hpp java/hotspot/src/share/vm/runtime/jvmdiInterfaceSupport.hpp
  --- java.orig/hotspot/src/share/vm/runtime/jvmdiInterfaceSupport.hpp	2003-09-11 01:41:55.000000000 +0000
  +++ java/hotspot/src/share/vm/runtime/jvmdiInterfaceSupport.hpp	2003-10-08 02:51:01.000000000 +0000
  @@ -24,7 +24,7 @@
     result_type JNICALL methodName signature {                                         \
       JavaThread* thread = (JavaThread*) ThreadLocalStorage::thread();                 \
       TransitionClass __tiv(thread);                                                   \
  -    __ENTRY(result_type, methodName##signature, thread)                              \
  +    __ENTRY(result_type, methodName#signature, thread)                              \
       debug_only(VMNativeEntryWrapper __vew;)                                          \
       debug_only(const char* const _jvmdi_methodName_ = #methodName;)                  \
       debug_only(bool  _trace_ = trace; );                                             \
  diff -Naur java.orig/hotspot/src/share/vm/runtime/mutexLocker.cpp java/hotspot/src/share/vm/runtime/mutexLocker.cpp
  --- java.orig/hotspot/src/share/vm/runtime/mutexLocker.cpp	2003-09-11 01:41:55.000000000 +0000
  +++ java/hotspot/src/share/vm/runtime/mutexLocker.cpp	2003-10-08 02:51:01.000000000 +0000
  @@ -98,7 +98,7 @@
   #endif
   
   #define def(var, type, pri, vm_block) \
  -  var = new type(Mutex::##pri, #var, vm_block)
  +  var = new type(Mutex::pri, #var, vm_block)
   
   void mutex_init() {  
     def(Event_lock                   , Mutex  , event,       true ); // allow to lock in VM
   }
  
  
  
  1.1                  patches/j2sdk/j2sdk-1.4.2-optimize-1.patch
  
  Index: j2sdk-1.4.2-optimize-1.patch
  ===================================================================
  Submitted By: Jim Gifford (jim at linuxfromscratch dot org)
  Date: 2003-10-12
  Initial Package Version: 1.4.2
  Origin: Jim Gifford
  Description: GCC 3.3 Fix for Java SDK
  	     inline asm functions don't like -O3
  	     This patch removes any -O3 to prevent compile errors.
  
  	     Error message:
  	     error: impossible constraint in `asm'
  
   
  diff -Naur java.orig/hotspot/build/linux/makefiles/gcc.make java/hotspot/build/linux/makefiles/gcc.make
  --- java.orig/hotspot/build/linux/makefiles/gcc.make	2003-09-11 01:40:04.000000000 +0000
  +++ java/hotspot/build/linux/makefiles/gcc.make	2003-10-12 07:28:06.000000000 +0000
  @@ -37,7 +37,7 @@
   CFLAGS += $(GCC_SAVE_TEMPS)
   
   # The flags to use for an Optimized g++ build
  -OPT_CFLAGS += -O3 
  +OPT_CFLAGS +=  
   # Hotspot uses very unstrict aliasing turn this optimization off
   OPT_CFLAGS += -fno-strict-aliasing
   
  
  
  
  1.1                  patches/j2sdk/j2sdk-1.4.2-remove-fixed-paths-1.patch
  
  Index: j2sdk-1.4.2-remove-fixed-paths-1.patch
  ===================================================================
  Submitted By: Jim Gifford (jim at linuxfromscratch dot org)
  Date: 2003-10-14
  Initial Package Version: 1.4.2
  Origin: j2sdk-1.4.1-remove-fixed-paths.patch
  Description: Instead of fixing the path where binaries are located, use the binaries
  	     in the user's path. Updated for 1.4.2
  
  diff -Naur java.orig/control/make/common/Defs-linux.gmk java/control/make/common/Defs-linux.gmk
  --- java.orig/control/make/common/Defs-linux.gmk	2003-09-11 01:39:24.000000000 +0000
  +++ java/control/make/common/Defs-linux.gmk	2003-10-14 16:52:24.000000000 +0000
  @@ -50,51 +50,51 @@
   # non-standard locations
   #
   
  -AR             = $(USRBIN_PATH)ar
  -BASENAME       = $(UNIXCOMMAND_PATH)basename
  -CAT            = $(UNIXCOMMAND_PATH)cat
  +AR             = ar
  +BASENAME       = basename
  +CAT            = cat
   CD             = cd # intrinsic unix command
  -CHMOD          = $(UNIXCOMMAND_PATH)chmod
  -CMP            = $(USRBIN_PATH)cmp
  -COMM           = $(USRBIN_PATH)comm
  -COMPRESS       = $(USRBIN_PATH)compress
  -CP             = $(UNIXCOMMAND_PATH)cp
  -CPIO           = $(UNIXCOMMAND_PATH)cpio
  -CUT            = $(USRBIN_PATH)cut
  -DATE           = $(UNIXCOMMAND_PATH)date
  -DF             = $(UNIXCOMMAND_PATH)df
  -DIFF           = $(USRBIN_PATH)diff
  -DIRNAME        = $(USRBIN_PATH)dirname
  +CHMOD          = chmod
  +CMP            = cmp
  +COMM           = comm
  +COMPRESS       = compress
  +CP             = cp
  +CPIO           = cpio
  +CUT            = cut
  +DATE           = date
  +DF             = df
  +DIFF           = diff
  +DIRNAME        = dirname
   ECHO           = echo -e # intrinsic unix command, with backslash-escaped character interpretation 
  -EGREP          = $(UNIXCOMMAND_PATH)egrep
  -EXPR           = $(USRBIN_PATH)expr
  -FIND           = $(USRBIN_PATH)find
  -GREP           = $(UNIXCOMMAND_PATH)grep
  -LEX            = $(USRBIN_PATH)lex
  -LN             = $(UNIXCOMMAND_PATH)ln
  -LS             = $(UNIXCOMMAND_PATH)ls
  -M4             = $(USRBIN_PATH)m4
  -MKDIR          = $(UNIXCOMMAND_PATH)mkdir
  -MV             = $(UNIXCOMMAND_PATH)mv
  -NAWK           = $(USRBIN_PATH)gawk
  -PWD            = $(UNIXCOMMAND_PATH)pwd
  +EGREP          = egrep
  +EXPR           = expr
  +FIND           = find
  +GREP           = grep
  +LEX            = lex
  +LN             = ln
  +LS             = ls
  +M4             = m4
  +MKDIR          = mkdir
  +MV             = mv
  +NAWK           = gawk
  +PWD            = pwd
   #RM   is defined by GNU Make as 'rm -f'
  -RMDIR          = $(UNIXCOMMAND_PATH)rmdir
  -RPM            = $(UNIXCOMMAND_PATH)rpm
  -SED            = $(UNIXCOMMAND_PATH)sed
  -SH             = $(UNIXCOMMAND_PATH)sh
  -SORT           = $(UNIXCOMMAND_PATH)sort
  -STRIP          = $(USRBIN_PATH)strip
  -TAR            = $(UNIXCOMMAND_PATH)tar
  -TOUCH          = $(UNIXCOMMAND_PATH)touch
  -TR             = $(USRBIN_PATH)tr
  -TRUE           = $(UNIXCOMMAND_PATH)true
  -UNAME          = $(UNIXCOMMAND_PATH)uname
  -UNIQ           = $(USRBIN_PATH)uniq
  -UNZIPSFX       = $(USRBIN_PATH)unzipsfx
  -WC             = $(USRBIN_PATH)wc
  -YACC           = $(USRBIN_PATH)yacc
  -ZIPEXE         = $(USRBIN_PATH)zip
  +RMDIR          = rmdir
  +RPM            = rpm
  +SED            = sed
  +SH             = sh
  +SORT           = sort
  +STRIP          = strip
  +TAR            = tar
  +TOUCH          = touch
  +TR             = tr
  +TRUE           = true
  +UNAME          = uname
  +UNIQ           = uniq
  +UNZIPSFX       = unzipsfx
  +WC             = wc
  +YACC           = yacc
  +ZIPEXE         = zip
   
   
   archExpr = case "`$(UNAME) -m`" in  \
  diff -Naur java.orig/deploy/make/common/Defs-linux.gmk java/deploy/make/common/Defs-linux.gmk
  --- java.orig/deploy/make/common/Defs-linux.gmk	2003-09-11 01:57:23.000000000 +0000
  +++ java/deploy/make/common/Defs-linux.gmk	2003-10-14 16:52:24.000000000 +0000
  @@ -8,8 +8,8 @@
   include $(CONTROL_TOPDIR)/make/common/Defs-linux.gmk
   
   BUNDLE_SUFFIX  = .zip
  -CC	       = $(COMPILER_PATH)gcc
  -HEAD           = $(USRBIN_PATH)head
  +CC	       = gcc
  +HEAD           = head
   EXEDIR         = $(OUTPUTDIR)/bin
   JUMP_EXE       = $(PROTO_DIR)/javawsbin$(SUFFIX)
   CLASSPATH_SEP  = $(CLASSPATH_SEPARATOR)
  diff -Naur java.orig/j2se/make/common/Defs-linux.gmk java/j2se/make/common/Defs-linux.gmk
  --- java.orig/j2se/make/common/Defs-linux.gmk	2003-09-11 01:42:56.000000000 +0000
  +++ java/j2se/make/common/Defs-linux.gmk	2003-10-14 16:52:49.000000000 +0000
  @@ -29,63 +29,56 @@
   # non-standard locations
   #
   
  -AR             = $(USRBIN_PATH)ar
  -BASENAME       = $(UNIXCOMMAND_PATH)basename
  -CAT            = $(UNIXCOMMAND_PATH)cat
  -CC             = $(COMPILER_PATH)gcc
  -CPP            = $(COMPILER_PATH)gcc -E
  -ifeq ($(STATIC_CXX),true)
  -# g++ always dynamically links libstdc++, even we use "-Wl,-Bstatic -lstdc++"
  -# We need to use gcc to statically link the C++ runtime. gcc and g++ use
  -# the same subprocess to compile C++ files, so it is OK to build using gcc.
  -CXX            = $(COMPILER_PATH)gcc
  -else
  -CXX            = $(COMPILER_PATH)g++
  -endif
  +AR             = ar
  +BASENAME       = basename
  +CAT            = cat
  +CC             = gcc
  +CPP            = gcc -E
  +CXX            = g++
   CD             = cd # intrinsic unix command
  -CHMOD          = $(UNIXCOMMAND_PATH)chmod
  -CMP            = $(USRBIN_PATH)cmp
  -COMPRESS       = $(USRBIN_PATH)compress
  -CP             = $(UNIXCOMMAND_PATH)cp
  -CPIO           = $(UNIXCOMMAND_PATH)cpio
  -CUT            = $(USRBIN_PATH)cut
  -DATE           = $(UNIXCOMMAND_PATH)date
  -DF             = $(UNIXCOMMAND_PATH)df
  -DIFF           = $(USRBIN_PATH)diff
  -DIRNAME        = $(USRBIN_PATH)dirname
  +CHMOD          = chmod
  +CMP            = cmp
  +COMPRESS       = compress
  +CP             = cp
  +CPIO           = cpio
  +CUT            = cut
  +DATE           = date
  +DF             = df
  +DIFF           = diff
  +DIRNAME        = dirname
   ECHO           = echo -e # intrinsic unix command, with backslash-escaped character interpretation 
  -EGREP          = $(UNIXCOMMAND_PATH)egrep
  -EXPR           = $(USRBIN_PATH)expr
  -FIND           = $(USRBIN_PATH)find
  -HEAD           = $(USRBIN_PATH)head
  -GDB            = $(USRBIN_PATH)gdb
  -GREP           = $(UNIXCOMMAND_PATH)grep
  -GUNZIP         = $(UNIXCOMMAND_PATH)gunzip
  -LEX            = $(USRBIN_PATH)lex
  -LN             = $(UNIXCOMMAND_PATH)ln
  -LS             = $(UNIXCOMMAND_PATH)ls
  -M4             = $(USRBIN_PATH)m4
  -MKDIR          = $(UNIXCOMMAND_PATH)mkdir
  -MV             = $(UNIXCOMMAND_PATH)mv
  -NAWK           = $(USRBIN_PATH)gawk
  -PWD            = $(UNIXCOMMAND_PATH)pwd
  +EGREP          = egrep
  +EXPR           = expr
  +FIND           = find
  +HEAD           = head
  +GDB            = gdb
  +GREP           = grep
  +GUNZIP         = gunzip
  +LEX            = lex
  +LN             = ln
  +LS             = ls
  +M4             = m4
  +MKDIR          = mkdir
  +MV             = mv
  +NAWK           = gawk
  +PWD            = pwd
   #RM   is defined by GNU Make as 'rm -f'
  -RMDIR          = $(UNIXCOMMAND_PATH)rmdir
  -RPM            = $(UNIXCOMMAND_PATH)rpm
  -SED            = $(UNIXCOMMAND_PATH)sed
  -SH             = $(UNIXCOMMAND_PATH)sh
  -SORT           = $(UNIXCOMMAND_PATH)sort
  -STRIP          = $(USRBIN_PATH)strip
  -TAR            = $(UNIXCOMMAND_PATH)tar
  -TEST	       = $(USRBIN_PATH)test
  -TOUCH          = $(UNIXCOMMAND_PATH)touch
  -TR             = $(USRBIN_PATH)tr
  -TRUE           = $(UNIXCOMMAND_PATH)true
  -UNAME          = $(UNIXCOMMAND_PATH)uname
  -UNIQ           = $(USRBIN_PATH)uniq
  -UNZIPSFX       = $(USRBIN_PATH)unzipsfx
  -YACC           = $(USRBIN_PATH)yacc
  -ZIPEXE         = $(USRBIN_PATH)zip
  +RMDIR          = rmdir
  +RPM            = rpm
  +SED            = sed
  +SH             = sh
  +SORT           = sort
  +STRIP          = strip
  +TAR            = tar
  +TEST	       = test
  +TOUCH          = touch
  +TR             = tr
  +TRUE           = true
  +UNAME          = uname
  +UNIQ           = uniq
  +UNZIPSFX       = unzipsfx
  +YACC           = yacc
  +ZIPEXE         = zip
   
   
   archExpr = case "`$(UNAME) -m`" in  \
  
  
  
  1.1                  patches/j2sdk/j2sdk-1.4.2-use-included-motif-1.patch
  
  Index: j2sdk-1.4.2-use-included-motif-1.patch
  ===================================================================
  Submitted By: Jim Gifford (jim at linuxfromscratch dot org)
  Date: 2003-10-07
  Initial Package Version: 1.4.2
  Origin: j2sdk-1.4.1-use-included-motif.patch
  Description: j2sdk includes its hacked/fixed version of motif source that it
  	     links against. In some cases it ends up linking against the system installed
  	     motif instead of the internal statically compiled libXm. This patch fixes the
  	     code so that the internal motif lib is renamed to a different and unique name
  	     and then links against that lib instead.
   
  diff -Naur java.orig/control/make/motif-rules.gmk java/control/make/motif-rules.gmk
  --- java.orig/control/make/motif-rules.gmk	2003-09-11 01:39:24.000000000 +0000
  +++ java/control/make/motif-rules.gmk	2003-10-07 08:00:13.000000000 +0000
  @@ -32,7 +32,7 @@
     ABS_MOTIF_DIR := $(shell $(CD) $(MOTIF_DIR); $(PWD))
   endif
   
  -MOTIF = $(MOTIF_DIR)/lib/libXm.a 
  +MOTIF = $(MOTIF_DIR)/lib/libXm-j2sdk.a 
   
   motif: motif-build motif-install
   
  @@ -50,8 +50,8 @@
   motif-install-lib: $(MOTIF_DIR)/lib 
     ifdef BUILD_MOTIF
   	$(CD) $(MOTIF_DIR)/lib; \
  -	$(RM) libXm.a ; \
  -	$(LN) -s $(ABS_MOTIF_TOPDIR)/lib/libXm.a .
  +	$(RM) libXm-j2sdk.a ; \
  +	$(LN) -s $(ABS_MOTIF_TOPDIR)/lib/libXm-j2sdk.a .
     endif
   
   motif-install-include: $(MOTIF_DIR)/include 
  @@ -69,7 +69,7 @@
     ifdef BUILD_MOTIF
   	( $(CD) $(MOTIF_TOPDIR)/lib/Xm ; \
   		$(MAKE) clean MAKEFLAGS= ARCH_DATA_MODEL=$(ARCH_DATA_MODEL); ); \
  -	$(RM) $(MOTIF_TOPDIR)/lib/libXm.a \
  +	$(RM) $(MOTIF_TOPDIR)/lib/libXm-j2sdk.a \
   	      $(MOTIF_TOPDIR)/lib/Xm/Xm.msg 
   	$(RM) -r $(MOTIF_TOPDIR)/lib/Xm/exports
   	$(RM) -r $(MOTIF_DIR)/lib $(MOTIF_DIR)/include $(MOTIF_DIR)
  diff -Naur java.orig/j2se/make/sun/awt/Makefile java/j2se/make/sun/awt/Makefile
  --- java.orig/j2se/make/sun/awt/Makefile	2003-09-11 01:43:13.000000000 +0000
  +++ java/j2se/make/sun/awt/Makefile	2003-10-07 07:57:59.000000000 +0000
  @@ -280,8 +280,10 @@
   ifneq ($(PLATFORM), windows)
   # vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv SOLARIS/LINUX
   
  +# If using static motif, use the non-standard name for the lib
  +# Changed by Tushar Teredesai <tush at yahoo.com>
   ifeq ($(STATIC_MOTIF),true)
  -  LIBXM = $(MOTIF_LIB)/libXm.a -lXp
  +  LIBXM = $(MOTIF_LIB)/libXm-j2sdk.a -lXp
   else # STATIC_MOTIF
     LIBXM = -lXm
   endif # STATIC_MOTIF
  diff -Naur java.orig/j2se/make/sun/awt/mawt.gmk java/j2se/make/sun/awt/mawt.gmk
  --- java.orig/j2se/make/sun/awt/mawt.gmk	2003-09-11 01:43:14.000000000 +0000
  +++ java/j2se/make/sun/awt/mawt.gmk	2003-10-07 07:57:59.000000000 +0000
  @@ -123,8 +123,10 @@
   else
   CFLAGS += -DMOTIF_VERSION=$(MOTIF_VERSION)
   
  +# If using static motif, use non-standard lib name
  +# Changed by Tushar Teredesai <tush at yahoo.com>
   ifeq ($(STATIC_MOTIF),true)
  -LIBXM = $(MOTIF_LIB)/libXm.a -lXp
  +LIBXM = $(MOTIF_LIB)/libXm-j2sdk.a -lXp
   else
   LIBXM = -lXm
   endif
  
  diff -Naur java.orig/motif/lib/Xm/Makefile java/motif/lib/Xm/Makefile
  --- java.orig/motif/lib/Xm/Makefile	2003-09-11 01:42:17.000000000 +0000
  +++ java/motif/lib/Xm/Makefile	2003-10-07 07:57:59.000000000 +0000
  @@ -1295,20 +1295,20 @@
   	$(RM) $(DESTDIR)$(USRLIBDIR)/libXm.so
   	$(LN) libXm.so.$(SOXMREV) $(DESTDIR)$(USRLIBDIR)/libXm.so
   
  -all:: ../libXm.a
  +all:: ../libXm-j2sdk.a
   
  -../libXm.a: $(OBJS) $(EXTRALIBRARYDEPS)
  +../libXm-j2sdk.a: $(OBJS) $(EXTRALIBRARYDEPS)
   	$(RM) $@
   	(cd unshared; $(AR) ../$@ $(OBJS))
   	$(RANLIB) $@
   	$(_NULLCMD_)
   
  -install:: ../libXm.a
  +install:: ../libXm-j2sdk.a
   	echo "install"
   	@if [ -d $(DESTDIR)$(USRLIBDIR) ]; then set +x; \
   	else (set -x; $(MKDIRHIER) $(DESTDIR)$(USRLIBDIR)); fi
  -	$(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) libXm.a $(DESTDIR)$(USRLIBDIR)
  -	@#$(RANLIB) $(RANLIBINSTFLAGS) $(DESTDIR)$(USRLIBDIR)/libXm.a
  +	$(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) libXm-j2sdk.a $(DESTDIR)$(USRLIBDIR)
  +	@#$(RANLIB) $(RANLIBINSTFLAGS) $(DESTDIR)$(USRLIBDIR)/libXm-j2sdk.a
   
   lintlib:: llib-lXm.ln
   
  
  
  



More information about the patches mailing list