--- a/gcc/regset.h	Sun Aug 21 07:07:55 2011 +0900
+++ b/gcc/regset.h	Fri Oct 27 22:46:09 2017 +0900
@@ -1,6 +1,5 @@
 /* Define regsets.
-   Copyright (C) 1987, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-   2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1987-2017 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
@@ -31,8 +30,6 @@
    the latter option, a good start would be to change everything allocated
    on the reg_obstack to regset.  */
 
-#include "bitmap.h"		/* For bitmap_iterator.  */
-#include "hard-reg-set.h"
 
 /* Head of register set linked list.  */
 typedef bitmap_head regset_head;
@@ -115,11 +112,13 @@
 
 extern regset regs_invalidated_by_call_regset;
 
+/* Same information as FIXED_REG_SET but in regset form.  */
+extern regset fixed_reg_set_regset;
+
 /* An obstack for regsets.  */
 extern bitmap_obstack reg_obstack;
 
-/* In cfg.c  */
+/* In df-core.c (which should use regset consistently instead of bitmap...)  */
 extern void dump_regset (regset, FILE *);
-extern void debug_regset (regset);
 
 #endif /* GCC_REGSET_H */