diff -ru binutils-2.25/include/plugin-api.h binutils-2.25/include/plugin-api.h
--- binutils-2.25/include/plugin-api.h	2013-11-04 16:33:39.000000000 +0100
+++ binutils-2.25/include/plugin-api.h	2015-07-19 21:15:15.988969993 +0200
@@ -32,7 +32,9 @@
 #include <inttypes.h>
 #endif
 #include <sys/types.h>
-#if !defined(HAVE_STDINT_H) && !defined(HAVE_INTTYPES_H) && \
+#if defined(__sun__) && defined(__LONG_LONG_MAX__)
+typedef unsigned long long uint64_t;
+#elif !defined(HAVE_STDINT_H) && !defined(HAVE_INTTYPES_H) && \
     !defined(UINT64_MAX) && !defined(uint64_t)
 #error can not find uint64_t type
 #endif
diff -ru binutils-2.25/libiberty/Makefile.in binutils-2.25/libiberty/Makefile.in
--- binutils-2.25/libiberty/Makefile.in	2014-10-14 09:32:04.000000000 +0200
+++ binutils-2.25/libiberty/Makefile.in	2015-07-19 21:24:28.158972078 +0200
@@ -127,7 +127,7 @@
 	basename.c bcmp.c bcopy.c bsearch.c bzero.c			\
 	calloc.c choose-temp.c clock.c concat.c cp-demangle.c		\
 	 cp-demint.c cplus-dem.c crc32.c				\
-	d-demangle.c dwarfnames.c dyn-string.c				\
+	dwarfnames.c dyn-string.c				\
 	fdmatch.c ffs.c fibheap.c filename_cmp.c floatformat.c		\
 	fnmatch.c fopen_unlocked.c					\
 	getcwd.c getopt.c getopt1.c getpagesize.c getpwd.c getruntime.c	\
@@ -167,7 +167,7 @@
 	./md5.$(objext) ./sha1.$(objext) ./alloca.$(objext)		\
 	./argv.$(objext)						\
 	./choose-temp.$(objext) ./concat.$(objext)			\
-	./cp-demint.$(objext) ./crc32.$(objext) ./d-demangle.$(objext)	\
+	./cp-demint.$(objext) ./crc32.$(objext) \
 	./dwarfnames.$(objext) ./dyn-string.$(objext)			\
 	./fdmatch.$(objext) ./fibheap.$(objext)				\
 	./filename_cmp.$(objext) ./floatformat.$(objext)		\
@@ -714,14 +714,6 @@
 	else true; fi
 	$(COMPILE.c) $(srcdir)/dyn-string.c $(OUTPUT_OPTION)
 
-./d-demangle.$(objext): $(srcdir)/d-demangle.c config.h $(INCDIR)/ansidecl.h \
-	$(srcdir)/cp-demangle.h $(INCDIR)/demangle.h \
-	$(INCDIR)/dyn-string.h $(INCDIR)/getopt.h $(INCDIR)/libiberty.h
-	if [ x"$(PICFLAG)" != x ]; then \
-	  $(COMPILE.c) $(PICFLAG) $(srcdir)/d-demangle.c -o pic/$@; \
-	else true; fi
-	$(COMPILE.c) $(srcdir)/d-demangle.c $(OUTPUT_OPTION)
-
 ./fdmatch.$(objext): $(srcdir)/fdmatch.c config.h $(INCDIR)/ansidecl.h \
 	$(INCDIR)/libiberty.h
 	if [ x"$(PICFLAG)" != x ]; then \
diff -ru binutils-2.25/libiberty/cplus-dem.c binutils-2.25/libiberty/cplus-dem.c
--- binutils-2.25/libiberty/cplus-dem.c	2014-10-14 09:32:04.000000000 +0200
+++ binutils-2.25/libiberty/cplus-dem.c	2015-07-19 21:26:45.478972596 +0200
@@ -876,13 +876,6 @@
   if (GNAT_DEMANGLING)
     return ada_demangle (mangled, options);
 
-  if (DLANG_DEMANGLING)
-    {
-      ret = dlang_demangle (mangled, options);
-      if (ret)
-	return ret;
-    }
-
   ret = internal_cplus_demangle (work, mangled);
   squangle_mop_up (work);
   return (ret);