From 22aaad0c453b733bc542036fcb9dd25aa31ea71d Mon Sep 17 00:00:00 2001
From: Akim Demaille <akim.demaille@gmail.com>
Date: Sat, 27 Oct 2018 18:54:08 +0200
Subject: [PATCH] bitset: clean up bbitset.h

* lib/libiberty.h: Inline in...
* lib/bbitset.h: here.
* lib/local.mk: Adjust.
---
 lib/bbitset.h   | 14 +++++++++++---
 lib/libiberty.h | 37 -------------------------------------
 lib/local.mk    |  1 -
 3 files changed, 11 insertions(+), 41 deletions(-)
 delete mode 100644 lib/libiberty.h

diff --git a/lib/bbitset.h b/lib/bbitset.h
index 29767022..29502a5b 100644
--- a/lib/bbitset.h
+++ b/lib/bbitset.h
@@ -21,12 +21,20 @@
 #ifndef _BBITSET_H
 #define _BBITSET_H
 
-#include "libiberty.h"
-
-#include <stdbool.h>
 #include <limits.h>
+#include <stdbool.h>
 #include <stddef.h>
 
+#include "xalloc.h"
+
+#ifndef __attribute__
+# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 8)
+#  define __attribute__(x)
+# endif
+#endif
+
+#define ATTRIBUTE_UNUSED __attribute__ ((__unused__))
+
 /* Currently we support five flavours of bitsets:
    BITSET_ARRAY:  Array of bits (fixed size, fast for dense bitsets).
                   Memory for bit array and bitset structure allocated
diff --git a/lib/libiberty.h b/lib/libiberty.h
deleted file mode 100644
index 7628fc12..00000000
--- a/lib/libiberty.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Fake libiberty.h for Bison.
-
-   Copyright (C) 2002-2004, 2009-2015, 2018 Free Software Foundation,
-   Inc.
-
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-
-/* Bison depends on libiberty's implementation of bitsets, which
-   requires a 'libiberty.h' file.  This file provides the minimum
-   services.  */
-
-#ifndef BISON_LIBIBERTY_H_
-# define BISON_LIBIBERTY_H_ 1
-
-# ifndef __attribute__
-#  if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 8)
-#   define __attribute__(x)
-#  endif
-# endif
-
-# define ATTRIBUTE_UNUSED __attribute__ ((__unused__))
-
-# include "xalloc.h"
-
-#endif /* ! BISON_LIBIBERTY_H_ */
diff --git a/lib/local.mk b/lib/local.mk
index 971c72de..aec635a8 100644
--- a/lib/local.mk
+++ b/lib/local.mk
@@ -30,7 +30,6 @@ lib_libbison_a_SOURCES +=                       \
   lib/ebitset.h                                 \
   lib/lbitset.c                                 \
   lib/lbitset.h                                 \
-  lib/libiberty.h                               \
   lib/vbitset.c                                 \
   lib/vbitset.h