Mercurial > hg > release > icedtea6-1.2

changeset 791:a1df62f82c24

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged heads
author Lillian Angel <langel@redhat.com>
date Thu, 03 Apr 2008 11:36:59 -0400
parents 84746d84e2db (current diff) 19faa491fb91 (diff)
children 572473cfa17c
files ChangeLog
diffstat 6 files changed, 74 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Apr 03 11:35:03 2008 -0400
+++ b/ChangeLog	Thu Apr 03 11:36:59 2008 -0400
@@ -2,6 +2,21 @@
 
 	* NEWS: Updated for icedtea6.
 
+2008-04-02  Joshua Sumali  <jsumali@redhat.com>
+
+	* rt/net/sourceforge/jnlp/runtime/InstallDialog.java: Removed image
+	loading.
+
+2008-04-02  Gary Benson  <gbenson@redhat.com>
+
+	* patches/icedtea-zero.patch: Workaround for arm.
+	
+2008-04-01  Gary Benson  <gbenson@redhat.com>
+
+	* patches/icedtea-arm-uname.patch: New file.
+	* Makefile.am: Added the above.
+	* Makefile.in: Regenerated.
+
 2008-03-31  Lillian Angel  <langel@redhat.com>
 
 	* patches/icedtea-jpegclasses.patch: Added new class.
--- a/Makefile.am	Thu Apr 03 11:35:03 2008 -0400
+++ b/Makefile.am	Thu Apr 03 11:36:59 2008 -0400
@@ -278,6 +278,7 @@
 	patches/icedtea-zero-build.patch \
 	patches/icedtea-print-lsb-release.patch \
 	patches/icedtea-jpegclasses.patch \
+	patches/icedtea-arm-uname.patch \
 	$(GCC_PATCH) \
 	$(FAST_BUILD_PATCH) \
 	$(DISTRIBUTION_PATCHES)
--- a/Makefile.in	Thu Apr 03 11:35:03 2008 -0400
+++ b/Makefile.in	Thu Apr 03 11:36:59 2008 -0400
@@ -384,7 +384,8 @@
 	patches/icedtea-generated.patch patches/icedtea-lib64.patch \
 	patches/icedtea-zero-build.patch \
 	patches/icedtea-print-lsb-release.patch \
-	patches/icedtea-jpegclasses.patch $(GCC_PATCH) \
+	patches/icedtea-jpegclasses.patch \
+	patches/icedtea-arm-uname.patch $(GCC_PATCH) \
 	$(FAST_BUILD_PATCH) $(DISTRIBUTION_PATCHES) $(am__append_3)
 
 # Patch OpenJDK for plug replacements and ecj.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-arm-uname.patch	Thu Apr 03 11:36:59 2008 -0400
@@ -0,0 +1,26 @@
+diff -r 29e7597d75c4 openjdk/jdk/make/common/shared/Platform.gmk
+--- openjdk/jdk/make/common/shared/Platform.gmk	Fri Mar 28 14:19:36 2008 +0000
++++ openjdk/jdk/make/common/shared/Platform.gmk	Tue Apr 01 09:02:17 2008 +0100
+@@ -205,6 +205,9 @@ ifeq ($(SYSTEM_UNAME), Linux)
+                 sparc*) \
+                     echo sparc \
+                     ;; \
++                arm*) \
++                    echo arm \
++                    ;; \
+                 *) \
+                     echo $(mach) \
+                     ;; \
+diff -r 29e7597d75c4 openjdk/corba/make/common/shared/Platform.gmk
+--- openjdk/corba/make/common/shared/Platform.gmk	Fri Mar 28 14:19:36 2008 +0000
++++ openjdk/corba/make/common/shared/Platform.gmk	Tue Apr 01 09:02:17 2008 +0100
+@@ -194,6 +194,9 @@ ifeq ($(SYSTEM_UNAME), Linux)
+                 sparc*) \
+                     echo sparc \
+                     ;; \
++                arm*) \
++                    echo arm \
++                    ;; \
+                 *) \
+                     echo $(mach) \
+                     ;; \
--- a/patches/icedtea-zero.patch	Thu Apr 03 11:35:03 2008 -0400
+++ b/patches/icedtea-zero.patch	Thu Apr 03 11:36:59 2008 -0400
@@ -133,3 +133,29 @@
       }
  
    STEP(140, "(printing VM operation)" )
+diff -r 789c601c8ba9 openjdk/hotspot/src/os/linux/vm/os_linux.cpp
+--- openjdk/hotspot/src/os/linux/vm/os_linux.cpp	Tue Apr 01 14:49:28 2008 +0100
++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp	Wed Apr 02 09:51:37 2008 +0100
+@@ -1690,7 +1690,8 @@ void * os::dll_load(const char *filename
+     {EM_SPARC32PLUS, EM_SPARC,   ELFCLASS32, ELFDATA2MSB, (char*)"Sparc 32"},
+     {EM_SPARCV9,     EM_SPARCV9, ELFCLASS64, ELFDATA2MSB, (char*)"Sparc v9 64"},
+     {EM_PPC,         EM_PPC,     ELFCLASS32, ELFDATA2MSB, (char*)"Power PC 32"},
+-    {EM_PPC64,       EM_PPC64,   ELFCLASS64, ELFDATA2MSB, (char*)"Power PC 64"}
++    {EM_PPC64,       EM_PPC64,   ELFCLASS64, ELFDATA2MSB, (char*)"Power PC 64"},
++    {EM_ARM,         EM_ARM,     ELFCLASS32, ELFDATA2LSB, (char*)"ARM"}
+   };
+ 
+   #if  (defined IA32)
+@@ -1707,9 +1708,11 @@ void * os::dll_load(const char *filename
+     static  Elf32_Half running_arch_code=EM_PPC64;
+   #elif  (defined __powerpc__)
+     static  Elf32_Half running_arch_code=EM_PPC;
++  #elif  (defined ARM)
++    static  Elf32_Half running_arch_code=EM_ARM;    
+   #else
+     #error Method os::dll_load requires that one of following is defined:\
+-         IA32, AMD64, IA64, __sparc, __powerpc__
++         IA32, AMD64, IA64, __sparc, __powerpc__, ARM
+   #endif
+ 
+   // Identify compatability class for VM's architecture and library's architecture
--- a/rt/net/sourceforge/jnlp/runtime/InstallDialog.java	Thu Apr 03 11:35:03 2008 -0400
+++ b/rt/net/sourceforge/jnlp/runtime/InstallDialog.java	Thu Apr 03 11:36:59 2008 -0400
@@ -54,8 +54,10 @@
     InstallDialog() {
         super(createFrame(), R("CChooseCache"), true);
 
+		/*
         background = 
             new ImageIcon(getClass().getClassLoader().getResource("net/sourceforge/jnlp/resources/install.png"));
+		*/
 
         setLayout(new BorderLayout());
         setBackground(Color.white);
@@ -118,8 +120,10 @@
     }
 
     public void paint(Graphics g) {
+		/*
         Insets sin = super.getInsets();
         g.drawImage(background.getImage(), sin.left, sin.top, this);
+		*/
     }
 
     public void actionPerformed(ActionEvent evt) {