Index: ChangeLog

from  Benoît Perrot  <benoit@lrde.epita.fr>

	Use GNUlib as it shall be. Thanks to Akim Demaille and Paul Eggert
	for showing me the right way to do it.

	* bootstrap: Get gnulib files from CVS repository or local
	directory (extracted from GNU tar's bootstrap script, written by
	Paul Eggert and Sergey Poznyakoff).
	* lib/Makefile.am.tmpl: New.
	* Makefile.am: Add `lib' as subdirectory.
	* configure.ac: Use gnulib's automake snippets.
	* src/stdint_.h, config/stdint.m4, config/inttypes.m4:
	Remove, as deprecated by the correct use of gnulib.
	* src/Makefile.am, src/vm/Makefile.am, src/inst/Makefile.am:
	Update accordingly.

ChangeLog

+2004-11-28  Benot Perrot  <benoit@lrde.epita.fr>
+
+	Use GNUlib as it shall be. Thanks to Akim Demaille and Paul Eggert
+	for showing me the right way to do it.
+
+	* bootstrap: Get gnulib files from CVS repository or local
+	directory (extracted from GNU tar's bootstrap script, written by
+	Paul Eggert and Sergey Poznyakoff).
+	* lib/Makefile.am.tmpl: New.
+	* Makefile.am: Add `lib' as subdirectory.
+	* configure.ac: Use gnulib's automake snippets.
+	* src/stdint_.h, config/stdint.m4, config/inttypes.m4:
+	Remove, as deprecated by the correct use of gnulib.
+	* src/Makefile.am, src/vm/Makefile.am, src/inst/Makefile.am:
+	Update accordingly.
+
 2004-11-02  Benot Perrot  <benoit@lrde.epita.fr>
 
 	* dev/inst-solver-gen.py: Include config.h to get configuration 
@@ -10,12 +26,6 @@
 	which generates an error message when the deprecated parser
 	constructor is invoked.
 
-2004-10-31  Benot Perrot  <benoit@lrde.epita.fr>
-
-	* bootstrap: Update the time stamp of reference output files to
-	avoid them to be illegitimately regenerated when checked out from
-	the repository.
-
 2004-10-31  Benot Perrot  <benoit@lrde.epita.fr>
 
 	* configure.ac:

Makefile.am

-ACLOCAL_AMFLAGS = -I config
+ACLOCAL_AMFLAGS = -I config -I m4
 
-SUBDIRS = config src doc tests distrib
+SUBDIRS = config lib src doc tests distrib
 
 EXTRA_DIST =					\
 	bootstrap				\

bootstrap

-#!/bin/sh -e
+#!/bin/sh
+
+# Bootstrap `Nolimips' from repository.
+
+# Copyright (C) 2003, 2004 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 2, 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, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# The gnulib-related part comes from GNU tar's bootstrap, written by
+# Paul Eggert and Sergey Poznyakoff:
+
+# Parse options.
+
+usage() {
+  cat <<EOF
+\`bootstrap' bootstraps Nolimips, getting or creating files needed by 
+autotools.
+
+Usage: $0 [--gnulib-srcdir=DIR][--cvs-auth=AUTH-METHOD]
+        [--cvs-user=USERNAME]
+
+Options are:
+  --gnulib-srcdir=DIRNAME     Specify the local directory where gnulib
+                              sources reside. Use this if you already
+                              have gnulib sources on your machine, and
+                              do not want to waste your bandwidth dowloading
+                              them again.
+  --cvs-auth=METHOD           Set the CVS access method used for downloading
+                              gnulib files. METHOD is one of the keywords
+                              accepted by cvs -d option (see info cvs
+                              repository).
+  --cvs-user=USERNAME         Set the CVS username to be used when accessing
+                              the gnulib repository.
+ 
+Running without arguments will suffice in most cases. It is equivalent to:
+
+  ./bootstrap --cvs-auth=ext --cvs-user=anoncvs
+
+EOF
+}
+
+for option
+  do
+  case $option in
+      --help)
+	  usage
+	  exit;;
+      --gnulib-srcdir=*)
+	  GNULIB_SRCDIR=`expr "$option" : '--gnulib-srcdir=\(.*\)'`;;
+      --cvs-auth=*)
+	  CVS_AUTH=`expr "$option" : '--cvs-auth=\(.*\)'`;;
+      --cvs-user=*)
+	  CVS_USER=`expr "$option" : '--cvs-user=\(.*\)'`;;
+      *)
+	  echo >&2 "$0: $option: unknown option"
+	  exit 1;;
+  esac
+done
+echo "$0: Bootstrapping Nolimips..."
+
+
+# Get gnulib files from CVS if needed.
+
+build_cvs_prefix() {
+  CVS_PREFIX=:${1}:
+  if [ "${2}" != - ]; then
+    CVS_PREFIX=${CVS_PREFIX}${2}@
+  fi
+  if [ "$1" = "ext" ]; then
+    if [ -z "${CVS_RSH}" ]; then
+      CVS_RSH=ssh
+      export CVS_RSH
+    fi
+  fi
+}
+
+cvs_checkout() {
+  if [ ! -d $1 ]; then
+    echo "$0: Getting $1 files..."
+
+    trap exit 1 2 13 15
+    trap 'rm -fr $1; exit 1' 0
+
+    case "${CVS_AUTH--}" in
+	-)  build_cvs_prefix ext anoncvs
+	    ;;
+	pserver) build_cvs_prefix $CVS_AUTH ${CVS_USER:-anoncvs}
+	    ;;
+	gserver|server)
+	    build_cvs_prefix $CVS_AUTH ${CVS_USER--}
+	    ;;
+	ext) build_cvs_prefix $CVS_AUTH ${CVS_USER--}
+	    ;;
+	*)  echo "$0: Unknown CVS access method" >&2
+	    exit 1;;
+    esac
+    if [ "${CVS_AUTH--}" = "pserver" ]; then
+	cvs -d ${CVS_PREFIX}subversions.gnu.org:/cvsroot/$1 login || exit
+    fi
+    cvs -q -d ${CVS_PREFIX}subversions.gnu.org:/cvsroot/$1 co $1 || exit
+
+    trap 0
+  fi
+}
+
+case ${GNULIB_SRCDIR--} in
+    -) cvs_checkout gnulib
+	GNULIB_SRCDIR=gnulib
+esac
+
+
+# Select the files needed by the specified modules.
+
+<$GNULIB_SRCDIR/gnulib-tool || exit
+
+gnulib_modules='
+stdint
+'
+previous_gnulib_modules=
+while [ "$gnulib_modules" != "$previous_gnulib_modules" ]; do
+    previous_gnulib_modules=$gnulib_modules
+    gnulib_modules=`
+    (echo "$gnulib_modules"
+     for gnulib_module in $gnulib_modules; do
+       $GNULIB_SRCDIR/gnulib-tool --extract-dependencies $gnulib_module
+     done) | sort -u
+  `
+done
+
+gnulib_files=`
+  (for gnulib_module in $gnulib_modules; do
+     $GNULIB_SRCDIR/gnulib-tool --extract-filelist $gnulib_module
+   done) | sort -u
+`
+
+gnulib_dirs=`echo "$gnulib_files" | sed 's,/[^/]*$,,' | sort -u`
+mkdir -p $gnulib_dirs || exit
+
+for gnulib_file in $gnulib_files; do
+    dest=$gnulib_file
+
+    case $gnulib_file in
+	m4/codeset.m4) continue;;
+	m4/intdiv0.m4) continue;;
+	m4/inttypes-pri.m4) continue;;
+	m4/isc-posix.m4) continue;;
+	m4/lcmessage.m4) continue;;
+	m4/onceonly_2_57.m4) dest=m4/onceonly.m4;;
+  # These will be overwritten by autopoint, which still uses
+  # old jm_.* macro names, so we have to keep both copies.
+	m4/gettext.m4 | m4/glibc21.m4 | m4/inttypes_h.m4 | m4/lib-ld.m4 | \
+	    m4/lib-prefix.m4 | m4/po.m4 | m4/stdint_h.m4 | m4/uintmax_t.m4 | \
+	    m4/ulonglong.m4)
+	    dest=`expr $gnulib_file : '\(.*\).m4'`_gl.m4;;
+    esac
+
+    rm -f $dest &&
+    echo "$0: Copying file $GNULIB_SRCDIR/$gnulib_file" &&
+    cp -p $GNULIB_SRCDIR/$gnulib_file $dest || exit
+done
+
+echo "$0: Creating m4/gnulib.m4"
+(echo "# This file is generated automatically. Please, do not edit."
+    echo "#"
+    echo "AC_DEFUN([nolimips_GNULIB],["
+    for gnulib_module in $gnulib_modules; do
+	echo "# $gnulib_module"
+	$GNULIB_SRCDIR/gnulib-tool --extract-autoconf-snippet $gnulib_module
+    done | sed '/AM_GNU_GETTEXT/d'
+    echo "])") > ./m4/gnulib.m4
+
+echo "$0: Creating lib/Makefile.am"
+(cat lib/Makefile.am.tmpl
+
+    for gnulib_module in $gnulib_modules; do
+	echo "# $gnulib_module"
+	$GNULIB_SRCDIR/gnulib-tool --extract-automake-snippet $gnulib_module
+    done | sed 's/lib_SOURCES/libnolimips_a_SOURCES/g' ) > lib/Makefile.am
+
+# End of gnulib-related part.
+
+
+# Generate Nolimips' nodes.mk
 
 here=`pwd`
 cd src/inst
-  ../../dev/inst-nodes-mk-gen.py < ../../dev/nolimips.xml > nodes.mk
+../../dev/inst-nodes-mk-gen.py < ../../dev/nolimips.xml > nodes.mk
 cd $here
 
 find tests -name '*.ref' -exec touch '{}' ';'
 
-autoreconf -f -v -i -m
+
+# Reconfigure, getting other files.
+
+echo "$0: autoreconf --verbose --install --force ..."
+autoreconf --verbose --install --force --make
+echo "$0: done."

config/inttypes.m4

-# inttypes.m4 serial 1 (gettext-0.11.4)
-dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Paul Eggert.
-
-# Define HAVE_INTTYPES_H if <inttypes.h> exists and doesn't clash with
-# <sys/types.h>.
-
-AC_DEFUN([gt_HEADER_INTTYPES_H],
-[
-  AC_CACHE_CHECK([for inttypes.h], gt_cv_header_inttypes_h,
-  [
-    AC_TRY_COMPILE(
-      [#include <sys/types.h>
-#include <inttypes.h>],
-      [], gt_cv_header_inttypes_h=yes, gt_cv_header_inttypes_h=no)
-  ])
-  if test $gt_cv_header_inttypes_h = yes; then
-    AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H, 1,
-      [Define if <inttypes.h> exists and doesn't clash with <sys/types.h>.])
-  fi
-])

config/stdint.m4

-# stdint.m4 serial 2
-dnl Copyright (C) 2001-2002, 2004 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Bruno Haible.
-dnl Test whether <stdint.h> is supported or must be substituted.
-
-AC_DEFUN([gl_STDINT_H],
-[dnl Check for <inttypes.h>.
-AC_REQUIRE([gt_HEADER_INTTYPES_H])
-dnl Check for <sys/inttypes.h>.
-AC_CHECK_HEADERS([sys/inttypes.h])
-
-AC_MSG_CHECKING([for stdint.h])
-AC_CACHE_VAL(gl_cv_header_stdint_h, [
-  AC_TRY_COMPILE([#include <stdint.h>], [],
-    gl_cv_header_stdint_h=yes, gl_cv_header_stdint_h=no)])
-AC_MSG_RESULT([$gl_cv_header_stdint_h])
-if test $gl_cv_header_stdint_h = yes; then
-  AC_DEFINE(HAVE_STDINT_H, 1,
-            [Define if you have a working <stdint.h> header file.])
-  STDINT_H=''
-else
-  STDINT_H='stdint.h'
-
-  dnl Is long == int64_t ?
-  AC_CACHE_CHECK([whether 'long' is 64 bit wide], gl_cv_long_bitsize_64, [
-    AC_TRY_COMPILE([
-#define POW63  ((((((long) 1 << 15) << 15) << 15) << 15) << 3)
-#define POW64  ((((((long) 1 << 15) << 15) << 15) << 15) << 4)
-typedef int array [2 * (POW63 != 0 && POW64 == 0) - 1];
-], , gl_cv_long_bitsize_64=yes, gl_cv_long_bitsize_64=no)])
-  if test $gl_cv_long_bitsize_64 = yes; then
-    HAVE_LONG_64BIT=1
-  else
-    HAVE_LONG_64BIT=0
-  fi
-  AC_SUBST(HAVE_LONG_64BIT)
-
-  dnl Is long long == int64_t ?
-  AC_CACHE_CHECK([whether 'long long' is 64 bit wide], gl_cv_longlong_bitsize_64, [
-    AC_TRY_COMPILE([
-#define POW63  ((((((long long) 1 << 15) << 15) << 15) << 15) << 3)
-#define POW64  ((((((long long) 1 << 15) << 15) << 15) << 15) << 4)
-typedef int array [2 * (POW63 != 0 && POW64 == 0) - 1];
-], , gl_cv_longlong_bitsize_64=yes, gl_cv_longlong_bitsize_64=no)])
-  if test $gl_cv_longlong_bitsize_64 = yes; then
-    HAVE_LONGLONG_64BIT=1
-  else
-    HAVE_LONGLONG_64BIT=0
-  fi
-  AC_SUBST(HAVE_LONGLONG_64BIT)
-
-fi
-AC_SUBST(STDINT_H)
-])

configure.ac

@@ -43,14 +43,14 @@ AC_CHECK_FUNCS(isblank)
 ## Development environment -------------
 CXXFLAGS="${CXXFLAGS} -ansi -Wall -W -D__STDC_LIMIT_MACROS"
 
-# Check presence of stdint.h
-AC_CHECK_HEADERS([sys/int_limits.h])
-gl_STDINT_H
+# gnulib modules
+nolimips_GNULIB
 
 ## Epilogue ----------------------------
 # Ask for the Makefile creations.
 AC_CONFIG_FILES([
   Makefile
+    lib/Makefile
     src/Makefile
     src/misc/Makefile
     src/inst/Makefile

lib/Makefile.am.tmpl

+## -*- makefile -*-
+## This file is part of Nolimips, a MIPS simulator with unlimited registers
+## Copyright (C) 2003, 2004 Benoit Perrot <benoit@lrde.epita.fr>
+##
+## Nolimips 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 2 of the License, or
+## (at your option) any later version.
+## 
+## Nolimips 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, write to the Free Software
+## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##
+
+noinst_LIBRARIES = libnolimips.a
+noinst_HEADERS = 
+libnolimips_a_SOURCES = 
+
+libnolimips_a_LIBADD = 
+libnolimips_a_DEPENDENCIES = $(libnolimips_a_LIBADD)
+
+BUILT_SOURCES =
+EXTRA_DIST = Makefile.am.tmpl
+MAINTAINERCLEANFILES =
+MOSTLYCLEANFILES =
+lib_OBJECTS = $(libnolimips_a_OBJECTS)
+
+CLEANFILES = 
+
+# gnulib modules

src/Makefile.am

@@ -26,13 +26,3 @@ nolimips_LDADD =				\
 	shell/libshell.a			\
 	task/libtask.a				\
 	@READLINE_LIBS@
-
-## stdint.h, from GNUlib
-BUILT_SOURCES = $(STDINT_H)
-EXTRA_DIST = stdint_.h
-
-# all-local $(lib_OBJECTS): $(STDINT_H)
-stdint.h: stdint_.h
-	sed -e 's/@''HAVE_LONG_64BIT''@/$(HAVE_LONG_64BIT)/g;s/@''HAVE_LONGLONG_64BIT@/$(HAVE_LONGLONG_64BIT)/g' < $(srcdir)/stdint_.h > $@-t
-	mv $@-t $@
-MOSTLYCLEANFILES = stdint.h stdint.h-t

src/inst/Makefile.am

 include $(srcdir)/nodes.mk
 
-INCLUDES = -I $(top_srcdir)/src -I $(top_builddir)/src
+INCLUDES = -I $(top_srcdir)/lib -I $(top_srcdir)/src -I $(top_builddir)/src
 
 BUILT_SOURCES =								\
 	$(FROM_INST_NODES_GEN_PY) inst-nodes-gen.stamp			\

src/stdint_.h

-/* Copyright (C) 2001-2002, 2004 Free Software Foundation, Inc.
-   Written by Bruno Haible, Sam Steingold, Peter Burwood.
-   This file is part of gnulib.
-
-   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 2, 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, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#ifndef _STDINT_H
-#define _STDINT_H
-
-/*
- * ISO C 99 <stdint.h> for platforms that lack it.
- * <http://www.opengroup.org/onlinepubs/007904975/basedefs/stdint.h.html>
- */
-
-/* Get wchar_t, WCHAR_MIN, WCHAR_MAX.  */
-#include <stddef.h>
-/* Get CHAR_BIT, LONG_MIN, LONG_MAX, ULONG_MAX.  */
-#include <limits.h>
-
-/* Get those types that are already defined in other system include files.  */
-#if defined(__FreeBSD__)
-# include <sys/inttypes.h>
-#endif
-#if defined(__sun) && HAVE_SYS_INTTYPES_H
-# include <sys/inttypes.h>
-  /* Solaris 7 <sys/inttypes.h> has the types except the *_fast*_t types, and
-     the macros except for *_FAST*_*, INTPTR_MIN, PTRDIFF_MIN, PTRDIFF_MAX.
-     But note that <sys/int_types.h> contains only the type definitions!  */
-# define HAVE_SYSTEM_INTTYPES
-#endif
-#if (defined(__hpux) || defined(_AIX)) && HAVE_INTTYPES_H
-# include <inttypes.h>
-  /* HP-UX 10 <inttypes.h> has nearly everything, except UINT_LEAST8_MAX,
-     UINT_FAST8_MAX, PTRDIFF_MIN, PTRDIFF_MAX.  */
-  /* AIX 4 <inttypes.h> has nearly everything, except INTPTR_MIN, INTPTR_MAX,
-     UINTPTR_MAX, PTRDIFF_MIN, PTRDIFF_MAX.  */
-# define HAVE_SYSTEM_INTTYPES
-#endif
-#if !(defined(UNIX_CYGWIN32) && defined(__BIT_TYPES_DEFINED__))
-# define NEED_SIGNED_INT_TYPES
-#endif
-
-#if !defined(HAVE_SYSTEM_INTTYPES)
-
-/* 7.18.1.1. Exact-width integer types */
-
-#if !defined(__FreeBSD__)
-
-#ifdef NEED_SIGNED_INT_TYPES
-typedef signed char    int8_t;
-#endif
-typedef unsigned char  uint8_t;
-
-#ifdef NEED_SIGNED_INT_TYPES
-typedef short          int16_t;
-#endif
-typedef unsigned short uint16_t;
-
-#ifdef NEED_SIGNED_INT_TYPES
-typedef int            int32_t;
-#endif
-typedef unsigned int   uint32_t;
-
-#if @HAVE_LONG_64BIT@
-#ifdef NEED_SIGNED_INT_TYPES
-typedef long           int64_t;
-#endif
-typedef unsigned long  uint64_t;
-#elif @HAVE_LONGLONG_64BIT@
-#ifdef NEED_SIGNED_INT_TYPES
-typedef long long          int64_t;
-#endif
-typedef unsigned long long uint64_t;
-#endif
-
-#endif /* !FreeBSD */
-
-/* 7.18.1.2. Minimum-width integer types */
-
-typedef int8_t   int_least8_t;
-typedef uint8_t  uint_least8_t;
-typedef int16_t  int_least16_t;
-typedef uint16_t uint_least16_t;
-typedef int32_t  int_least32_t;
-typedef uint32_t uint_least32_t;
-#if @HAVE_LONG_64BIT@ || @HAVE_LONGLONG_64BIT@
-typedef int64_t  int_least64_t;
-typedef uint64_t uint_least64_t;
-#endif
-
-/* 7.18.1.3. Fastest minimum-width integer types */
-
-typedef int32_t  int_fast8_t;
-typedef uint32_t uint_fast8_t;
-typedef int32_t  int_fast16_t;
-typedef uint32_t uint_fast16_t;
-typedef int32_t  int_fast32_t;
-typedef uint32_t uint_fast32_t;
-#if @HAVE_LONG_64BIT@ || @HAVE_LONGLONG_64BIT@
-typedef int64_t  int_fast64_t;
-typedef uint64_t uint_fast64_t;
-#endif
-
-/* 7.18.1.4. Integer types capable of holding object pointers */
-
-#if !defined(__FreeBSD__)
-
-/* On some platforms (like IRIX6 MIPS with -n32) sizeof(void*) < sizeof(long),
-   but this doesn't matter here.  */
-typedef long          intptr_t;
-typedef unsigned long uintptr_t;
-
-#endif /* !FreeBSD */
-
-/* 7.18.1.5. Greatest-width integer types */
-
-#if @HAVE_LONG_64BIT@ || @HAVE_LONGLONG_64BIT@
-typedef int64_t  intmax_t;
-typedef uint64_t uintmax_t;
-#else
-typedef int32_t  intmax_t;
-typedef uint32_t uintmax_t;
-#endif
-
-/* 7.18.2. Limits of specified-width integer types */
-
-#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS)
-
-#if defined(HAVE_SYS_INT_LIMITS_H)
-# include <sys/int_limits.h>
-#else
-
-/* 7.18.2.1. Limits of exact-width integer types */
-
-#define INT8_MIN  -128
-#define INT8_MAX   127
-#define UINT8_MAX  255U
-#define INT16_MIN  -32768
-#define INT16_MAX   32767
-#define UINT16_MAX  65535U
-#define INT32_MIN   (~INT32_MAX)
-#define INT32_MAX   2147483647
-#define UINT32_MAX  4294967295U
-#if @HAVE_LONG_64BIT@
-#define INT64_MIN   (~INT64_MIN)
-#define INT64_MAX   9223372036854775807L
-#define UINT64_MAX 18446744073709551615UL
-#elif @HAVE_LONGLONG_64BIT@
-#define INT64_MIN   (~INT64_MIN)
-#define INT64_MAX   9223372036854775807LL
-#define UINT64_MAX 18446744073709551615ULL
-#endif
-
-/* 7.18.2.2. Limits of minimum-width integer types */
-
-#define INT_LEAST8_MIN INT8_MIN
-#define INT_LEAST8_MAX INT8_MAX
-#define UINT_LEAST8_MAX UINT8_MAX
-#define INT_LEAST16_MIN INT16_MIN
-#define INT_LEAST16_MAX INT16_MAX
-#define UINT_LEAST16_MAX UINT16_MAX
-#define INT_LEAST32_MIN INT32_MIN
-#define INT_LEAST32_MAX INT32_MAX
-#define UINT_LEAST32_MAX UINT32_MAX
-#if @HAVE_LONG_64BIT@ || @HAVE_LONGLONG_64BIT@
-#define INT_LEAST64_MIN INT64_MIN
-#define INT_LEAST64_MAX INT64_MAX
-#define UINT_LEAST64_MAX UINT64_MAX
-#endif
-
-/* 7.18.2.3. Limits of fastest minimum-width integer types */
-
-#define INT_FAST8_MIN INT32_MIN
-#define INT_FAST8_MAX INT32_MAX
-#define UINT_FAST8_MAX UINT32_MAX
-#define INT_FAST16_MIN INT32_MIN
-#define INT_FAST16_MAX INT32_MAX
-#define UINT_FAST16_MAX UINT32_MAX
-#define INT_FAST32_MIN INT32_MIN
-#define INT_FAST32_MAX INT32_MAX
-#define UINT_FAST32_MAX UINT32_MAX
-#if @HAVE_LONG_64BIT@ || @HAVE_LONGLONG_64BIT@
-#define INT_FAST64_MIN INT64_MIN
-#define INT_FAST64_MAX INT64_MAX
-#define UINT_FAST64_MAX UINT64_MAX
-#endif
-
-/* 7.18.2.4. Limits of integer types capable of holding object pointers */
-
-#define INTPTR_MIN LONG_MIN
-#define INTPTR_MAX LONG_MAX
-#define UINTPTR_MAX ULONG_MAX
-
-/* 7.18.2.5. Limits of greatest-width integer types */
-
-#if @HAVE_LONG_64BIT@ || @HAVE_LONGLONG_64BIT@
-#define INTMAX_MIN INT64_MIN
-#define INTMAX_MAX INT64_MAX
-#define UINTMAX_MAX UINT64_MAX
-#else
-#define INTMAX_MIN INT32_MIN
-#define INTMAX_MAX INT32_MAX
-#define UINTMAX_MAX UINT32_MAX
-#endif
-
-/* 7.18.3. Limits of other integer types */
-
-#define PTRDIFF_MIN (~(ptrdiff_t)0 << (sizeof(ptrdiff_t)*CHAR_BIT-1))
-#define PTRDIFF_MAX (~PTRDIFF_MIN)
-
-/* This may be wrong...  */
-#define SIG_ATOMIC_MIN 0
-#define SIG_ATOMIC_MAX 127
-