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

aix: handle 64bit inodes for include directories

Browse Source 
On AIX, stat will store inodes in 32bit even when using LARGE_FILES.
If the inode is larger, it will return -1 in st_ino.
Thus, in incpath.c when comparing include directories, if several
of them have 64bit inodes, they will be considered as duplicated.

gcc/ChangeLog:
2022-01-12  Clément Chigot  <clement.chigot@atos.net>

	* configure.ac: Check sizeof ino_t and dev_t.
	(HOST_STAT_FOR_64BIT_INODES): New AC_DEFINE to provide stat
	syscall being able to handle 64bit inodes.
	* config.in: Regenerate.
	* configure: Regenerate.
	* incpath.c (HOST_STAT_FOR_64BIT_INODES): New define.
	(remove_duplicates): Use it.

libcpp/ChangeLog:
2022-01-12  Clément Chigot  <clement.chigot@atos.net>

	* configure.ac: Check sizeof ino_t and dev_t.
	* config.in: Regenerate.
	* configure: Regenerate.
	* include/cpplib.h (INO_T_CPP): Change for AIX.
	(DEV_T_CPP): New macro.
	(struct cpp_dir): Use it.
This commit is contained in:
Clément Chigot 2021-05-06 16:08:15 +02:00
parent 75845d584f
commit 14e0d83297
8 changed files with 198 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gcc/config.in
View File

@ -2372,6 +2372,18 @@
#endif
/* The size of `dev_t', as computed by sizeof. */
#ifndef USED_FOR_TARGET
#undef SIZEOF_DEV_T
#endif
/* The size of `ino_t', as computed by sizeof. */
#ifndef USED_FOR_TARGET
#undef SIZEOF_INO_T
#endif
/* The size of `int', as computed by sizeof. */
#ifndef USED_FOR_TARGET
#undef SIZEOF_INT

83
gcc/configure vendored
View File

@ -6302,6 +6302,85 @@ rm -rf conftest*
fi
# The cast to long int works around a bug in the HP C Compiler
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
# This bug is HP SR number 8606223364.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of ino_t" >&5
$as_echo_n "checking size of ino_t... " >&6; }
if ${ac_cv_sizeof_ino_t+:} false; then :
$as_echo_n "(cached) " >&6
else
if ac_fn_cxx_compute_int "$LINENO" "(long int) (sizeof (ino_t))" "ac_cv_sizeof_ino_t" "$ac_includes_default"; then :
else
if test "$ac_cv_type_ino_t" = yes; then
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error 77 "cannot compute sizeof (ino_t)
See \`config.log' for more details" "$LINENO" 5; }
else
ac_cv_sizeof_ino_t=0
fi
fi
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_ino_t" >&5
$as_echo "$ac_cv_sizeof_ino_t" >&6; }
cat >>confdefs.h <<_ACEOF
#define SIZEOF_INO_T $ac_cv_sizeof_ino_t
_ACEOF
# The cast to long int works around a bug in the HP C Compiler
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
# This bug is HP SR number 8606223364.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of dev_t" >&5
$as_echo_n "checking size of dev_t... " >&6; }
if ${ac_cv_sizeof_dev_t+:} false; then :
$as_echo_n "(cached) " >&6
else
if ac_fn_cxx_compute_int "$LINENO" "(long int) (sizeof (dev_t))" "ac_cv_sizeof_dev_t" "$ac_includes_default"; then :
else
if test "$ac_cv_type_dev_t" = yes; then
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error 77 "cannot compute sizeof (dev_t)
See \`config.log' for more details" "$LINENO" 5; }
else
ac_cv_sizeof_dev_t=0
fi
fi
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_dev_t" >&5
$as_echo "$ac_cv_sizeof_dev_t" >&6; }
cat >>confdefs.h <<_ACEOF
#define SIZEOF_DEV_T $ac_cv_sizeof_dev_t
_ACEOF
# Select the right stat being able to handle 64bit inodes, if needed.
if test "$enable_largefile" != no; then
case "$host, $build" in
*-*-aix*,*|*,*-*-aix*)
if test "$ac_cv_sizeof_ino_t" == "4" -a "$ac_cv_sizeof_dev_t" == 4; then
$as_echo "#define HOST_STAT_FOR_64BIT_INODES stat64x" >>confdefs.h
fi;;
esac
fi
# sizeof(char) is 1 by definition.
# The cast to long int works around a bug in the HP C Compiler
@ -19561,7 +19640,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
#line 19564 "configure"
#line 19643 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -19667,7 +19746,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
#line 19670 "configure"
#line 19749 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H

14
gcc/configure.ac
View File

@ -465,6 +465,20 @@ AC_PROG_CPP
AC_C_INLINE
AC_SYS_LARGEFILE
AC_CHECK_SIZEOF(ino_t)
AC_CHECK_SIZEOF(dev_t)
# Select the right stat being able to handle 64bit inodes, if needed.
if test "$enable_largefile" != no; then
case "$host, $build" in
*-*-aix*,*|*,*-*-aix*)
if test "$ac_cv_sizeof_ino_t" == "4" -a "$ac_cv_sizeof_dev_t" == 4; then
AC_DEFINE(HOST_STAT_FOR_64BIT_INODES, stat64x,
[Define which stat syscall is able to handle 64bit indodes.])
fi;;
esac
fi
# sizeof(char) is 1 by definition.
AC_CHECK_SIZEOF(void *)

8
gcc/incpath.c
View File

@ -44,6 +44,10 @@
#define DIRS_EQ(A, B) (!filename_cmp ((A)->canonical_name, (B)->canonical_name))
#endif
#ifndef HOST_STAT_FOR_64BIT_INODES
#define HOST_STAT_FOR_64BIT_INODES stat
#endif
static const char dir_separator_str[] = { DIR_SEPARATOR, 0 };
static void add_env_var_paths (const char *, incpath_kind);
@ -246,7 +250,7 @@ remove_duplicates (cpp_reader *pfile, struct cpp_dir *head,
int verbose)
{
struct cpp_dir **pcur, *tmp, *cur;
struct stat st;
struct HOST_STAT_FOR_64BIT_INODES st;
for (pcur = &head; *pcur; )
{
@ -254,7 +258,7 @@ remove_duplicates (cpp_reader *pfile, struct cpp_dir *head,
cur = *pcur;
if (stat (cur->name, &st))
if (HOST_STAT_FOR_64BIT_INODES (cur->name, &st))
{
/* Dirs that don't exist or have denied permissions are
silently ignored, unless verbose. */

6
libcpp/config.in
View File

@ -258,6 +258,12 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
/* The size of `dev_t', as computed by sizeof. */
#undef SIZEOF_DEV_T
/* The size of `ino_t', as computed by sizeof. */
#undef SIZEOF_INO_T
/* The size of `int', as computed by sizeof. */
#undef SIZEOF_INT

67
libcpp/configure vendored
View File

@ -6644,6 +6644,73 @@ $as_echo "#define HAVE_UCHAR 1" >>confdefs.h
fi
# The cast to long int works around a bug in the HP C Compiler
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
# This bug is HP SR number 8606223364.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of ino_t" >&5
$as_echo_n "checking size of ino_t... " >&6; }
if ${ac_cv_sizeof_ino_t+:} false; then :
$as_echo_n "(cached) " >&6
else
if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (ino_t))" "ac_cv_sizeof_ino_t" "$ac_includes_default"; then :
else
if test "$ac_cv_type_ino_t" = yes; then
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error 77 "cannot compute sizeof (ino_t)
See \`config.log' for more details" "$LINENO" 5; }
else
ac_cv_sizeof_ino_t=0
fi
fi
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_ino_t" >&5
$as_echo "$ac_cv_sizeof_ino_t" >&6; }
cat >>confdefs.h <<_ACEOF
#define SIZEOF_INO_T $ac_cv_sizeof_ino_t
_ACEOF
# The cast to long int works around a bug in the HP C Compiler
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
# This bug is HP SR number 8606223364.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of dev_t" >&5
$as_echo_n "checking size of dev_t... " >&6; }
if ${ac_cv_sizeof_dev_t+:} false; then :
$as_echo_n "(cached) " >&6
else
if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (dev_t))" "ac_cv_sizeof_dev_t" "$ac_includes_default"; then :
else
if test "$ac_cv_type_dev_t" = yes; then
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error 77 "cannot compute sizeof (dev_t)
See \`config.log' for more details" "$LINENO" 5; }
else
ac_cv_sizeof_dev_t=0
fi
fi
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_dev_t" >&5
$as_echo "$ac_cv_sizeof_dev_t" >&6; }
cat >>confdefs.h <<_ACEOF
#define SIZEOF_DEV_T $ac_cv_sizeof_dev_t
_ACEOF
# g++ on Solaris 10+ defines _XOPEN_SOURCE=600, which exposes a different
# iconv() prototype.
ac_ext=cpp

3
libcpp/configure.ac
View File

@ -103,6 +103,9 @@ if test $ac_cv_type_uchar = yes; then
[Define if <sys/types.h> defines \`uchar'.])
fi
AC_CHECK_SIZEOF(ino_t)
AC_CHECK_SIZEOF(dev_t)
# g++ on Solaris 10+ defines _XOPEN_SOURCE=600, which exposes a different
# iconv() prototype.
AC_LANG_PUSH([C++])

10
libcpp/include/cpplib.h
View File

@ -752,10 +752,18 @@ struct cpp_callbacks
#ifdef VMS
#define INO_T_CPP ino_t ino[3]
#elif defined (_AIX) && SIZEOF_INO_T == 4
#define INO_T_CPP ino64_t ino
#else
#define INO_T_CPP ino_t ino
#endif
#if defined (_AIX) && SIZEOF_DEV_T == 4
#define DEV_T_CPP dev64_t dev
#else
#define DEV_T_CPP dev_t dev
#endif
/* Chain of directories to look for include files in. */
struct cpp_dir
{
@ -790,7 +798,7 @@ struct cpp_dir
/* The C front end uses these to recognize duplicated
directories in the search path. */
INO_T_CPP;
dev_t dev;
DEV_T_CPP;
};
/* The kind of the cpp_macro. */