# HG changeset patch # User Andrew John Hughes # Date 1311985431 -3600 # Node ID 05b8c708dced0a93271473aac6af0a83a5fab5d1 # Parent 05dda6fb5cedd1995141eec052ec846a94cd8d0d PR767: Annotation Processing Filer.getResource() always throws FileNotFoundException PR717: All non-bootstrap patches in IcedTea7 should be in the forest or dropped 2011-07-29 Andrew John Hughes PR717: All non-bootstrap patches in IcedTea7 should be in the forest or dropped PR767: Annotation Processing Filer.getResource() always throws FileNotFoundException * patches/demos.patch: Moved to IcedTea7 forest. * patches/gcc-suffix.patch: Recreated more generically in the forest using BUILD_GCC/BUILD_CPP/HOST_GCC/HOST_CPP to set the names of the appropriate binaries. * patches/headers.patch: Recreated in forest using FT2_CFLAGS and FT2_LIBS for passing FreeType cflags and libraries from pkg-config. * patches/jpegclasses.patch: Removed; the com.sun.jpeg classes should not be in 7. * patches/memory-limits.patch, * patches/print-lsb-release.patch: Moved to IcedTea7 forest. * patches/sunsrc.patch: Obsolete, dropped as in IcedTea6. * patches/text-relocations.patch: Moved to IcedTea7 forest. * Makefile.am: (JDK_CHANGESET): Updated to bring in above patches. (JDK_SHA256SUM): Likewise. (HOTSPOT_CHANGESET): Likewise. (HOTSPOT_SHA256SUM): Likewise. (LANGTOOLS_CHANGESET): Bring in fix for PR767. (LANGTOOLS_SHA256SUM): Likewise. (ICEDTEA_PATCHES): Remove above patches. (ICEDTEA_ENV): Set FT2_CFLAGS, FT2_LIBS, BUILD_GCC and BUILD_CPP. * patches/cacao/arch.patch: Recreated against new forest. * NEWS: Updated. diff -r 05dda6fb5ced -r 05b8c708dced ChangeLog --- a/ChangeLog Fri Jul 29 00:04:28 2011 +0100 +++ b/ChangeLog Sat Jul 30 01:23:51 2011 +0100 @@ -1,3 +1,45 @@ +2011-07-29 Andrew John Hughes + + PR717: All non-bootstrap patches in IcedTea7 + should be in the forest or dropped + PR767: Annotation Processing Filer.getResource() + always throws FileNotFoundException + * patches/demos.patch: + Moved to IcedTea7 forest. + * patches/gcc-suffix.patch: + Recreated more generically in the forest + using BUILD_GCC/BUILD_CPP/HOST_GCC/HOST_CPP + to set the names of the appropriate binaries. + * patches/headers.patch: + Recreated in forest using FT2_CFLAGS and FT2_LIBS + for passing FreeType cflags and libraries from + pkg-config. + * patches/jpegclasses.patch: + Removed; the com.sun.jpeg classes should not be + in 7. + * patches/memory-limits.patch, + * patches/print-lsb-release.patch: + Moved to IcedTea7 forest. + * patches/sunsrc.patch: Obsolete, dropped as + in IcedTea6. + * patches/text-relocations.patch: + Moved to IcedTea7 forest. + * Makefile.am: + (JDK_CHANGESET): Updated to bring in + above patches. + (JDK_SHA256SUM): Likewise. + (HOTSPOT_CHANGESET): Likewise. + (HOTSPOT_SHA256SUM): Likewise. + (LANGTOOLS_CHANGESET): Bring in fix + for PR767. + (LANGTOOLS_SHA256SUM): Likewise. + (ICEDTEA_PATCHES): Remove above patches. + (ICEDTEA_ENV): Set FT2_CFLAGS, FT2_LIBS, + BUILD_GCC and BUILD_CPP. + * patches/cacao/arch.patch: Recreated + against new forest. + * NEWS: Updated. + 2011-07-28 Andrew John Hughes Bring in new JDK build cleanups and diff -r 05dda6fb5ced -r 05b8c708dced Makefile.am --- a/Makefile.am Fri Jul 29 00:04:28 2011 +0100 +++ b/Makefile.am Sat Jul 30 01:23:51 2011 +0100 @@ -3,19 +3,19 @@ OPENJDK_VERSION = b147 CORBA_CHANGESET = 616c760dc288 -HOTSPOT_CHANGESET = d438a5890756 +HOTSPOT_CHANGESET = ee4dd447f5b9 JAXP_CHANGESET = c40983d6ae70 JAXWS_CHANGESET = 83db5e316798 -JDK_CHANGESET = 4783dfaed9f9 -LANGTOOLS_CHANGESET = 0df09c966a29 +JDK_CHANGESET = ccf86bbc61fd +LANGTOOLS_CHANGESET = fb7fb3071b64 OPENJDK_CHANGESET = 3defd24c2671 CORBA_SHA256SUM = 7589c42e88b4342750bea5afa306cc662cc9c5f7607fad96f70083ce70f4526e -HOTSPOT_SHA256SUM = efa3512d4c29306a4e16f854bd2416e6917cdb1741efe0826401c7e0ee13645a +HOTSPOT_SHA256SUM = 6d54c2ce55748e00c6ecb41ea7c0924e3a1db2cbc2a506fdafee645d7efbc705 JAXP_SHA256SUM = 6ab0cab1965edb28e4093b55436abd04fbffe0b0251016043c75246c4ee9dc2d JAXWS_SHA256SUM = 5567c90ce2857016365b2e346783a3b16ec0e76b80586a0371f601b4fed01f21 -JDK_SHA256SUM = 8eaecc9db0a9a2266f67b661caaa35a8207263975dc0560a9e82ee83819a6d73 -LANGTOOLS_SHA256SUM = 0118daf4d280d0a56f657fac640ac191ec42a7f49cc12a0693bd0fdd04ec684a +JDK_SHA256SUM = aedc601afad003ae30b9268cd47c229d00636c488ad921ce02883f68f35842e0 +LANGTOOLS_SHA256SUM = 9ddc00ec50fd2f5e331dc2bc10da4e23b69bf644eb92d50b39a2003c18fb5aa1 OPENJDK_SHA256SUM = 4043a75c2c4385dd735f8dbbf2369311ce1b951217c9dbe9bba9609e24eb291e CACAO_VERSION = d6264eb66506 @@ -246,15 +246,7 @@ # Patch list ICEDTEA_PATCHES = \ - patches/text-relocations.patch \ - patches/demos.patch \ - patches/headers.patch \ - patches/gcc-suffix.patch \ - patches/memory-limits.patch \ - patches/sunsrc.patch \ patches/libraries.patch \ - patches/print-lsb-release.patch \ - patches/jpegclasses.patch \ patches/debian/uname.patch \ patches/sparc-ptracefix.patch \ patches/sparc-trapsfix.patch \ @@ -459,8 +451,8 @@ LLVM_CFLAGS="$(LLVM_CFLAGS)" \ LLVM_LDFLAGS="$(LLVM_LDFLAGS)" \ LLVM_LIBS="$(LLVM_LIBS)" \ - FREETYPE2_HEADERS="$(FREETYPE2_CFLAGS)" \ - FT2_LIB="$(FREETYPE2_LIBS)" \ + FT2_CFLAGS="$(FREETYPE2_CFLAGS)" \ + FT2_LIBS="$(FREETYPE2_LIBS)" \ ALT_PARALLEL_COMPILE_JOBS="$(PARALLEL_JOBS)" \ HOTSPOT_BUILD_JOBS="$(PARALLEL_JOBS)" \ JAVAC="" \ @@ -477,7 +469,9 @@ ALT_DROPS_DIR="$(abs_top_builddir)/drops" \ ALT_OUTPUTDIR="$(BUILD_OUTPUT_DIR)" \ VERBOSE="$(VERBOSE)" \ - STATIC_CXX="false" + STATIC_CXX="false" \ + BUILD_GCC="$(CC)" \ + BUILD_CPP="$(CXX)" if ENABLE_CACAO ICEDTEA_ENV += \ diff -r 05dda6fb5ced -r 05b8c708dced NEWS --- a/NEWS Fri Jul 29 00:04:28 2011 +0100 +++ b/NEWS Sat Jul 30 01:23:51 2011 +0100 @@ -11,6 +11,17 @@ New in release 2.0 (2011-XX-XX): +* Bug fixes + - PR767: Annotation Processing Filer.getResource() always throws FileNotFoundException + - Allow the compiler used to be overridden by setting BUILD_GCC/BUILD_CPP. + - Fixed regression test runtime/7020373. +* Zero/Shark + - PR757, 7066143: 7009309 regression: x86 stubRoutines + - PR753, 7066143: 7009923 regression + - methodHandles_zero missing. + - sharkContext typo in assert + - sharedRuntime needs rework after indy reorg + - Add missing describe_pd method for Zero. * JamVM - JamVM is self-hosting. - Make classlib init functions consistent + warnings. diff -r 05dda6fb5ced -r 05b8c708dced patches/cacao/arch.patch --- a/patches/cacao/arch.patch Fri Jul 29 00:04:28 2011 +0100 +++ b/patches/cacao/arch.patch Sat Jul 30 01:23:51 2011 +0100 @@ -1,6 +1,6 @@ diff -Nru openjdk.orig/jdk/make/common/Defs-linux.gmk openjdk/jdk/make/common/Defs-linux.gmk ---- openjdk.orig/jdk/make/common/Defs-linux.gmk 2011-04-20 04:40:20.000000000 +0100 -+++ openjdk/jdk/make/common/Defs-linux.gmk 2011-04-21 14:43:06.855289132 +0100 +--- openjdk.orig/jdk/make/common/Defs-linux.gmk 2011-06-11 00:38:06.000000000 +0100 ++++ openjdk/jdk/make/common/Defs-linux.gmk 2011-07-29 08:43:20.137660933 +0100 @@ -100,9 +100,19 @@ # 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 @@ -22,11 +22,11 @@ LDFLAGS_COMMON_sparcv9 += -m64 -mcpu=v9 CFLAGS_REQUIRED_sparc += -m32 -mcpu=v9 diff -Nru openjdk.orig/jdk/make/common/shared/Compiler-gcc.gmk openjdk/jdk/make/common/shared/Compiler-gcc.gmk ---- openjdk.orig/jdk/make/common/shared/Compiler-gcc.gmk 2011-04-21 10:59:53.000000000 +0100 -+++ openjdk/jdk/make/common/shared/Compiler-gcc.gmk 2011-04-21 14:43:06.855289132 +0100 -@@ -68,6 +68,52 @@ +--- openjdk.orig/jdk/make/common/shared/Compiler-gcc.gmk 2011-07-29 04:12:27.000000000 +0100 ++++ openjdk/jdk/make/common/shared/Compiler-gcc.gmk 2011-07-29 08:43:20.137660933 +0100 +@@ -76,6 +76,52 @@ else - CXX = $(COMPILER_PATH)g++$(GCC_SUFFIX) + CXX = $(BUILD_CPP) endif + ifeq ($(ARCH), alpha) + # alpha @@ -79,7 +79,7 @@ SUN_COMP_VER := $(shell $(CC) --verbose 2>&1 ) diff -Nru openjdk.orig/jdk/make/javax/sound/SoundDefs.gmk openjdk/jdk/make/javax/sound/SoundDefs.gmk --- openjdk.orig/jdk/make/javax/sound/SoundDefs.gmk 2011-04-20 04:40:20.000000000 +0100 -+++ openjdk/jdk/make/javax/sound/SoundDefs.gmk 2011-04-21 14:43:06.855289132 +0100 ++++ openjdk/jdk/make/javax/sound/SoundDefs.gmk 2011-07-29 08:43:20.137660933 +0100 @@ -58,10 +58,54 @@ ifeq ($(ZERO_BUILD), true) CPPFLAGS += -DX_ARCH=X_ZERO @@ -137,7 +137,7 @@ endif # ARCH sparc diff -Nru openjdk.orig/jdk/src/share/native/com/sun/media/sound/SoundDefs.h openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h --- openjdk.orig/jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2011-04-20 04:40:22.000000000 +0100 -+++ openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2011-04-21 14:44:25.900576412 +0100 ++++ openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2011-07-29 08:43:20.141660999 +0100 @@ -41,6 +41,14 @@ #define X_ZERO 6 #define X_ARM 7 diff -r 05dda6fb5ced -r 05b8c708dced patches/demos.patch --- a/patches/demos.patch Fri Jul 29 00:04:28 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,317 +0,0 @@ ---- openjdkb18/jdk/src/share/demo/jvmti/gctest/sample.makefile.txt 2007-08-16 03:33:19.000000000 -0400 -+++ openjdk/jdk/src/share/demo/jvmti/gctest/sample.makefile.txt 2007-08-23 16:12:59.000000000 -0400 -@@ -43,7 +43,7 @@ - - # Source lists - LIBNAME=gctest --SOURCES=gctest.c ../agent_util/agent_util.c -+SOURCES=gctest.c ../../agent_util/src/agent_util.c - - # Solaris Sun C Compiler Version 5.5 - ifeq ($(OSNAME), solaris) -@@ -89,7 +89,7 @@ - # Object files needed to create library - OBJECTS=$(SOURCES:%.c=%.o) - # Library name and options needed to build it -- LIBRARY=lib$(LIBNAME).so -+ LIBRARY=../lib/lib$(LIBNAME).so - LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text - # Libraries we are dependent on - LIBRARIES=-lc -@@ -122,7 +122,7 @@ - - # Common -I options - CFLAGS += -I. --CFLAGS += -I../agent_util -+CFLAGS += -I../../agent_util/src - CFLAGS += -I$(JDK)/include -I$(JDK)/include/$(OSNAME) - - # Default rule ---- openjdkb18/jdk/src/share/demo/jvmti/heapTracker/sample.makefile.txt 2007-08-16 03:33:20.000000000 -0400 -+++ openjdk/jdk/src/share/demo/jvmti/heapTracker/sample.makefile.txt 2007-08-24 15:15:40.000000000 -0400 -@@ -41,13 +41,15 @@ - # - ######################################################################## - -+JAVA_CRW_DEMO=../../java_crw_demo/src/libjava_crw_demo.so -+ - # Source lists - LIBNAME=heapTracker --SOURCES=heapTracker.c ../agent_util/agent_util.c -+SOURCES=heapTracker.c ../../agent_util/src/agent_util.c - JAVA_SOURCES=HeapTracker.java - - # Name of jar file that needs to be created --JARFILE=heapTracker.jar -+JARFILE=../heapTracker.jar - - # Solaris Sun C Compiler Version 5.5 - ifeq ($(OSNAME), solaris) -@@ -93,10 +95,10 @@ - # Object files needed to create library - OBJECTS=$(SOURCES:%.c=%.o) - # Library name and options needed to build it -- LIBRARY=lib$(LIBNAME).so -+ LIBRARY=../lib/lib$(LIBNAME).so - LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text - # Libraries we are dependent on -- LIBRARIES=-L $(JDK)/jre/lib/$(LIBARCH) -ljava_crw_demo -lc -+ LIBRARIES=-L../../java_crw_demo/src/ -ljava_crw_demo -lc - # Building a shared library - LINK_SHARED=$(LINK.c) -shared -o $@ - endif -@@ -128,15 +130,18 @@ - - # Common -I options - CFLAGS += -I. --CFLAGS += -I../agent_util --CFLAGS += -I../java_crw_demo -+CFLAGS += -I../../agent_util/src -+CFLAGS += -I../../java_crw_demo/src - CFLAGS += -I$(JDK)/include -I$(JDK)/include/$(OSNAME) - - # Default rule (build both native library and jar file) - all: $(LIBRARY) $(JARFILE) - -+$(JAVA_CRW_DEMO): -+ make JDK=$(JDK) OSNAME=$(OSNAME) -C ../../java_crw_demo/src -f sample.makefile.txt -+ - # Build native library --$(LIBRARY): $(OBJECTS) -+$(LIBRARY): $(OBJECTS) $(JAVA_CRW_DEMO) - $(LINK_SHARED) $(OBJECTS) $(LIBRARIES) - - # Build jar file ---- openjdkb18/jdk/src/share/demo/jvmti/heapViewer/sample.makefile.txt 2007-08-16 03:33:20.000000000 -0400 -+++ openjdk/jdk/src/share/demo/jvmti/heapViewer/sample.makefile.txt 2007-08-23 16:13:00.000000000 -0400 -@@ -43,7 +43,7 @@ - - # Source lists - LIBNAME=heapViewer --SOURCES=heapViewer.c ../agent_util/agent_util.c -+SOURCES=heapViewer.c ../../agent_util/src/agent_util.c - - # Solaris Sun C Compiler Version 5.5 - ifeq ($(OSNAME), solaris) -@@ -89,7 +89,7 @@ - # Object files needed to create library - OBJECTS=$(SOURCES:%.c=%.o) - # Library name and options needed to build it -- LIBRARY=lib$(LIBNAME).so -+ LIBRARY=../lib/lib$(LIBNAME).so - LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text - # Libraries we are dependent on - LIBRARIES=-lc -@@ -123,6 +123,7 @@ - # Common -I options - CFLAGS += -I. - CFLAGS += -I$(JDK)/include -I$(JDK)/include/$(OSNAME) -+CFLAGS += -I../../agent_util/src - - # Default rule - all: $(LIBRARY) ---- openjdkb18/jdk/src/share/demo/jvmti/hprof/sample.makefile.txt 2007-08-16 03:33:21.000000000 -0400 -+++ openjdk/jdk/src/share/demo/jvmti/hprof/sample.makefile.txt 2007-08-23 16:12:58.000000000 -0400 -@@ -73,7 +73,7 @@ - JAVA_SOURCES=Tracker.java - - # Name of jar file that needs to be created --#JARFILE=hprof.jar -+JARFILE=../hprof.jar - - # Solaris Sun C Compiler Version 5.5 - ifeq ($(OSNAME), solaris) -@@ -110,7 +110,7 @@ - # Linux GNU C Compiler - ifeq ($(OSNAME), linux) - # GNU Compiler options needed to build it -- COMMON_FLAGS=-fno-strict-aliasing -fPIC -fno-omit-frame-pointer -+ COMMON_FLAGS=-fno-strict-aliasing -fPIC -fno-omit-frame-pointer -DSKIP_NPT - # Options that help find errors - COMMON_FLAGS+= -W -Wall -Wno-unused -Wno-parentheses - # To allow access to dladdr() -@@ -166,7 +166,7 @@ - - # Common -I options - CFLAGS += -I. --CFLAGS += -I../java_crw_demo -+CFLAGS += -I../../java_crw_demo/src - CFLAGS += -I$(JDK)/include -I$(JDK)/include/$(OSNAME) - - # Default rule (build both native library and jar file) ---- openjdkb18/jdk/src/share/demo/jvmti/minst/sample.makefile.txt 2007-08-16 03:33:21.000000000 -0400 -+++ openjdk/jdk/src/share/demo/jvmti/minst/sample.makefile.txt 2007-08-24 15:16:17.000000000 -0400 -@@ -41,13 +41,15 @@ - # - ######################################################################## - -+JAVA_CRW_DEMO=../../java_crw_demo/src/libjava_crw_demo.so -+ - # Source lists - LIBNAME=minst --SOURCES=minst.c ../agent_util/agent_util.c -+SOURCES=minst.c ../../agent_util/src/agent_util.c - JAVA_SOURCES=Minst.java - - # Name of jar file that needs to be created --JARFILE=minst.jar -+JARFILE=../minst.jar - - # Solaris Sun C Compiler Version 5.5 - ifeq ($(OSNAME), solaris) -@@ -93,10 +95,10 @@ - # Object files needed to create library - OBJECTS=$(SOURCES:%.c=%.o) - # Library name and options needed to build it -- LIBRARY=lib$(LIBNAME).so -+ LIBRARY=../lib/lib$(LIBNAME).so - LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text - # Libraries we are dependent on -- LIBRARIES=-L $(JDK)/jre/lib/$(LIBARCH) -ljava_crw_demo -lc -+ LIBRARIES=-L../../java_crw_demo/src/ -ljava_crw_demo -lc - # Building a shared library - LINK_SHARED=$(LINK.c) -shared -o $@ - endif -@@ -128,15 +130,18 @@ - - # Common -I options - CFLAGS += -I. --CFLAGS += -I../agent_util --CFLAGS += -I../java_crw_demo -+CFLAGS += -I../../agent_util/src -+CFLAGS += -I../../java_crw_demo/src - CFLAGS += -I$(JDK)/include -I$(JDK)/include/$(OSNAME) - - # Default rule (build both native library and jar file) - all: $(LIBRARY) $(JARFILE) - -+$(JAVA_CRW_DEMO): -+ make JDK=$(JDK) OSNAME=$(OSNAME) -C ../../java_crw_demo/src -f sample.makefile.txt -+ - # Build native library --$(LIBRARY): $(OBJECTS) -+$(LIBRARY): $(OBJECTS) $(JAVA_CRW_DEMO) - $(LINK_SHARED) $(OBJECTS) $(LIBRARIES) - - # Build jar file ---- openjdkb18/jdk/src/share/demo/jvmti/mtrace/sample.makefile.txt 2007-08-16 03:33:21.000000000 -0400 -+++ openjdk/jdk/src/share/demo/jvmti/mtrace/sample.makefile.txt 2007-08-24 15:16:01.000000000 -0400 -@@ -41,13 +41,15 @@ - # - ######################################################################## - -+JAVA_CRW_DEMO=../../java_crw_demo/src/libjava_crw_demo.so -+ - # Source lists - LIBNAME=mtrace --SOURCES=mtrace.c ../agent_util/agent_util.c -+SOURCES=mtrace.c ../../agent_util/src/agent_util.c - JAVA_SOURCES=Mtrace.java - - # Name of jar file that needs to be created --JARFILE=mtrace.jar -+JARFILE=../mtrace.jar - - # Solaris Sun C Compiler Version 5.5 - ifeq ($(OSNAME), solaris) -@@ -93,10 +95,11 @@ - # Object files needed to create library - OBJECTS=$(SOURCES:%.c=%.o) - # Library name and options needed to build it -- LIBRARY=lib$(LIBNAME).so -+ LIBRARY=../lib/lib$(LIBNAME).so - LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text - # Libraries we are dependent on -- LIBRARIES=-L $(JDK)/jre/lib/$(LIBARCH) -ljava_crw_demo -lc -+ LIBRARIES=-L../../java_crw_demo/src -ljava_crw_demo -lc -+ - # Building a shared library - LINK_SHARED=$(LINK.c) -shared -o $@ - endif -@@ -128,15 +131,18 @@ - - # Common -I options - CFLAGS += -I. --CFLAGS += -I../agent_util --CFLAGS += -I../java_crw_demo -+CFLAGS += -I../../agent_util/src -+CFLAGS += -I../../java_crw_demo/src - CFLAGS += -I$(JDK)/include -I$(JDK)/include/$(OSNAME) - - # Default rule (build both native library and jar file) - all: $(LIBRARY) $(JARFILE) - -+$(JAVA_CRW_DEMO): -+ make JDK=$(JDK) OSNAME=$(OSNAME) -C ../../java_crw_demo/src -f sample.makefile.txt -+ - # Build native library --$(LIBRARY): $(OBJECTS) -+$(LIBRARY): $(OBJECTS) $(JAVA_CRW_DEMO) - $(LINK_SHARED) $(OBJECTS) $(LIBRARIES) - - # Build jar file ---- openjdkb18/jdk/src/share/demo/jvmti/versionCheck/sample.makefile.txt 2007-08-16 03:33:21.000000000 -0400 -+++ openjdk/jdk/src/share/demo/jvmti/versionCheck/sample.makefile.txt 2007-08-23 16:12:58.000000000 -0400 -@@ -43,7 +43,7 @@ - - # Source lists - LIBNAME=versionCheck --SOURCES=versionCheck.c ../agent_util/agent_util.c -+SOURCES=versionCheck.c ../../agent_util/src/agent_util.c - - # Solaris Sun C Compiler Version 5.5 - ifeq ($(OSNAME), solaris) -@@ -89,7 +89,7 @@ - # Object files needed to create library - OBJECTS=$(SOURCES:%.c=%.o) - # Library name and options needed to build it -- LIBRARY=lib$(LIBNAME).so -+ LIBRARY=../lib/lib$(LIBNAME).so - LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text - # Libraries we are dependent on - LIBRARIES=-lc -@@ -122,7 +122,7 @@ - - # Common -I options - CFLAGS += -I. --CFLAGS += -I../agent_util -+CFLAGS += -I../../agent_util/src - CFLAGS += -I$(JDK)/include -I$(JDK)/include/$(OSNAME) - - # Default rule ---- openjdkb18/jdk/src/share/demo/jvmti/waiters/sample.makefile.txt 2007-08-16 03:33:21.000000000 -0400 -+++ openjdk/jdk/src/share/demo/jvmti/waiters/sample.makefile.txt 2007-08-23 16:13:06.000000000 -0400 -@@ -43,7 +43,7 @@ - - # Source lists - LIBNAME=waiters --SOURCES=waiters.cpp Agent.cpp Thread.cpp Monitor.cpp ../agent_util/agent_util.c -+SOURCES=waiters.cpp Agent.cpp Thread.cpp Monitor.cpp - - # Solaris Sun C Compiler Version 5.5 - ifeq ($(OSNAME), solaris) -@@ -89,9 +89,10 @@ - endif - # Object files needed to create library - OBJECTS=$(SOURCES:%.cpp=%.o) -+ OBJECTS+=../../agent_util/src/agent_util.o - # Library name and options needed to build it -- LIBRARY=lib$(LIBNAME).so -- LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text -+ LIBRARY=../lib/lib$(LIBNAME).so -+ LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc - # Libraries we are dependent on - LIBRARIES= - # Building a shared library -@@ -123,9 +124,10 @@ - - # Common -I options - CXXFLAGS += -I. --CXXFLAGS += -I../agent_util -+CXXFLAGS += -I../../agent_util/src - CXXFLAGS += -I$(JDK)/include -I$(JDK)/include/$(OSNAME) - -+CFLAGS = $(CXXFLAGS) - # Default rule - all: $(LIBRARY) - diff -r 05dda6fb5ced -r 05b8c708dced patches/gcc-suffix.patch --- a/patches/gcc-suffix.patch Fri Jul 29 00:04:28 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,61 +0,0 @@ -diff -Nru openjdk.orig/jdk/make/common/shared/Compiler-gcc.gmk openjdk/jdk/make/common/shared/Compiler-gcc.gmk ---- openjdk.orig/jdk/make/common/shared/Compiler-gcc.gmk 2011-03-29 14:22:49.000000000 +0100 -+++ openjdk/jdk/make/common/shared/Compiler-gcc.gmk 2011-03-29 23:34:00.169408541 +0100 -@@ -54,8 +54,8 @@ - ifeq ($(PLATFORM), linux) - - # Settings specific to Linux -- CC = $(COMPILER_PATH)gcc -- CPP = $(COMPILER_PATH)gcc -E -+ CC = $(COMPILER_PATH)gcc$(GCC_SUFFIX) -+ CPP = $(COMPILER_PATH)gcc$(GCC_SUFFIX) -E - # statically link libstdc++ before C++ ABI is stablized on Linux - ifneq ($(STATIC_CXX),false) - STATIC_CXX = true -@@ -64,9 +64,9 @@ - # 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 -+ CXX = $(COMPILER_PATH)gcc$(GCC_SUFFIX) - else -- CXX = $(COMPILER_PATH)g++ -+ CXX = $(COMPILER_PATH)g++$(GCC_SUFFIX) - endif - # Option used to create a shared library - SHARED_LIBRARY_FLAG = -shared -mimpure-text -diff -Nru openjdk.orig/hotspot/agent/src/os/linux/Makefile openjdk/hotspot/agent/src/os/linux/Makefile ---- openjdk.orig/hotspot/agent/src/os/linux/Makefile 2010-07-29 21:54:38.000000000 +0100 -+++ openjdk/hotspot/agent/src/os/linux/Makefile 2011-04-21 00:04:10.990086029 +0100 -@@ -23,7 +23,7 @@ - # - - ARCH := $(shell if ([ `uname -m` = "ia64" ]) ; then echo ia64 ; elif ([ `uname -m` = "x86_64" ]) ; then echo amd64; elif ([ `uname -m` = "sparc64" ]) ; then echo sparc; else echo i386 ; fi ) --GCC = gcc -+GCC = gcc$(GCC_SUFFIX) - - JAVAH = ${JAVA_HOME}/bin/javah - -diff -Nru openjdk.orig/hotspot/make/linux/makefiles/gcc.make openjdk/hotspot/make/linux/makefiles/gcc.make ---- openjdk.orig/hotspot/make/linux/makefiles/gcc.make 2011-04-20 12:06:06.000000000 +0100 -+++ openjdk/hotspot/make/linux/makefiles/gcc.make 2011-04-21 01:00:54.300899166 +0100 -@@ -28,13 +28,13 @@ - # When cross-compiling the ALT_COMPILER_PATH points - # to the cross-compilation toolset - ifdef CROSS_COMPILE_ARCH --CPP = $(ALT_COMPILER_PATH)/g++ --CC = $(ALT_COMPILER_PATH)/gcc --HOSTCPP = g++ --HOSTCC = gcc -+CPP = $(ALT_COMPILER_PATH)/g++$(GCC_SUFFIX) -+CC = $(ALT_COMPILER_PATH)/gcc$(GCC_SUFFIX) -+HOSTCPP = g++$(GCC_SUFFIX) -+HOSTCC = gcc$(GCC_SUFFIX) - else --CPP = g++ --CC = gcc -+CPP = g++$(GCC_SUFFIX) -+CC = gcc$(GCC_SUFFIX) - HOSTCPP = $(CPP) - HOSTCC = $(CC) - endif diff -r 05dda6fb5ced -r 05b8c708dced patches/headers.patch --- a/patches/headers.patch Fri Jul 29 00:04:28 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,39 +0,0 @@ -diff -Nru openjdk.orig/jdk/make/sun/font/Makefile openjdk/jdk/make/sun/font/Makefile ---- openjdk.orig/jdk/make/sun/font/Makefile 2010-02-12 08:15:45.000000000 +0000 -+++ openjdk/jdk/make/sun/font/Makefile 2010-02-19 18:26:43.000000000 +0000 -@@ -129,7 +129,7 @@ - ifeq ($(USING_SYSTEM_FT_LIB), false) - FREETYPE_LIB = $(LIB_LOCATION)/$(LIB_PREFIX)freetype.$(LIBRARY_SUFFIX).6 - endif -- OTHER_LDLIBS += -L$(FREETYPE_LIB_PATH) -lfreetype -+ OTHER_LDLIBS += -L$(FREETYPE_LIB_PATH) $(FT2_LIB) - endif - - library:: $(FREETYPE_LIB) -@@ -159,11 +159,13 @@ - # - CFLAGS += -DHEADLESS - CXXFLAGS += -DHEADLESS -+FREETYPE_HEADERS=$(shell $(ECHO) \"$(FREETYPE2_HEADERS)\" | grep -o .I.*[a\-z]) - - ifndef OPENJDK - CPPFLAGS += -I$(CLOSED_SRC)/share/native/$(PKGDIR)/t2k - else -- CPPFLAGS += -I$(FREETYPE_HEADERS_PATH) -I$(FREETYPE_HEADERS_PATH)/freetype2 -+ CPPFLAGS += $(FREETYPE_HEADERS) $(FREETYPE_HEADERS)/freetype2 \ -+ -I$(FREETYPE_HEADERS_PATH) -I$(FREETYPE_HEADERS_PATH)/freetype2 - endif - - ifeq ($(PLATFORM), windows) -diff -Nru openjdk.orig/jdk/make/tools/freetypecheck/Makefile openjdk/jdk/make/tools/freetypecheck/Makefile ---- openjdk.orig/jdk/make/tools/freetypecheck/Makefile 2009-12-04 23:26:49.000000000 +0000 -+++ openjdk/jdk/make/tools/freetypecheck/Makefile 2010-02-19 18:08:00.000000000 +0000 -@@ -50,7 +50,7 @@ - ifeq ($(PLATFORM), solaris) - FT_LD_OPTIONS += -R $(FREETYPE_LIB_PATH) -lfreetype - else #linux -- FT_LD_OPTIONS += -Wl,-rpath -Wl,$(FREETYPE_LIB_PATH) -lfreetype -+ FT_LD_OPTIONS += -Wl,-rpath -Wl,$(FREETYPE_LIB_PATH) $(FT2_LIB) - endif - endif - FT_OPTIONS += -I$(FREETYPE_HEADERS_PATH) diff -r 05dda6fb5ced -r 05b8c708dced patches/jpegclasses.patch --- a/patches/jpegclasses.patch Fri Jul 29 00:04:28 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,647 +0,0 @@ -diff -ruN openjdkold/jdk/src/share/classes/com/sun/image/codec/jpeg/ImageFormatException.java openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/ImageFormatException.java ---- openjdkold/jdk/src/share/classes/com/sun/image/codec/jpeg/ImageFormatException.java 1969-12-31 19:00:00.000000000 -0500 -+++ openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/ImageFormatException.java 2008-03-31 18:04:57.000000000 -0400 -@@ -0,0 +1,51 @@ -+/* ImageFormatException.java -+ Copyright (C) 2007 Matthew Flaschen -+ -+ This file is part of IcedTea -+ -+ IcedTea is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ IcedTea is distributed in the hope that it will be useful, but -+ WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with GNU Classpath; see the file COPYING. If not, write to the -+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -+ 02110-1301 USA. -+ -+ Linking this library statically or dynamically with other modules is -+ making a combined work based on this library. Thus, the terms and -+ conditions of the GNU General Public License cover the whole -+ combination. -+ -+ As a special exception, the copyright holders of this library give you -+ permission to link this library with independent modules to produce an -+ executable, regardless of the license terms of these independent -+ modules, and to copy and distribute the resulting executable under -+ terms of your choice, provided that you also meet, for each linked -+ independent module, the terms and conditions of the license of that -+ module. An independent module is a module which is not derived from -+ or based on this library. If you modify this library, you may extend -+ this exception to your version of the library, but you are not -+ obligated to do so. If you do not wish to do so, delete this -+ exception statement from your version. */ -+ -+package com.sun.image.codec.jpeg; -+ -+public class ImageFormatException extends RuntimeException -+{ -+ public ImageFormatException() -+ { -+ this(""); -+ } -+ -+ public ImageFormatException(String s) -+ { -+ super(s); -+ } -+} -diff -ruN openjdkold/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGCodec.java openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGCodec.java ---- openjdkold/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGCodec.java 1969-12-31 19:00:00.000000000 -0500 -+++ openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGCodec.java 2008-03-31 18:04:57.000000000 -0400 -@@ -0,0 +1,146 @@ -+/* JPEGCodec.java -- -+ Copyright (C) 2007 Free Software Foundation, Inc. -+ Copyright (C) 2007 Matthew Flaschen -+ -+ This file is part of GNU Classpath. -+ -+ GNU Classpath is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ GNU Classpath is distributed in the hope that it will be useful, but -+ WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with GNU Classpath; see the file COPYING. If not, write to the -+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -+ 02110-1301 USA. -+ -+ Linking this library statically or dynamically with other modules is -+ making a combined work based on this library. Thus, the terms and -+ conditions of the GNU General Public License cover the whole -+ combination. -+ -+ As a special exception, the copyright holders of this library give you -+ permission to link this library with independent modules to produce an -+ executable, regardless of the license terms of these independent -+ modules, and to copy and distribute the resulting executable under -+ terms of your choice, provided that you also meet, for each linked -+ independent module, the terms and conditions of the license of that -+ module. An independent module is a module which is not derived from -+ or based on this library. If you modify this library, you may extend -+ this exception to your version of the library, but you are not -+ obligated to do so. If you do not wish to do so, delete this -+ exception statement from your version. */ -+ -+package com.sun.image.codec.jpeg; -+ -+import java.io.InputStream; -+import java.io.OutputStream; -+import java.io.IOException; -+ -+import java.awt.image.BufferedImage; -+import java.awt.image.Raster; -+ -+import javax.imageio.*; -+import javax.imageio.stream.*; -+import javax.imageio.plugins.jpeg.*; -+ -+import java.util.Iterator; -+ -+public class JPEGCodec -+{ -+ -+ public static JPEGImageDecoder createJPEGDecoder(InputStream is) -+ { -+ return new ImageIOJPEGImageDecoder(is); -+ } -+ -+ public static JPEGImageEncoder createJPEGEncoder(OutputStream os) -+ { -+ return null; -+ } -+ -+ public static JPEGImageDecoder createJPEGDecoder(InputStream src, JPEGDecodeParam jdp) -+ { -+ return null; -+ } -+ -+ public static JPEGImageEncoder createJPEGEncoder(OutputStream dest, JPEGEncodeParam jep) -+ { -+ return null; -+ } -+ -+ public static JPEGEncodeParam getDefaultJPEGEncodeParam(BufferedImage bi) -+ { -+ return null; -+ } -+ -+ public static JPEGEncodeParam getDefaultJPEGEncodeParam(int numBands, int colorID) -+ { -+ return null; -+ } -+ -+ public static JPEGEncodeParam getDefaultJPEGEncodeParam(JPEGDecodeParam jdp) -+ { -+ return null; -+ } -+ -+ public static JPEGEncodeParam getDefaultJPEGEncodeParam(Raster ras, int colorID) -+ { -+ return null; -+ } -+ -+ -+ private static class ImageIOJPEGImageDecoder implements JPEGImageDecoder -+ { -+ -+ private static final String JPGMime = "image/jpeg"; -+ -+ private ImageReader JPGReader; -+ -+ private InputStream in; -+ -+ private ImageIOJPEGImageDecoder (InputStream newIs) -+ { -+ in = newIs; -+ -+ Iterator JPGReaderIter = ImageIO.getImageReadersByMIMEType(JPGMime); -+ if(JPGReaderIter.hasNext()) -+ { -+ JPGReader = JPGReaderIter.next(); -+ } -+ -+ JPGReader.setInput(new MemoryCacheImageInputStream(in)); -+ } -+ -+ public BufferedImage decodeAsBufferedImage() throws IOException, ImageFormatException -+ { -+ return JPGReader.read(0); -+ } -+ -+ public Raster decodeAsRaster() throws IOException, ImageFormatException -+ { -+ return JPGReader.readRaster(0, null); -+ } -+ -+ public InputStream getInputStream() -+ { -+ return in; -+ } -+ -+ public JPEGDecodeParam getJPEGDecodeParam() -+ { -+ return null; -+ } -+ -+ public void setJPEGDecodeParam(JPEGDecodeParam jdp) -+ { -+ return; -+ } -+ -+ } -+} -diff -ruN openjdkold/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGDecodeParam.java openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGDecodeParam.java ---- openjdkold/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGDecodeParam.java 1969-12-31 19:00:00.000000000 -0500 -+++ openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGDecodeParam.java 2008-03-31 18:04:57.000000000 -0400 -@@ -0,0 +1,50 @@ -+/* JPEGImageDecoder.java -- -+ Copyright (C) 2007 Free Software Foundation, Inc. -+ Copyright (C) 2007 Matthew Flaschen -+ -+ This file is part of GNU Classpath. -+ -+ GNU Classpath is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ GNU Classpath is distributed in the hope that it will be useful, but -+ WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with GNU Classpath; see the file COPYING. If not, write to the -+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -+ 02110-1301 USA. -+ -+ Linking this library statically or dynamically with other modules is -+ making a combined work based on this library. Thus, the terms and -+ conditions of the GNU General Public License cover the whole -+ combination. -+ -+ As a special exception, the copyright holders of this library give you -+ permission to link this library with independent modules to produce an -+ executable, regardless of the license terms of these independent -+ modules, and to copy and distribute the resulting executable under -+ terms of your choice, provided that you also meet, for each linked -+ independent module, the terms and conditions of the license of that -+ module. An independent module is a module which is not derived from -+ or based on this library. If you modify this library, you may extend -+ this exception to your version of the library, but you are not -+ obligated to do so. If you do not wish to do so, delete this -+ exception statement from your version. */ -+ -+package com.sun.image.codec.jpeg; -+ -+public interface JPEGDecodeParam -+{ -+ -+ public static final int COLOR_ID_UNKNOWN = 0; -+ public static final int COLOR_ID_RGBA = 1; -+ public static final int COLOR_ID_RGB = 2; -+ public static final int COLOR_ID_GRAY = 3; -+ public static final int COLOR_ID_YCbCrA = 4; -+ public static final int COLOR_ID_YCbCr = 5; -+} -diff -ruN openjdkold/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGEncodeParam.java openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGEncodeParam.java ---- openjdkold/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGEncodeParam.java 1969-12-31 19:00:00.000000000 -0500 -+++ openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGEncodeParam.java 2008-03-31 18:04:57.000000000 -0400 -@@ -0,0 +1,139 @@ -+/* JPEGEncodeParam.java -- -+ Copyright (C) 2007 Free Software Foundation, Inc. -+ -+ This file is part of GNU Classpath. -+ -+ GNU Classpath is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ GNU Classpath is distributed in the hope that it will be useful, but -+ WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with GNU Classpath; see the file COPYING. If not, write to the -+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -+ 02110-1301 USA. -+ -+ Linking this library statically or dynamically with other modules is -+ making a combined work based on this library. Thus, the terms and -+ conditions of the GNU General Public License cover the whole -+ combination. -+ -+ As a special exception, the copyright holders of this library give you -+ permission to link this library with independent modules to produce an -+ executable, regardless of the license terms of these independent -+ modules, and to copy and distribute the resulting executable under -+ terms of your choice, provided that you also meet, for each linked -+ independent module, the terms and conditions of the license of that -+ module. An independent module is a module which is not derived from -+ or based on this library. If you modify this library, you may extend -+ this exception to your version of the library, but you are not -+ obligated to do so. If you do not wish to do so, delete this -+ exception statement from your version. */ -+ -+package com.sun.image.codec.jpeg; -+ -+public class JPEGEncodeParam -+{ -+ public static final int COLOR_ID_UNKNOWN = 0; -+ public static final int COLOR_ID_RGBA = 1; -+ public static final int COLOR_ID_RGB = 2; -+ public static final int COLOR_ID_GRAY = 3; -+ public static final int COLOR_ID_YCbCrA = 4; -+ public static final int COLOR_ID_CMYK = 5; -+ public static final int COLOR_ID_YCbCr = 6; -+ -+ public JPEGEncodeParam() -+ { -+ } -+ -+ public void setQuality(float i, boolean b) -+ { -+ } -+ -+ public void setQuality(int i, boolean b) -+ { -+ } -+ -+ public JPEGEncodeParam clone() -+ { -+ return null; -+ } -+ -+ public void setTableInfoValid(boolean b) -+ { -+ } -+ -+ public void setImageInfoValid(boolean b) -+ { -+ } -+ -+ public int getHorizontalSubsampling(int i) -+ { -+ return 0; -+ } -+ -+ public int getVerticalSubsampling(int i) -+ { -+ return 0; -+ } -+ -+ public int getWidth() -+ { -+ return 0; -+ } -+ -+ public int getHeight() -+ { -+ return 0; -+ } -+ -+ public int getDensityUnit() -+ { -+ return 0; -+ } -+ -+ public int getXDensity() -+ { -+ return 0; -+ } -+ -+ public int getYDensity() -+ { -+ return 0; -+ } -+ -+ public int getRestartInterval() -+ { -+ return 0; -+ } -+ -+ public JPEGQTable getQTable(int i) -+ { -+ return new JPEGQTable(); -+ } -+ -+ public void setDensityUnit(int i) -+ { -+ } -+ -+ public void setXDensity(int i) -+ { -+ } -+ -+ public void setYDensity(int i) -+ { -+ } -+ -+ public void setRestartInterval(int i) -+ { -+ } -+ -+ public void setQTable(int i, JPEGQTable jqt) -+ { -+ } -+} -diff -ruN openjdkold/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGImageDecoder.java openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGImageDecoder.java ---- openjdkold/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGImageDecoder.java 1969-12-31 19:00:00.000000000 -0500 -+++ openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGImageDecoder.java 2008-03-31 18:04:57.000000000 -0400 -@@ -0,0 +1,60 @@ -+/* JPEGImageDecoder.java -- -+ Copyright (C) 2007 Free Software Foundation, Inc. -+ Copyright (C) 2007 Matthew Flaschen -+ -+ This file is part of GNU Classpath. -+ -+ GNU Classpath is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ GNU Classpath is distributed in the hope that it will be useful, but -+ WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with GNU Classpath; see the file COPYING. If not, write to the -+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -+ 02110-1301 USA. -+ -+ Linking this library statically or dynamically with other modules is -+ making a combined work based on this library. Thus, the terms and -+ conditions of the GNU General Public License cover the whole -+ combination. -+ -+ As a special exception, the copyright holders of this library give you -+ permission to link this library with independent modules to produce an -+ executable, regardless of the license terms of these independent -+ modules, and to copy and distribute the resulting executable under -+ terms of your choice, provided that you also meet, for each linked -+ independent module, the terms and conditions of the license of that -+ module. An independent module is a module which is not derived from -+ or based on this library. If you modify this library, you may extend -+ this exception to your version of the library, but you are not -+ obligated to do so. If you do not wish to do so, delete this -+ exception statement from your version. */ -+ -+ -+package com.sun.image.codec.jpeg; -+import java.awt.image.BufferedImage; -+import java.awt.image.Raster; -+ -+import java.io.InputStream; -+import java.io.IOException; -+ -+ -+public interface JPEGImageDecoder -+{ -+ -+ public BufferedImage decodeAsBufferedImage() throws IOException, ImageFormatException; -+ -+ public Raster decodeAsRaster() throws IOException, ImageFormatException; -+ -+ public InputStream getInputStream(); -+ -+ public JPEGDecodeParam getJPEGDecodeParam(); -+ -+ public void setJPEGDecodeParam(JPEGDecodeParam jdp); -+} -diff -ruN openjdkold/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGImageEncoder.java openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGImageEncoder.java ---- openjdkold/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGImageEncoder.java 1969-12-31 19:00:00.000000000 -0500 -+++ openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGImageEncoder.java 2008-03-31 18:04:57.000000000 -0400 -@@ -0,0 +1,67 @@ -+/* JPEGImageEncoder.java -- -+ Copyright (C) 2007 Free Software Foundation, Inc. -+ -+ This file is part of GNU Classpath. -+ -+ GNU Classpath is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ GNU Classpath is distributed in the hope that it will be useful, but -+ WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with GNU Classpath; see the file COPYING. If not, write to the -+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -+ 02110-1301 USA. -+ -+ Linking this library statically or dynamically with other modules is -+ making a combined work based on this library. Thus, the terms and -+ conditions of the GNU General Public License cover the whole -+ combination. -+ -+ As a special exception, the copyright holders of this library give you -+ permission to link this library with independent modules to produce an -+ executable, regardless of the license terms of these independent -+ modules, and to copy and distribute the resulting executable under -+ terms of your choice, provided that you also meet, for each linked -+ independent module, the terms and conditions of the license of that -+ module. An independent module is a module which is not derived from -+ or based on this library. If you modify this library, you may extend -+ this exception to your version of the library, but you are not -+ obligated to do so. If you do not wish to do so, delete this -+ exception statement from your version. */ -+ -+package com.sun.image.codec.jpeg; -+ -+import com.sun.image.codec.jpeg.*; -+import java.awt.image.BufferedImage; -+import java.awt.image.Raster; -+ -+public class JPEGImageEncoder -+{ -+ public JPEGImageEncoder() -+ { -+ } -+ -+ public JPEGEncodeParam getDefaultJPEGEncodeParam(BufferedImage bi) -+ { -+ return null; -+ } -+ -+ public void encode(BufferedImage bi, JPEGEncodeParam p) -+ { -+ } -+ -+ public void encode(Raster bi) -+ { -+ } -+ -+ public void encode(BufferedImage bi) -+ { -+ } -+ -+} -diff -ruN openjdkold/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGQTable.java openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGQTable.java ---- openjdkold/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGQTable.java 1969-12-31 19:00:00.000000000 -0500 -+++ openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGQTable.java 2008-03-31 18:04:57.000000000 -0400 -@@ -0,0 +1,44 @@ -+/* JPEGQTable.java -- -+ Copyright (C) 2007 Free Software Foundation, Inc. -+ Copyright (C) 2007 Matthew Flaschen -+ -+ This file is part of GNU Classpath. -+ -+ GNU Classpath is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ GNU Classpath is distributed in the hope that it will be useful, but -+ WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with GNU Classpath; see the file COPYING. If not, write to the -+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -+ 02110-1301 USA. -+ -+ Linking this library statically or dynamically with other modules is -+ making a combined work based on this library. Thus, the terms and -+ conditions of the GNU General Public License cover the whole -+ combination. -+ -+ As a special exception, the copyright holders of this library give you -+ permission to link this library with independent modules to produce an -+ executable, regardless of the license terms of these independent -+ modules, and to copy and distribute the resulting executable under -+ terms of your choice, provided that you also meet, for each linked -+ independent module, the terms and conditions of the license of that -+ module. An independent module is a module which is not derived from -+ or based on this library. If you modify this library, you may extend -+ this exception to your version of the library, but you are not -+ obligated to do so. If you do not wish to do so, delete this -+ exception statement from your version. */ -+ -+package com.sun.image.codec.jpeg; -+ -+public class JPEGQTable -+{ -+ -+} -diff -ruN openjdkold/jdk/src/share/classes/com/sun/image/codec/jpeg/TruncatedFileException.java openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/TruncatedFileException.java ---- openjdkold/jdk/src/share/classes/com/sun/image/codec/jpeg/TruncatedFileException.java 1969-12-31 19:00:00.000000000 -0500 -+++ openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/TruncatedFileException.java 2008-03-31 19:38:37.000000000 -0400 -@@ -0,0 +1,58 @@ -+/* TruncatedFileException.java -+ Copyright (C) 2007 Matthew Flaschen -+ -+ This file is part of IcedTea -+ -+ IcedTea is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ IcedTea is distributed in the hope that it will be useful, but -+ WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with GNU Classpath; see the file COPYING. If not, write to the -+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -+ 02110-1301 USA. -+ -+ Linking this library statically or dynamically with other modules is -+ making a combined work based on this library. Thus, the terms and -+ conditions of the GNU General Public License cover the whole -+ combination. -+ -+ As a special exception, the copyright holders of this library give you -+ permission to link this library with independent modules to produce an -+ executable, regardless of the license terms of these independent -+ modules, and to copy and distribute the resulting executable under -+ terms of your choice, provided that you also meet, for each linked -+ independent module, the terms and conditions of the license of that -+ module. An independent module is a module which is not derived from -+ or based on this library. If you modify this library, you may extend -+ this exception to your version of the library, but you are not -+ obligated to do so. If you do not wish to do so, delete this -+ exception statement from your version. */ -+ -+package com.sun.image.codec.jpeg; -+ -+import java.awt.image.BufferedImage; -+ -+public class TruncatedFileException extends RuntimeException -+{ -+ public TruncatedFileException() -+ { -+ this(""); -+ } -+ -+ public TruncatedFileException(String s) -+ { -+ super(s); -+ } -+ -+ public BufferedImage getBufferedImage() -+ { -+ return null; -+ } -+} diff -r 05dda6fb5ced -r 05b8c708dced patches/memory-limits.patch --- a/patches/memory-limits.patch Fri Jul 29 00:04:28 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,24 +0,0 @@ -diff -Nru openjdk.orig/hotspot/src/cpu/x86/vm/c2_globals_x86.hpp openjdk/hotspot/src/cpu/x86/vm/c2_globals_x86.hpp ---- openjdk.orig/hotspot/src/cpu/x86/vm/c2_globals_x86.hpp 2010-01-15 17:37:38.000000000 +0000 -+++ openjdk/hotspot/src/cpu/x86/vm/c2_globals_x86.hpp 2010-02-22 12:46:31.000000000 +0000 -@@ -95,7 +95,7 @@ - - // Heap related flags - define_pd_global(uintx,PermSize, ScaleForWordSize(16*M)); --define_pd_global(uintx,MaxPermSize, ScaleForWordSize(64*M)); -+define_pd_global(uintx,MaxPermSize, ScaleForWordSize(128*M)); - - // Ergonomics related flags - define_pd_global(bool, NeverActAsServerClassMachine, false); -diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/globals.hpp openjdk/hotspot/src/share/vm/runtime/globals.hpp ---- openjdk.orig/hotspot/src/share/vm/runtime/globals.hpp 2010-02-19 17:14:39.000000000 +0000 -+++ openjdk/hotspot/src/share/vm/runtime/globals.hpp 2010-02-22 12:46:54.000000000 +0000 -@@ -2919,7 +2919,7 @@ - product(uintx, InitialHeapSize, 0, \ - "Initial heap size (in bytes); zero means OldSize + NewSize") \ - \ -- product(uintx, MaxHeapSize, ScaleForWordSize(96*M), \ -+ product(uintx, MaxHeapSize, ScaleForWordSize(512*M), \ - "Maximum heap size (in bytes)") \ - \ - product(uintx, OldSize, ScaleForWordSize(4*M), \ diff -r 05dda6fb5ced -r 05b8c708dced patches/print-lsb-release.patch --- a/patches/print-lsb-release.patch Fri Jul 29 00:04:28 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,49 +0,0 @@ -diff -Nru openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp ---- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp 2010-08-27 19:15:27.000000000 +0100 -+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2010-08-31 18:50:26.191830872 +0100 -@@ -1888,6 +1888,37 @@ - return true; - } - -+bool _print_lsb_file(const char* filename, outputStream* st) { -+ int fd = open(filename, O_RDONLY); -+ if (fd == -1) { -+ return false; -+ } -+ -+ char buf[512], *d_i, *d_r, *d_c; -+ int bytes; -+ -+ if ((bytes = read(fd, buf, sizeof(buf)-1)) == sizeof(buf)-1) { -+ close(fd); -+ return false; -+ } -+ close(fd); -+ -+ buf[bytes] = '\n'; -+ buf[bytes+1] = '\0'; -+ d_i = strstr(buf, "DISTRIB_ID="); -+ d_r = strstr(buf, "DISTRIB_RELEASE="); -+ d_c = strstr(buf, "DISTRIB_CODENAME="); -+ if (!d_i || !d_r || !d_c) { -+ return false; -+ } -+ d_i = strchr(d_i, '=') + 1; *strchrnul(d_i, '\n') = '\0'; -+ d_r = strchr(d_r, '=') + 1; *strchrnul(d_r, '\n') = '\0'; -+ d_c = strchr(d_c, '=') + 1; *strchrnul(d_c, '\n') = '\0'; -+ st->print("%s %s (%s)", d_i, d_r, d_c); -+ -+ return true; -+} -+ - void os::print_dll_info(outputStream *st) { - st->print_cr("Dynamic libraries:"); - -@@ -1916,6 +1947,7 @@ - !_print_ascii_file("/etc/SuSE-release", st) && - !_print_ascii_file("/etc/turbolinux-release", st) && - !_print_ascii_file("/etc/gentoo-release", st) && -+ !_print_lsb_file("/etc/lsb-release", st) && - !_print_ascii_file("/etc/debian_version", st) && - !_print_ascii_file("/etc/ltib-release", st) && - !_print_ascii_file("/etc/angstrom-version", st)) { diff -r 05dda6fb5ced -r 05b8c708dced patches/sunsrc.patch --- a/patches/sunsrc.patch Fri Jul 29 00:04:28 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,59 +0,0 @@ -diff -Nru openjdk.orig/jdk/make/common/Release.gmk openjdk/jdk/make/common/Release.gmk ---- openjdk.orig/jdk/make/common/Release.gmk 2010-08-27 19:16:10.000000000 +0100 -+++ openjdk/jdk/make/common/Release.gmk 2010-08-31 18:26:34.688231634 +0100 -@@ -345,8 +345,6 @@ - # Bug 5008685 - exclude jconsole from sun/tools - # - TOOLS = \ -- META-INF/services/com.sun.jdi.connect.Connector \ -- META-INF/services/com.sun.jdi.connect.spi.TransportService \ - sun/tools/asm \ - sun/tools/jar \ - sun/tools/java \ -@@ -389,8 +387,6 @@ - com/sun/tools/corba \ - com/sun/tools/internal/xjc \ - com/sun/tools/internal/ws \ -- META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory \ -- META-INF/services/com.sun.tools.xjc.Plugin \ - com/sun/istack/internal/tools \ - com/sun/istack/internal/ws \ - com/sun/codemodel \ -@@ -401,7 +397,6 @@ - com/sun/xml/internal/dtdparser \ - com/sun/tools/jdi \ - com/sun/tools/script/shell \ -- META-INF/services/com.sun.tools.attach.spi.AttachProvider \ - com/sun/tools/attach \ - sun/tools/attach \ - sun/tools/jstack \ -@@ -565,10 +560,6 @@ - $(ECHO) "com/sun/source/" >> $@ - $(ECHO) "com/sun/istack/internal/tools/" >> $@ - $(ECHO) "com/sun/istack/internal/ws/" >> $@ -- $(ECHO) "META-INF/services/com.sun.jdi.connect.Connector" >> $@ -- $(ECHO) "META-INF/services/com.sun.jdi.connect.spi.TransportService" >> $@ -- $(ECHO) "META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory" >> $@ -- $(ECHO) "META-INF/services/com.sun.tools.xjc.Plugin" >> $@ - $(ECHO) "com/sun/tools/" >> $@ - $(ECHO) "sun/jvmstat/" >> $@ - $(ECHO) "sun/nio/cs/ext/" >> $@ -@@ -611,7 +602,6 @@ - $(ECHO) "javax/crypto/" >> $@ - $(ECHO) "sun/security/internal/" >> $@ - $(ECHO) "com/sun/crypto/provider/" >> $@ -- $(ECHO) "META-INF/services/com.sun.tools.attach.spi.AttachProvider" >> $@ - $(ECHO) "com/sun/tools/attach/" >> $@ - $(ECHO) "org/relaxng/datatype/" >> $@ - $(ECHO) "com/sun/codemodel/" >> $@ -@@ -645,6 +635,10 @@ - $(BOOT_JAVA_CMD) -jar $(JARREORDER_JARFILE) \ - -o $@.temp $(ABS_LIBDIR)/classlist $(NOT_RT_JAR_LIST) . ) - $(MV) $@.temp $@ -+ $(CAT) $@ | $(GREP) "^sun" | $(GREP) "class" | $(GREP) -v '\$$' \ -+ > $(ABS_TEMPDIR)/sun_classes_list -+ sed 's/\.class/\.java/' < $(ABS_TEMPDIR)/sun_classes_list \ -+ > $(ABS_TEMPDIR)/sun_sources_list - @($(CD) $(CLASSBINDIR) && $(java-vm-cleanup)) - - # Create the rt.jar file list & non-class files list diff -r 05dda6fb5ced -r 05b8c708dced patches/text-relocations.patch --- a/patches/text-relocations.patch Fri Jul 29 00:04:28 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,63 +0,0 @@ -diff -Nru openjdk.orig/hotspot/make/linux/makefiles/gcc.make openjdk/hotspot/make/linux/makefiles/gcc.make ---- openjdk.orig/hotspot/make/linux/makefiles/gcc.make 2011-04-11 12:33:06.000000000 +0100 -+++ openjdk/hotspot/make/linux/makefiles/gcc.make 2011-04-11 13:31:35.116973986 +0100 -@@ -58,7 +58,11 @@ - # Compiler flags - - # position-independent code -+ifneq ($(filter parisc ppc ppc64 s390 s390x sparc sparc64 sparcv9,$(ZERO_LIBARCH)),) - PICFLAG = -fPIC -+else -+PICFLAG = -fpic -+endif - - VM_PICFLAG/LIBJVM = $(PICFLAG) - VM_PICFLAG/AOUT = -diff -Nru openjdk.orig/hotspot/make/linux/makefiles/rules.make openjdk/hotspot/make/linux/makefiles/rules.make ---- openjdk.orig/hotspot/make/linux/makefiles/rules.make 2011-04-11 12:33:06.000000000 +0100 -+++ openjdk/hotspot/make/linux/makefiles/rules.make 2011-04-11 13:31:35.128974182 +0100 -@@ -148,20 +148,10 @@ - - include $(GAMMADIR)/make/altsrc.make - --# The non-PIC object files are only generated for 32 bit platforms. --ifdef LP64 - %.o: %.cpp - @echo Compiling $< - $(QUIETLY) $(REMOVE_TARGET) - $(QUIETLY) $(COMPILE.CC) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE) --else --%.o: %.cpp -- @echo Compiling $< -- $(QUIETLY) $(REMOVE_TARGET) -- $(QUIETLY) $(if $(findstring $@, $(NONPIC_OBJ_FILES)), \ -- $(subst $(VM_PICFLAG), ,$(COMPILE.CC)) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE), \ -- $(COMPILE.CC) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE)) --endif - - %.o: %.s - @echo Assembling $< -diff -Nru openjdk.orig/hotspot/make/solaris/makefiles/rules.make openjdk/hotspot/make/solaris/makefiles/rules.make ---- openjdk.orig/hotspot/make/solaris/makefiles/rules.make 2011-04-11 12:33:06.000000000 +0100 -+++ openjdk/hotspot/make/solaris/makefiles/rules.make 2011-04-11 13:31:35.128974182 +0100 -@@ -148,20 +148,10 @@ - - include $(GAMMADIR)/make/altsrc.make - --# Sun compiler for 64 bit Solaris does not support building non-PIC object files. --ifdef LP64 - %.o: %.cpp - @echo Compiling $< - $(QUIETLY) $(REMOVE_TARGET) - $(QUIETLY) $(COMPILE.CC) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE) --else --%.o: %.cpp -- @echo Compiling $< -- $(QUIETLY) $(REMOVE_TARGET) -- $(QUIETLY) $(if $(findstring $@, $(NONPIC_OBJ_FILES)), \ -- $(subst $(VM_PICFLAG), ,$(COMPILE.CC)) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE), \ -- $(COMPILE.CC) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE)) --endif - - %.o: %.s - @echo Assembling $<