OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

backport: re PR gcov-profile/54487 (profiledbootstrap broken by r190952) 

2012-09-12  Teresa Johnson  <tejohnson@google.com>

	Backport from mainline.
	2012-09-12  Teresa Johnson  <tejohnson@google.com>

        PR gcov-profile/54487
        * configure.ac (HOST_HAS_F_SETLKW): Set based on compile
        test using F_SETLKW with fcntl.
        * configure, config.in: Regenerate.

From-SVN: r191254
This commit is contained in:
Teresa Johnson 2012-09-13 13:32:31 +00:00 committed by Teresa Johnson
parent bc930d76fd
commit 01f6116e03
4 changed files with 74 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gcc/ChangeLog
View File

@ -1,3 +1,13 @@
2012-09-12 Teresa Johnson <tejohnson@google.com>
Backport from mainline.
2012-09-12 Teresa Johnson <tejohnson@google.com>
PR gcov-profile/54487
* configure.ac (HOST_HAS_F_SETLKW): Set based on compile
test using F_SETLKW with fcntl.
* configure, config.in: Regenerate.
2012-09-12 Uros Bizjak <ubizjak@gmail.com>
Backport from mainline

6
gcc/config.in
View File

@ -1588,6 +1588,12 @@
#endif
/* Define if F_SETLKW supported by fcntl. */
#ifndef USED_FOR_TARGET
#undef HOST_HAS_F_SETLKW
#endif
/* Define as const if the declaration of iconv() needs const. */
#ifndef USED_FOR_TARGET
#undef ICONV_CONST

44
gcc/configure vendored
View File

@ -10968,6 +10968,46 @@ $as_echo "#define HAVE_CLOCK_T 1" >>confdefs.h
fi
# Check if F_SETLKW is supported by fcntl.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for F_SETLKW" >&5
$as_echo_n "checking for F_SETLKW... " >&6; }
if test "${ac_cv_f_setlkw+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <fcntl.h>
int
main ()
{
struct flock fl;
fl.l_whence = 0;
fl.l_start = 0;
fl.l_len = 0;
fl.l_pid = 0;
return fcntl (1, F_SETLKW, &fl);
;
return 0;
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_f_setlkw=yes
else
ac_cv_f_setlkw=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_f_setlkw" >&5
$as_echo "$ac_cv_f_setlkw" >&6; }
if test $ac_cv_f_setlkw = yes; then
$as_echo "#define HOST_HAS_F_SETLKW 1" >>confdefs.h
fi
# Restore CFLAGS, CXXFLAGS from before the gcc_AC_NEED_DECLARATIONS tests.
CFLAGS="$saved_CFLAGS"
CXXFLAGS="$saved_CXXFLAGS"
@ -17970,7 +18010,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
#line 17973 "configure"
#line 18013 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -18076,7 +18116,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
#line 18079 "configure"
#line 18119 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H

16
gcc/configure.ac
View File

@ -1187,6 +1187,22 @@ if test $gcc_cv_type_clock_t = yes; then
[Define if <time.h> defines clock_t.])
fi
# Check if F_SETLKW is supported by fcntl.
AC_CACHE_CHECK(for F_SETLKW, ac_cv_f_setlkw, [
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#include <fcntl.h>]], [[
struct flock fl;
fl.l_whence = 0;
fl.l_start = 0;
fl.l_len = 0;
fl.l_pid = 0;
return fcntl (1, F_SETLKW, &fl);]])],
[ac_cv_f_setlkw=yes],[ac_cv_f_setlkw=no])])
if test $ac_cv_f_setlkw = yes; then
AC_DEFINE(HOST_HAS_F_SETLKW, 1,
[Define if F_SETLKW supported by fcntl.])
fi
# Restore CFLAGS, CXXFLAGS from before the gcc_AC_NEED_DECLARATIONS tests.
CFLAGS="$saved_CFLAGS"
CXXFLAGS="$saved_CXXFLAGS"