* builtins.def (BUILT_IN_SETJMP): Revert latest change.

From-SVN: r253529

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3890fad861eb3ec5bbdb45930ce379111b000c1f..96acd2be63908da285b9fea1c0f3cd846ae4bfec 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2017-10-08  Eric Botcazou  <ebotcazou@adacore.com>
+
+       * builtins.def (BUILT_IN_SETJMP): Revert latest change.
+
 2017-10-08  Jan Hubicka  <hubicka@ucw.cz>
 
        * i386.c (ix86_expand_set_or_movmem): Disable 512bit loops for targets

diff --git a/gcc/builtins.def b/gcc/builtins.def
index 2c539645928af0985ba28a162eb6b205b69c784a..1c1efceea217339643aea1ec4f4e0e2423c90da2 100644 (file)
--- a/gcc/builtins.def
+++ b/gcc/builtins.def
@@ -890,11 +890,7 @@ DEF_LIB_BUILTIN        (BUILT_IN_REALLOC, "realloc", BT_FN_PTR_PTR_SIZE, ATTR_AL
 DEF_GCC_BUILTIN        (BUILT_IN_RETURN, "return", BT_FN_VOID_PTR, ATTR_NORETURN_NOTHROW_LEAF_LIST)
 DEF_GCC_BUILTIN        (BUILT_IN_RETURN_ADDRESS, "return_address", BT_FN_PTR_UINT, ATTR_LEAF_LIST)
 DEF_GCC_BUILTIN        (BUILT_IN_SAVEREGS, "saveregs", BT_FN_PTR_VAR, ATTR_NULL)
-#ifdef DONT_USE_BUILTIN_SETJMP
-DEF_LIB_BUILTIN        (BUILT_IN_SETJMP, "setjmp", BT_FN_INT_PTR, ATTR_RT_NOTHROW_LEAF_LIST)
-#else
 DEF_GCC_BUILTIN        (BUILT_IN_SETJMP, "setjmp", BT_FN_INT_PTR, ATTR_RT_NOTHROW_LEAF_LIST)
-#endif
 DEF_EXT_LIB_BUILTIN    (BUILT_IN_STRFMON, "strfmon", BT_FN_SSIZE_STRING_SIZE_CONST_STRING_VAR, ATTR_FORMAT_STRFMON_NOTHROW_3_4)
 DEF_LIB_BUILTIN        (BUILT_IN_STRFTIME, "strftime", BT_FN_SIZE_STRING_SIZE_CONST_STRING_CONST_TM_PTR, ATTR_FORMAT_STRFTIME_NOTHROW_3_0)
 DEF_GCC_BUILTIN        (BUILT_IN_TRAP, "trap", BT_FN_VOID, ATTR_NORETURN_NOTHROW_LEAF_COLD_LIST)