diff -ru gdb-7.9/gdb/sol-thread.c gdb-7.9/gdb/sol-thread.c
--- gdb-7.9/gdb/sol-thread.c	2015-02-19 12:58:07.000000000 +0100
+++ gdb-7.9/gdb/sol-thread.c	2015-07-22 01:45:33.798946345 +0200
@@ -712,7 +712,7 @@
 typedef char *gdb_ps_read_buf_t;
 typedef char *gdb_ps_write_buf_t;
 typedef int gdb_ps_size_t;
-typedef psaddr_t gdb_ps_addr_t;
+typedef paddr_t gdb_ps_addr_t;
 #else
 typedef struct ps_prochandle *gdb_ps_prochandle_t;
 typedef void *gdb_ps_read_buf_t;
@@ -992,6 +992,8 @@
 
 #if (defined(__i386__) || defined(__x86_64__)) && defined (sun)
 
+#include <sys/sysi86.h>
+
 /* Reads the local descriptor table of a LWP.
 
    This function is necessary on x86-solaris only.  Without it, the loading
diff -ru gdb-7.9/gdb/Makefile.in gdb-7.9/gdb/Makefile.in
--- gdb-7.9/gdb/Makefile.in	2015-02-20 18:11:44.000000000 +0100
+++ gdb-7.9/gdb/Makefile.in	2015-07-22 02:09:11.448936328 +0200
@@ -1065,14 +1065,14 @@
 
 TSOBS = inflow.o
 
-SUBDIRS = doc @subdirs@ data-directory $(GNULIB_BUILDDIR)
+SUBDIRS = @subdirs@ data-directory $(GNULIB_BUILDDIR)
 CLEANDIRS = $(SUBDIRS)
 
 # List of subdirectories in the build tree that must exist.
 # This is used to force build failures in existing trees when
 # a new directory is added.
 # The format here is for the `case' shell command.
-REQUIRED_SUBDIRS = doc | testsuite | $(GNULIB_BUILDDIR) | data-directory
+REQUIRED_SUBDIRS = testsuite | $(GNULIB_BUILDDIR) | data-directory
 
 # For now, shortcut the "configure GDB for fewer languages" stuff.
 YYFILES = c-exp.c \