From b45dc2169519c99279f6631bafbeb6f40fd73c14 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 12 Feb 2011 22:16:44 -0800
Subject: stdlib: don't get in the way of non-GCC __attribute__

---
 m4/_Exit.m4     |  4 +---
 m4/attribute.m4 | 29 -----------------------------
 m4/stdlib_h.m4  |  3 +--
 3 files changed, 2 insertions(+), 34 deletions(-)
 delete mode 100644 m4/attribute.m4

(limited to 'm4')

diff --git a/m4/_Exit.m4 b/m4/_Exit.m4
index 3d01f1aca0..329b8cdd73 100644
--- a/m4/_Exit.m4
+++ b/m4/_Exit.m4
@@ -1,4 +1,4 @@
-# _Exit.m4 serial 2
+# _Exit.m4 serial 1
 dnl Copyright (C) 2010-2011 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -7,8 +7,6 @@ dnl with or without modifications, as long as this notice is preserved.
 AC_DEFUN([gl_FUNC__EXIT],
 [
   AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
-  AC_REQUIRE([gl_ATTRIBUTE_NORETURN])
-
   AC_CHECK_FUNCS([_Exit])
   if test $ac_cv_func__Exit = no; then
     HAVE__EXIT=0
diff --git a/m4/attribute.m4 b/m4/attribute.m4
deleted file mode 100644
index 04758fd36b..0000000000
--- a/m4/attribute.m4
+++ /dev/null
@@ -1,29 +0,0 @@
-# Test for GCC-style __attribute__ support.
-
-dnl Copyright (C) 2011 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl from Paul Eggert
-
-# Currently only __attribute__ ((__noreturn__)) is done,
-# but other macros can be added to this file as needed.
-
-# Test whether __attribute__ ((__noreturn__)) works.
-AC_DEFUN([gl_ATTRIBUTE_NORETURN], [
-  AC_CACHE_CHECK([for  __attribute__ ((__noreturn__))],
-    [gl_cv_attribute_noreturn],
-    [gl_save_werror_flag=$ac_[]_AC_LANG_ABBREV[]_werror_flag
-     ac_[]_AC_LANG_ABBREV[]_werror_flag=yes
-     AC_COMPILE_IFELSE(
-       [AC_LANG_PROGRAM(
-          [[void never_come_back (int) __attribute__ ((__noreturn__));]])],
-       [gl_cv_attribute_noreturn=yes],
-       [gl_cv_attribute_noreturn=no])
-     ac_[]_AC_LANG_ABBREV[]_werror_flag=$gl_save_werror_flag])
-  if test $gl_cv_attribute_noreturn = no; then
-    HAVE_ATTRIBUTE_NORETURN=0
-  fi
-  AC_SUBST([HAVE_ATTRIBUTE_NORETURN])
-])
diff --git a/m4/stdlib_h.m4 b/m4/stdlib_h.m4
index 56713dd357..d28b552e90 100644
--- a/m4/stdlib_h.m4
+++ b/m4/stdlib_h.m4
@@ -1,4 +1,4 @@
-# stdlib_h.m4 serial 37
+# stdlib_h.m4 serial 36
 dnl Copyright (C) 2007-2011 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -65,7 +65,6 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS],
   dnl Assume proper GNU behavior unless another module says otherwise.
   HAVE__EXIT=1;              AC_SUBST([HAVE__EXIT])
   HAVE_ATOLL=1;              AC_SUBST([HAVE_ATOLL])
-  HAVE_ATTRIBUTE_NORETURN=1; AC_SUBST([HAVE_ATTRIBUTE_NORETURN])
   HAVE_CANONICALIZE_FILE_NAME=1;  AC_SUBST([HAVE_CANONICALIZE_FILE_NAME])
   HAVE_DECL_GETLOADAVG=1;    AC_SUBST([HAVE_DECL_GETLOADAVG])
   HAVE_GETSUBOPT=1;          AC_SUBST([HAVE_GETSUBOPT])
-- 
cgit v1.2.1