Skip to content

Commit 9a644fb

Browse files
committed
add missing configure check for setlocale.
This corresponds to upstream gcc commit d44aa3e3bf.
1 parent 5ef740a commit 9a644fb

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

gcc/libcpp/config.in

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,9 @@
198198
/* Define to 1 if you have the `putc_unlocked' function. */
199199
#undef HAVE_PUTC_UNLOCKED
200200

201+
/* Define to 1 if you have the `setlocale' function. */
202+
#undef HAVE_SETLOCALE
203+
201204
/* Define to 1 if you can assemble SSE4 insns. */
202205
#undef HAVE_SSE4
203206

gcc/libcpp/configure

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5970,7 +5970,7 @@ _ACEOF
59705970

59715971

59725972

5973-
for ac_func in clearerr_unlocked feof_unlocked ferror_unlocked fflush_unlocked fgetc_unlocked fgets_unlocked fileno_unlocked fprintf_unlocked fputc_unlocked fputs_unlocked fread_unlocked fwrite_unlocked getchar_unlocked getc_unlocked putchar_unlocked putc_unlocked
5973+
for ac_func in clearerr_unlocked feof_unlocked ferror_unlocked fflush_unlocked fgetc_unlocked fgets_unlocked fileno_unlocked fprintf_unlocked fputc_unlocked fputs_unlocked fread_unlocked fwrite_unlocked getchar_unlocked getc_unlocked putchar_unlocked putc_unlocked setlocale
59745974
do :
59755975
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
59765976
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -6194,7 +6194,7 @@ fi
61946194
cat >>confdefs.h <<_ACEOF
61956195
#define HAVE_DECL_PUTCHAR_UNLOCKED $ac_have_decl
61966196
_ACEOF
6197-
ac_fn_c_check_decl "$LINENO" "putc_unlocked" "ac_cv_have_decl_putc_unlocked" "$ac_includes_default"
6197+
ac_fn_c_check_decl "$LINENO" "unlocked" "ac_cv_have_decl_putc_unlocked" "$ac_includes_default"
61986198
if test "x$ac_cv_have_decl_putc_unlocked" = xyes; then :
61996199
ac_have_decl=1
62006200
else

gcc/libcpp/configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ define(libcpp_UNLOCKED_FUNCS, clearerr_unlocked feof_unlocked dnl
8181
fileno_unlocked fprintf_unlocked fputc_unlocked fputs_unlocked dnl
8282
fread_unlocked fwrite_unlocked getchar_unlocked getc_unlocked dnl
8383
putchar_unlocked putc_unlocked)
84-
AC_CHECK_FUNCS(libcpp_UNLOCKED_FUNCS)
84+
AC_CHECK_FUNCS(libcpp_UNLOCKED_FUNCS setlocale)
8585
AC_CHECK_DECLS([abort, asprintf, basename(char *), errno, getopt, vasprintf])
8686
AC_CHECK_DECLS(m4_split(m4_normalize(libcpp_UNLOCKED_FUNCS)))
8787

0 commit comments

Comments
 (0)