From 8a976fafa77f98c722966c331a7cff8764ca007b Mon Sep 17 00:00:00 2001
From: Joel Dice <joel.dice@gmail.com>
Date: Mon, 25 Feb 2013 16:55:44 -0700
Subject: [PATCH 1/2] fix avian-unittest openjdk-src build

---
 makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/makefile b/makefile
index e207d5f47c..eab0dee9f3 100755
--- a/makefile
+++ b/makefile
@@ -1582,7 +1582,8 @@ executable-objects = $(vm-objects) $(classpath-objects) $(driver-object) \
 	$(vm-heapwalk-objects) $(boot-object) $(vm-classpath-objects) \
 	$(javahome-object) $(boot-javahome-object) $(lzma-decode-objects)
 
-unittest-executable-objects = $(unittest-objects) $(vm-objects)
+unittest-executable-objects = $(unittest-objects) $(vm-objects) \
+	$(classpath-objects)
 
 ifeq ($(process),interpret)
 	unittest-executable-objects += $(all-codegen-target-objects)

From ce9bc520e1bd15da31fb7d67636b5d581f2c4822 Mon Sep 17 00:00:00 2001
From: Carsten Elton Sorensen <csoren@gmail.com>
Date: Wed, 27 Feb 2013 14:54:50 +0100
Subject: [PATCH 2/2] Keep java.net.SocketTimeoutException for OpenJDK

---
 openjdk.pro | 1 +
 1 file changed, 1 insertion(+)

diff --git a/openjdk.pro b/openjdk.pro
index 71bc20aadd..4ad548281d 100644
--- a/openjdk.pro
+++ b/openjdk.pro
@@ -136,6 +136,7 @@
    public InetSocketAddress(java.net.InetAddress, int);   
  }
 -keep class java.net.ServerSocket
+-keep class java.net.SocketTimeoutException
 
 -keepclassmembers class java.net.PlainSocketImpl {
    <fields>;