From 5f9a2a1b9bd629303bf5ff82e57a4061aaf70ab1 Mon Sep 17 00:00:00 2001
From: jet <jet@jetp.(none)>
Date: Wed, 2 Feb 2011 10:02:15 -0700
Subject: [PATCH 1/2] Added -marm flag to ARM cflags, as we don't support
 Thumb.

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

diff --git a/makefile b/makefile
index 5b34b5051b..9f75fbd8ec 100644
--- a/makefile
+++ b/makefile
@@ -196,7 +196,7 @@ endif
 ifeq ($(arch),arm)
 	asm = arm
 	pointer-size = 4
-	cflags += -Wno-psabi
+	cflags += -marm -Wno-psabi
 
 	ifneq ($(arch),$(build-arch))
 		cxx = arm-linux-gnueabi-g++

From a8645b6b2da383da98cff9ee31300291b31653be Mon Sep 17 00:00:00 2001
From: Joel Dice <joel.dice@gmail.com>
Date: Tue, 8 Feb 2011 18:56:25 -0700
Subject: [PATCH 2/2] fix BufferedInputStream.read regression

In commit 7fffba2, I had modified BufferedInputStream.read to keep
reading until in.available() <= 0 or an EOF was reached, but neglected
to update the offset into the destination buffer after each read.
This caused the previously-read data to be overwritten.  This commit
fixes that regression.
---
 classpath/java/io/BufferedInputStream.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/classpath/java/io/BufferedInputStream.java b/classpath/java/io/BufferedInputStream.java
index b20309fd51..67ac256a21 100644
--- a/classpath/java/io/BufferedInputStream.java
+++ b/classpath/java/io/BufferedInputStream.java
@@ -66,6 +66,7 @@ public class BufferedInputStream extends InputStream {
         }
         break;
       } else {
+        offset += c;
         count += c;
         length -= c;