From patchwork Tue Jan 2 05:30:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 83100 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id EF2ED3858413 for ; Tue, 2 Jan 2024 06:32:32 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) by sourceware.org (Postfix) with ESMTP id 28F6E3858404 for ; Tue, 2 Jan 2024 06:30:38 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 28F6E3858404 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gentoo.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gentoo.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 28F6E3858404 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2001:470:ea4a:1:5054:ff:fec7:86e4 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704177040; cv=none; b=e6oh6/kSFB9+CLMYTvlVN+VevjgZL1847jim9/Niv6m9xLVy6o6JEaY105nCSeoZ9E/Elb+9RXBgrNXnyott0DLORPzibo9G/GpG/YUqD4C9/TjXmhvF8d1a7GAX9CsAmKWtJBcia/x2NZyo0HvHzr3fTEwiIQG8nKDmG7BGgM0= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704177040; c=relaxed/simple; bh=3K8X81ib8K1u7PK8FjGERd3JF2ownOCXBsAeMy8x82U=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=mo2cWxXelC5ef/L5Y63NHM78dMubnMjYJoGP95Uoa2JFeZ0ucqg4vf6WvX/O7m1hmcc3w8I9sWj3TX5uNL3a827CZ8Gv1JB4aYlEBH8DSYs4DUBcyGnu60MJ0NmGsxVy0aMATOWbVgn2eGX5ARpvP6d8+pBEGu798WDMXFgm6Vw= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by smtp.gentoo.org (Postfix, from userid 559) id AE82D340BCD; Tue, 2 Jan 2024 06:30:37 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH/submitted 5/5] sim: ppc: hoist sysv tests to top-level Date: Tue, 2 Jan 2024 00:30:26 -0500 Message-ID: <20240102053026.20425-5-vapier@gentoo.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240102053026.20425-1-vapier@gentoo.org> References: <20240102053026.20425-1-vapier@gentoo.org> MIME-Version: 1.0 X-Spam-Status: No, score=-11.3 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Now that the sysv tests turn into config.h defines and everything checks that, we can move the tests to the top-level and out of the ppc subdir. --- sim/config.h.in | 9 +++ sim/configure | 132 +++++++++++++++++++++++++++++++++++++- sim/m4/sim_ac_platform.m4 | 55 ++++++++++++++++ sim/ppc/config.in | 9 --- sim/ppc/configure | 127 +----------------------------------- sim/ppc/configure.ac | 54 ---------------- 6 files changed, 195 insertions(+), 191 deletions(-) diff --git a/sim/m4/sim_ac_platform.m4 b/sim/m4/sim_ac_platform.m4 index f45321763fa7..dcab5b2862d9 100644 --- a/sim/m4/sim_ac_platform.m4 +++ b/sim/m4/sim_ac_platform.m4 @@ -133,6 +133,61 @@ AC_CHECK_TYPES(socklen_t, [], [], #include ]) +dnl Some System V related checks. +AC_CACHE_CHECK([if union semun defined], + [sim_cv_has_union_semun], + [AC_TRY_COMPILE([ +#include +#include +#include ], [ + union semun arg; +], [sim_cv_has_union_semun="yes"], [sim_cv_has_union_semun="no"])]) +AS_IF([test x"$sim_cv_has_union_semun" = x"yes"], [dnl + AC_DEFINE(HAVE_UNION_SEMUN, 1, + [Define if union semun is defined in ]) +]) + +AC_CACHE_CHECK([whether System V semaphores are supported], + [sim_cv_sysv_sem], + [AC_TRY_COMPILE([ + #include + #include + #include +#ifndef HAVE_UNION_SEMUN + union semun { + int val; + struct semid_ds *buf; + ushort *array; + }; +#endif], [ + union semun arg; + int id = semget(IPC_PRIVATE, 1, IPC_CREAT|0400); + if (id == -1) + return 1; + arg.val = 0; /* avoid implicit type cast to union */ + if (semctl(id, 0, IPC_RMID, arg) == -1) + return 1; +], [sim_cv_sysv_sem="yes"], [sim_cv_sysv_sem="no"])]) +AS_IF([test x"$sim_cv_sysv_sem" = x"yes"], [dnl + AC_DEFINE(HAVE_SYSV_SEM, 1, [Define if System V semaphores are supported]) +]) + +AC_CACHE_CHECK([whether System V shared memory is supported], + [sim_cv_sysv_shm], + [AC_TRY_COMPILE([ +#include +#include +#include ], [ + int id = shmget(IPC_PRIVATE, 1, IPC_CREAT|0400); + if (id == -1) + return 1; + if (shmctl(id, IPC_RMID, 0) == -1) + return 1; +], [sim_cv_sysv_shm="yes"], [sim_cv_sysv_shm="no"])]) +AS_IF([test x"$sim_cv_sysv_shm" = x"yes"], [dnl + AC_DEFINE(HAVE_SYSV_SHM, 1, [Define if System V shared memory is supported]) +]) + dnl Types used by common code AC_TYPE_GETGROUPS AC_TYPE_MODE_T diff --git a/sim/ppc/configure.ac b/sim/ppc/configure.ac index 9b01aede82cd..06be2c960768 100644 --- a/sim/ppc/configure.ac +++ b/sim/ppc/configure.ac @@ -96,60 +96,6 @@ case "${target}" in esac ])dnl -AC_CACHE_CHECK([if union semun defined], - [ac_cv_has_union_semun], - [AC_TRY_COMPILE([ -#include -#include -#include ], -[union semun arg ;], -[ac_cv_has_union_semun="yes"], -[ac_cv_has_union_semun="no"])]) -AS_IF([test x"$ac_cv_has_union_semun" = x"yes"], [dnl - AC_DEFINE(HAVE_UNION_SEMUN, 1, - [Define if union semun is defined in ]) -]) - -AC_CACHE_CHECK([whether System V semaphores are supported], - [ac_cv_sysv_sem], - [AC_TRY_COMPILE([ - #include - #include - #include -#ifndef HAVE_UNION_SEMUN - union semun { - int val; - struct semid_ds *buf; - ushort *array; - }; -#endif], [ - union semun arg; - int id = semget(IPC_PRIVATE, 1, IPC_CREAT|0400); - if (id == -1) - return 1; - arg.val = 0; /* avoid implicit type cast to union */ - if (semctl(id, 0, IPC_RMID, arg) == -1) - return 1; -], [ac_cv_sysv_sem="yes"], [ac_cv_sysv_sem="no"])]) -AS_IF([test x"$ac_cv_sysv_sem" = x"yes"], [dnl - AC_DEFINE(HAVE_SYSV_SEM, 1, [Define if System V semaphores are supported]) -]) - -AC_CACHE_CHECK(whether System V shared memory is supported, -ac_cv_sysv_shm, -[AC_TRY_COMPILE([ -#include -#include -#include ], [ - int id = shmget(IPC_PRIVATE, 1, IPC_CREAT|0400); - if (id == -1) - return 1; - if (shmctl(id, IPC_RMID, 0) == -1) - return 1; -], [ac_cv_sysv_shm="yes"], [ac_cv_sysv_shm="no"])]) -AS_IF([test x"$ac_cv_sysv_shm" = x"yes"], [dnl - AC_DEFINE(HAVE_SYSV_SHM, 1, [Define if System V shared memory is supported]) -]) AC_ARG_ENABLE(sim-hardware, [ --enable-sim-hardware=list Specify the hardware to be included in the build.],