From d43207b0570c5d893e70efb3b14cc219d4ff1462 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 1 Jan 2024 23:32:29 -0500 Subject: [PATCH] sim: ppc: move struct statfs to top-level --- sim/config.h.in | 3 +++ sim/configure | 51 +++++++++++++++++++++++++++++++++++++++++++++-- sim/m4/sim_ac_platform.m4 | 24 ++++++++++++++++++++++ sim/ppc/config.in | 3 --- sim/ppc/configure | 44 ---------------------------------------- sim/ppc/configure.ac | 24 ---------------------- 6 files changed, 76 insertions(+), 73 deletions(-) diff --git a/sim/config.h.in b/sim/config.h.in index 7115a9c..78fa632 100644 --- a/sim/config.h.in +++ b/sim/config.h.in @@ -219,6 +219,9 @@ /* Define to 1 if you have the `strsignal' function. */ #undef HAVE_STRSIGNAL +/* Define if struct statfs is defined in */ +#undef HAVE_STRUCT_STATFS + /* Define to 1 if `st_atime' is a member of `struct stat'. */ #undef HAVE_STRUCT_STAT_ST_ATIME diff --git a/sim/configure b/sim/configure index 3c09fbc..b68c619 100755 --- a/sim/configure +++ b/sim/configure @@ -8635,6 +8635,53 @@ _ACEOF fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct statfs" >&5 +$as_echo_n "checking for struct statfs... " >&6; } +if ${sim_cv_struct_statfs+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#ifdef HAVE_SYS_PARAM_H +#include +#endif +#ifdef HAVE_SYS_MOUNT_H +#include +#endif +#ifdef HAVE_SYS_VFS_H +#include +#endif +#ifdef HAVE_SYS_STATFS_H +#include +#endif +int +main () +{ + + struct statfs s; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + sim_cv_struct_statfs="yes" +else + sim_cv_struct_statfs="no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_cv_struct_statfs" >&5 +$as_echo "$sim_cv_struct_statfs" >&6; } +if test x"sim_cv_struct_statfs" = x"yes"; then : + +$as_echo "#define HAVE_STRUCT_STATFS 1" >>confdefs.h + + +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if union semun defined" >&5 $as_echo_n "checking if union semun defined... " >&6; } if ${sim_cv_has_union_semun+:} false; then : @@ -12430,7 +12477,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12433 "configure" +#line 12480 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12536,7 +12583,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12539 "configure" +#line 12586 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/sim/m4/sim_ac_platform.m4 b/sim/m4/sim_ac_platform.m4 index 1914f61..6f3e48f 100644 --- a/sim/m4/sim_ac_platform.m4 +++ b/sim/m4/sim_ac_platform.m4 @@ -134,6 +134,30 @@ AC_CHECK_TYPES(socklen_t, [], [], ]) AC_CHECK_TYPES([long long]) +dnl Check for struct statfs. +AC_CACHE_CHECK([for struct statfs], + [sim_cv_struct_statfs], + [AC_TRY_COMPILE([ +#include +#ifdef HAVE_SYS_PARAM_H +#include +#endif +#ifdef HAVE_SYS_MOUNT_H +#include +#endif +#ifdef HAVE_SYS_VFS_H +#include +#endif +#ifdef HAVE_SYS_STATFS_H +#include +#endif], [ + struct statfs s; +], [sim_cv_struct_statfs="yes"], [sim_cv_struct_statfs="no"])]) +AS_IF([test x"sim_cv_struct_statfs" = x"yes"], [dnl + AC_DEFINE(HAVE_STRUCT_STATFS, 1, + [Define if struct statfs is defined in ]) +]) + dnl Some System V related checks. AC_CACHE_CHECK([if union semun defined], [sim_cv_has_union_semun], diff --git a/sim/ppc/config.in b/sim/ppc/config.in index 40afa35..2a60b8d 100644 --- a/sim/ppc/config.in +++ b/sim/ppc/config.in @@ -1,8 +1,5 @@ /* config.in. Generated from configure.ac by autoheader. */ -/* Define if struct statfs is defined in */ -#undef HAVE_STRUCT_STATFS - /* Define to the address where bug reports for this package should be sent. */ #undef PACKAGE_BUGREPORT diff --git a/sim/ppc/configure b/sim/ppc/configure index 5ec761b..14d0e91 100755 --- a/sim/ppc/configure +++ b/sim/ppc/configure @@ -3314,50 +3314,6 @@ else ac_cv_termio_cline=no fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct statfs" >&5 -$as_echo_n "checking for struct statfs... " >&6; } -if ${ac_cv_struct_statfs+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#ifdef HAVE_SYS_PARAM_H -#include -#endif -#ifdef HAVE_SYS_MOUNT_H -#include -#endif -#ifdef HAVE_SYS_VFS_H -#include -#endif -#ifdef HAVE_SYS_STATFS_H -#include -#endif -int -main () -{ -static struct statfs s; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_struct_statfs=yes -else - ac_cv_struct_statfs=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_statfs" >&5 -$as_echo "$ac_cv_struct_statfs" >&6; } -if test $ac_cv_struct_statfs = yes; then - -$as_echo "#define HAVE_STRUCT_STATFS 1" >>confdefs.h - -fi - diff --git a/sim/ppc/configure.ac b/sim/ppc/configure.ac index 9c2d64b..13db9fc 100644 --- a/sim/ppc/configure.ac +++ b/sim/ppc/configure.ac @@ -358,30 +358,6 @@ else ac_cv_termio_cline=no fi -dnl Check for struct statfs -AC_MSG_CHECKING(for struct statfs) -AC_CACHE_VAL(ac_cv_struct_statfs, -[AC_TRY_COMPILE([#include -#ifdef HAVE_SYS_PARAM_H -#include -#endif -#ifdef HAVE_SYS_MOUNT_H -#include -#endif -#ifdef HAVE_SYS_VFS_H -#include -#endif -#ifdef HAVE_SYS_STATFS_H -#include -#endif], -[static struct statfs s;], -ac_cv_struct_statfs=yes, ac_cv_struct_statfs=no)]) -AC_MSG_RESULT($ac_cv_struct_statfs) -if test $ac_cv_struct_statfs = yes; then - AC_DEFINE(HAVE_STRUCT_STATFS, 1, - [Define if struct statfs is defined in ]) -fi - AC_SUBST(sim_line_nr) AC_SUBST(sim_opcode) AC_SUBST(sim_switch) -- 2.7.4