Mercurial > hg > release > icedtea6-1.12

changeset 1988:2bf01e9fe8b0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patches/icedtea-sh4-support.patch: removed duplicated lines causing warning message when this patch is applied
author Pavel Tisnovsky <ptisnovs@redhat.com>
date Fri, 19 Mar 2010 10:13:31 +0100
parents 5a761c257361
children 3fa0b8d84878
files ChangeLog patches/icedtea-sh4-support.patch
diffstat 2 files changed, 5 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Mar 18 19:27:35 2010 +0100
+++ b/ChangeLog	Fri Mar 19 10:13:31 2010 +0100
@@ -1,3 +1,8 @@
+2010-03-19  Pavel Tisnovsky <ptisnovs@redhat.com>
+
+	* patches/icedtea-sh4-support.patch: removed duplicated
+	lines causing warning message when this patch is applied
+
 2010-03-18  Pavel Tisnovsky <ptisnovs@redhat.com>
 
 	* patches/icedtea-jtreg-httpTest.patch: new regression test
--- a/patches/icedtea-sh4-support.patch	Thu Mar 18 19:27:35 2010 +0100
+++ b/patches/icedtea-sh4-support.patch	Fri Mar 19 10:13:31 2010 +0100
@@ -96,24 +96,6 @@
    endif
  
 --- openjdk/jdk/make/jdk_generic_profile.sh	2010-01-19 09:49:57.000000000 +0900
-+++ openjdk/jdk/make/jdk_generic_profile.sh	2010-01-19 21:43:22.000000000 +0900
-@@ -350,13 +350,14 @@
-     i?86)    ZERO_LIBARCH=i386      ;;
-     sparc64) ZERO_LIBARCH=sparcv9   ;;
-     arm*)    ZERO_LIBARCH=arm       ;;
-+    sh*)     ZERO_LIBARCH=sh       ;;
-     *)       ZERO_LIBARCH="$(arch)"
-   esac
-   export ZERO_LIBARCH
- 
-   # ARCH_DATA_MODEL is the number of bits in a pointer
-   case "${ZERO_LIBARCH}" in
--    i386|ppc|s390|sparc|arm)
-+    i386|ppc|s390|sparc|arm|sh)
-       ARCH_DATA_MODEL=32
-       ;;
-     amd64|ppc64|s390x|sparcv9|ia64|alpha)
---- openjdk/jdk/make/jdk_generic_profile.sh	2010-01-19 09:49:57.000000000 +0900
 +++ openjdk/jdk/make/jdk_generic_profile.sh	2010-01-19 21:44:30.000000000 +0900
 @@ -350,13 +350,14 @@
      i?86)    ZERO_LIBARCH=i386      ;;