Index: head/lang/gnatdroid-binutils/Makefile
===================================================================
--- head/lang/gnatdroid-binutils/Makefile	(revision 399108)
+++ head/lang/gnatdroid-binutils/Makefile	(revision 399109)
@@ -1,47 +1,47 @@
 # Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
 
-PORTNAME=		binutils
-PORTVERSION=		2.25
-CATEGORIES=		lang
-MASTER_SITES=		SOURCEWARE/binutils/releases
-PKGNAMEPREFIX=		gnatdroid-
+PORTNAME=	binutils
+PORTVERSION=	2.25.1
+CATEGORIES=	lang
+MASTER_SITES=	SOURCEWARE/binutils/releases
+PKGNAMEPREFIX=	gnatdroid-
 
 MAINTAINER=	marino@FreeBSD.org
 COMMENT=	Infrastructure for C/Ada Android cross-compiler
 
 LICENSE=	GPLv3 LGPL3
 LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	gnatdroid-sysroot>=19:${PORTSDIR}/lang/gnatdroid-sysroot \
 		${LOCALBASE}/lib/libgmp.so:${PORTSDIR}/math/gmp \
 		${LOCALBASE}/lib/libmpfr.so:${PORTSDIR}/math/mpfr
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		gmake tar:bzip2
 HAS_CONFIGURE=	yes
 NO_MTREE=	yes
 
 NO_LICENSES_INSTALL= yes
 
 WRKSRC=			${WRKDIR}/binutils-${PORTVERSION}
 PREFIX=			${LOCALBASE}/android
 BRANCH2=		ARMv7
 BR2_PREFIX=		${PREFIX}/${BRANCH2}
 ARMTARGET=		arm-aux-linux-androideabi
 PLIST_SUB+=		TARGET="${ARMTARGET}"
 PLIST_SUB+=		BRANCH2="${BRANCH2}"
 
 CONFIGURE_ARGS+=	--target=${ARMTARGET}
 CONFIGURE_ARGS+=	--prefix=${BR2_PREFIX}
 CONFIGURE_ARGS+=	--with-sysroot=${PREFIX}
 CONFIGURE_ARGS+=	--with-gmp=${LOCALBASE}
 CONFIGURE_ARGS+=	--with-mpfr=${LOCALBASE}
 CONFIGURE_ARGS+=	--disable-werror
 CONFIGURE_ARGS+=	--disable-nls
 
 post-install:
 #	Move the unwanted documentation out of the stage directory
 	${MV} ${STAGEDIR}${BR2_PREFIX}/share ${WRKDIR}
 
 .include <bsd.port.mk>
Index: head/lang/gnatdroid-binutils/distinfo
===================================================================
--- head/lang/gnatdroid-binutils/distinfo	(revision 399108)
+++ head/lang/gnatdroid-binutils/distinfo	(revision 399109)
@@ -1,2 +1,2 @@
-SHA256 (binutils-2.25.tar.bz2) = 22defc65cfa3ef2a3395faaea75d6331c6e62ea5dfacfed3e2ec17b08c882923
-SIZE (binutils-2.25.tar.bz2) = 24049133
+SHA256 (binutils-2.25.1.tar.bz2) = b5b14added7d78a8d1ca70b5cb75fef57ce2197264f4f5835326b0df22ac9f22
+SIZE (binutils-2.25.1.tar.bz2) = 24163561
Index: head/lang/gnatdroid-binutils/files/patch-gas__config__tc-arm.c
===================================================================
--- head/lang/gnatdroid-binutils/files/patch-gas__config__tc-arm.c	(revision 399108)
+++ head/lang/gnatdroid-binutils/files/patch-gas__config__tc-arm.c	(revision 399109)
@@ -1,17 +1,11 @@
-From d840c081f8082e8b9e63fead5306643975a97bb3 Mon Sep 17 00:00:00 2001
-From: Richard Earnshaw <Richard.Earnshaw@arm.com>
-Date: Thu, 20 Nov 2014 17:02:47 +0000
-Subject: [PATCH] * config/tc-arm.c (rotate_left): Avoid undefined behaviour
- when N = 0.
-
---- gas/config/tc-arm.c.orig	2014-10-14 09:32:03.000000000 +0200
-+++ gas/config/tc-arm.c	2015-02-18 21:13:40.720573000 +0100
-@@ -7251,7 +7251,7 @@
+--- gas/config/tc-arm.c.orig	2015-07-21 08:20:58 UTC
++++ gas/config/tc-arm.c
+@@ -7261,7 +7261,7 @@ parse_operands (char *str, const unsigne
  
  /* Functions for operand encoding.  ARM, then Thumb.  */
  
 -#define rotate_left(v, n) (v << n | v >> (32 - n))
 +#define rotate_left(v, n) (v << (n & 31) | v >> ((32 - n) & 31))
  
  /* If VAL can be encoded in the immediate field of an ARM instruction,
     return the encoded form.  Otherwise, return FAIL.  */
Index: head/lang/gnatdroid-binutils/files/patch-gas__configure.tgt
===================================================================
--- head/lang/gnatdroid-binutils/files/patch-gas__configure.tgt	(revision 399108)
+++ head/lang/gnatdroid-binutils/files/patch-gas__configure.tgt	(revision 399109)
@@ -1,10 +1,10 @@
---- gas/configure.tgt.orig	2013-11-04 15:33:37.000000000 +0000
+--- gas/configure.tgt.orig	2015-07-21 08:20:58 UTC
 +++ gas/configure.tgt
-@@ -128,6 +128,7 @@ case ${generic_target} in
+@@ -130,6 +130,7 @@ case ${generic_target} in
  
    arc-*-elf*)				fmt=elf ;;
  
 +  arm-android-eabi*)			fmt=elf em=armlinuxeabi ;;
    arm-*-aout)				fmt=aout ;;
    arm-*-coff)				fmt=coff ;;
    arm-*-rtems*)				fmt=elf ;;
Index: head/lang/gnatdroid-binutils/files/patch-ld__configure.tgt
===================================================================
--- head/lang/gnatdroid-binutils/files/patch-ld__configure.tgt	(revision 399108)
+++ head/lang/gnatdroid-binutils/files/patch-ld__configure.tgt	(revision 399109)
@@ -1,13 +1,13 @@
---- ld/configure.tgt.orig	2013-11-26 11:37:33.000000000 +0000
+--- ld/configure.tgt.orig	2014-10-14 07:32:04 UTC
 +++ ld/configure.tgt
 @@ -72,6 +72,10 @@ alpha*-*-*vms*)		targ_emul=alphavms
  			;;
  arc-*-elf*)		targ_emul=arcelf
  			;;
 +arm*-android-eabi*)	targ_emul=armelf_linux_eabi
 +			targ_extra_emuls=armelfb_linux_eabi
 +			targ_extra_libpath=$targ_extra_emuls
 +			;;
  arm-epoc-pe)		targ_emul=arm_epoc_pe ;	targ_extra_ofiles="deffilep.o pe-dll.o" ;;
  arm*-*-cegcc*)		targ_emul=arm_wince_pe ; targ_extra_ofiles="deffilep.o pe-dll.o"
  			LIB_PATH='${tooldir}/lib/w32api' ;;