Mercurial > hg > release > icedtea6-1.4.1
changeset 307:173cae44913b cacao
2007-10-23 Christan Thalinger <twisti@complang.tuwien.ac.at>
* j2se/make/common/Defs-linux.gmk: Updated for b22.
* j2se/make/common/shared/Platform.gmk: Likewise.
* j2se/src/share/bin/java.c: Likewise.
| author | Christian Thalinger <twisti@complang.tuwien.ac.at> |
|---|---|
| date | Tue, 23 Oct 2007 13:27:20 +0200 |
| parents | 847ffcfaa727 |
| children | 26d6cb7b4b56 |
| files | ChangeLog patches/icedtea-cacao-Defs-linux-gmk.patch patches/icedtea-cacao-Platform-gmk.patch patches/icedtea-cacao-java-c.patch |
| diffstat | 4 files changed, 30 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Oct 17 22:57:45 2007 +0200 +++ b/ChangeLog Tue Oct 23 13:27:20 2007 +0200 @@ -1,3 +1,9 @@ +2007-10-23 Christan Thalinger <twisti@complang.tuwien.ac.at> + + * j2se/make/common/Defs-linux.gmk: Updated for b22. + * j2se/make/common/shared/Platform.gmk: Likewise. + * j2se/src/share/bin/java.c: Likewise. + 2007-10-17 Christan Thalinger <twisti@complang.tuwien.ac.at> * Makefile.in: Regenerated (I was too lazy to merge all
--- a/patches/icedtea-cacao-Defs-linux-gmk.patch Wed Oct 17 22:57:45 2007 +0200 +++ b/patches/icedtea-cacao-Defs-linux-gmk.patch Tue Oct 23 13:27:20 2007 +0200 @@ -1,8 +1,16 @@ Index: j2se/make/common/Defs-linux.gmk =================================================================== ---- j2se/make/common/Defs-linux.gmk (revision 250) -+++ openjdk/j2se/make/common/Defs-linux.gmk (working copy) -@@ -215,7 +215,7 @@ endif +--- openjdk/j2se/make/common/Defs-linux.gmk (revision 256) ++++ j2se/make/common/Defs-linux.gmk (working copy) +@@ -102,6 +102,7 @@ endif + # We need this frame pointer to make it easy to walk the stacks. + # This should be the default on X86, but ia64 and amd64 may not have this + # as the default. ++CFLAGS_REQUIRED_alpha += -mieee + CFLAGS_REQUIRED_amd64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN + CFLAGS_REQUIRED_i586 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN + CFLAGS_REQUIRED_ia64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN +@@ -206,7 +207,7 @@ endif EXTRA_LIBS += -lc
--- a/patches/icedtea-cacao-Platform-gmk.patch Wed Oct 17 22:57:45 2007 +0200 +++ b/patches/icedtea-cacao-Platform-gmk.patch Tue Oct 23 13:27:20 2007 +0200 @@ -1,8 +1,8 @@ Index: j2se/make/common/shared/Platform.gmk =================================================================== ---- j2se/make/common/shared/Platform.gmk (revision 250) -+++ openjdk/j2se/make/common/shared/Platform.gmk (working copy) -@@ -225,11 +225,25 @@ ifeq ($(SYSTEM_UNAME), Linux) +--- openjdk/j2se/make/common/shared/Platform.gmk (revision 256) ++++ j2se/make/common/shared/Platform.gmk (working copy) +@@ -223,11 +223,25 @@ ifeq ($(SYSTEM_UNAME), Linux) ARCH=sparcv9 endif else
--- a/patches/icedtea-cacao-java-c.patch Wed Oct 17 22:57:45 2007 +0200 +++ b/patches/icedtea-cacao-java-c.patch Tue Oct 23 13:27:20 2007 +0200 @@ -1,14 +1,14 @@ Index: j2se/src/share/bin/java.c =================================================================== ---- j2se/src/share/bin/java.c (revision 250) -+++ openjdk/j2se/src/share/bin/java.c (working copy) -@@ -367,7 +367,8 @@ main(int argc, char ** argv) +--- openjdk/j2se/src/share/bin/java.c (revision 256) ++++ j2se/src/share/bin/java.c (working copy) +@@ -1955,7 +1955,8 @@ ContinueInNewThread(InvocationFunctions* args.classname = classname; - args.ifn = ifn; + args.ifn = *ifn; -- return ContinueInNewThread(JavaMain, threadStackSize, (void*)&args, ret); -+/* return ContinueInNewThread(JavaMain, threadStackSize, (void*)&args, ret); */ -+ return JavaMain((void*)&args); - } - } - +- rslt = ContinueInNewThread0(JavaMain, threadStackSize, (void*)&args); ++/* rslt = ContinueInNewThread0(JavaMain, threadStackSize, (void*)&args); */ ++ rslt = JavaMain((void*)&args); + /* If the caller has deemed there is an error we + * simply return that, otherwise we return the value of + * the callee