From patchwork Wed Jun 16 08:43:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre-Marie de Rodat X-Patchwork-Id: 1492801 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4G4f0Z1dPcz9sSn for ; Wed, 16 Jun 2021 18:45:50 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id BF516398B176 for ; Wed, 16 Jun 2021 08:45:47 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from rock.gnat.com (rock.gnat.com [IPv6:2620:20:4000:0:a9e:1ff:fe9b:1d1]) by sourceware.org (Postfix) with ESMTPS id BFA64398900C for ; Wed, 16 Jun 2021 08:43:55 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org BFA64398900C Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id 71001117D47; Wed, 16 Jun 2021 04:43:55 -0400 (EDT) X-Virus-Scanned: Debian amavisd-new at gnat.com Received: from rock.gnat.com ([127.0.0.1]) by localhost (rock.gnat.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id mlG97GylgThn; Wed, 16 Jun 2021 04:43:55 -0400 (EDT) Received: from tron.gnat.com (tron.gnat.com [205.232.38.10]) by rock.gnat.com (Postfix) with ESMTP id 5D6EB117762; Wed, 16 Jun 2021 04:43:55 -0400 (EDT) Received: by tron.gnat.com (Postfix, from userid 4862) id 5AB63180; Wed, 16 Jun 2021 04:43:55 -0400 (EDT) Date: Wed, 16 Jun 2021 04:43:55 -0400 From: Pierre-Marie de Rodat To: gcc-patches@gcc.gnu.org Subject: [Ada] Small cleanup in C header files Message-ID: <20210616084355.GA94434@adacore.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) X-Spam-Status: No, score=-12.6 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eric Botcazou Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" This removes obsolete stuff. Tested on x86_64-pc-linux-gnu, committed on trunk gcc/ada/ * initialize.c: Do not include vxWorks.h and fcntl.h from here. (__gnat_initialize) [__MINGW32__]: Remove #ifdef and attribute (__gnat_initialize) [init_float]: Delete. (__gnat_initialize) [VxWorks]: Likewise. (__gnat_initialize) [PA-RISC HP-UX 10]: Likewise. * runtime.h: Add comment about vxWorks.h include. diff --git a/gcc/ada/initialize.c b/gcc/ada/initialize.c --- a/gcc/ada/initialize.c +++ b/gcc/ada/initialize.c @@ -29,29 +29,19 @@ * * ****************************************************************************/ -/* This unit provides default implementation for __gnat_initialize () - which is called before the elaboration of the partition. It is provided - in a separate file/object so that users can replace it easily. - The default implementation should be null on most targets. */ - -/* The following include is here to meet the published VxWorks requirement - that the __vxworks header appear before any other include. */ -#ifdef __vxworks -#include "vxWorks.h" -#endif +/* This unit provides the default implementation of __gnat_initialize, which + is called before the elaboration of the partition. It is provided in a + separate file so that users can replace it easily. But the implementation + should be empty on most targets. */ #ifdef IN_RTS #include "runtime.h" -/* We don't have libiberty, so use malloc. */ -#define xmalloc(S) malloc (S) -#define xrealloc(V,S) realloc (V,S) #else #include "config.h" #include "system.h" #endif #include "raise.h" -#include #ifdef __cplusplus extern "C" { @@ -63,65 +53,16 @@ extern "C" { #if defined (__MINGW32__) -extern void __gnat_install_SEH_handler (void *); - void -__gnat_initialize (void *eh ATTRIBUTE_UNUSED) +__gnat_initialize (void *eh) { - /* Note that we do not activate this for the compiler itself to avoid a - bootstrap path problem. Older version of gnatbind will generate a call - to __gnat_initialize() without argument. Therefore we cannot use eh in - this case. It will be possible to remove the following #ifdef at some - point. */ -#ifdef IN_RTS /* Install the Structured Exception handler. */ if (eh) __gnat_install_SEH_handler (eh); -#endif -} - -/******************************************/ -/* __gnat_initialize (init_float version) */ -/******************************************/ - -#elif defined (__Lynx__) || defined (__FreeBSD__) || defined(__NetBSD__) \ - || defined (__OpenBSD__) || defined (__DragonFly__) - -void -__gnat_initialize (void *eh ATTRIBUTE_UNUSED) -{ -} - -/***************************************/ -/* __gnat_initialize (VxWorks Version) */ -/***************************************/ - -#elif defined(__vxworks) - -void -__gnat_initialize (void *eh) -{ -} - -#elif defined(_T_HPUX10) || (!defined(IN_RTS) && defined(_X_HPUX10)) - -/************************************************/ -/* __gnat_initialize (PA-RISC HP-UX 10 Version) */ -/************************************************/ - -extern void __main (void); - -void -__gnat_initialize (void *eh ATTRIBUTE_UNUSED) -{ - __main (); } #else -/* For all other versions of GNAT, the initialize routine and handler - installation do nothing */ - /***************************************/ /* __gnat_initialize (Default Version) */ /***************************************/ @@ -130,6 +71,7 @@ void __gnat_initialize (void *eh ATTRIBUTE_UNUSED) { } + #endif #ifdef __cplusplus diff --git a/gcc/ada/runtime.h b/gcc/ada/runtime.h --- a/gcc/ada/runtime.h +++ b/gcc/ada/runtime.h @@ -31,9 +31,11 @@ /* This file provides common definitions used by GNAT C runtime files. */ +/* The following include is here to meet the published VxWorks requirement + that the vxWorks.h header appear before any other header. */ #ifdef __vxworks #include "vxWorks.h" -#endif /* __vxworks */ +#endif #ifndef ATTRIBUTE_UNUSED #define ATTRIBUTE_UNUSED __attribute__((unused))