From patchwork Tue Dec 6 14:47:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gaius Mulley X-Patchwork-Id: 61573 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 C94523875B6C for ; Tue, 6 Dec 2022 14:48:02 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C94523875B6C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1670338082; bh=0pRlOEw0BmqNSg0WUJPZn8JmJ6vQM+JyC4pQgsV1aX8=; h=Subject:To:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=nrccmcI+ySiQu8JC+lvEPbmOQ/JU1Qrw4LN2SbqXb9T1ESU02eJ/P8E1hd8b3VEcr mlqAjHDWZT76fhoD/wai7AEH56XCalUS4Flk4G1CyUIWNXbMatiLE/RLiTR59AcARf 5oQodApvtD21+FCvlMutzgpoJQ4KPTq+tHuqCtXQ= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) by sourceware.org (Postfix) with ESMTPS id 223EE3846980 for ; Tue, 6 Dec 2022 14:47:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 223EE3846980 Received: by mail-wm1-x336.google.com with SMTP id v7so11367352wmn.0 for ; Tue, 06 Dec 2022 06:47:30 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=date:message-id:to:subject:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0pRlOEw0BmqNSg0WUJPZn8JmJ6vQM+JyC4pQgsV1aX8=; b=Cl2gz9DIAxYeHEedaGZO2xPGko4j47gD/OEyPZ1IMmiNPKukHIAILZJPnYXkvgHncJ 8QaJjwgOGhmtpIjvhPuR1/mEeyZaQ0GEQLUpz6pWU7Ted/6pKAXvOVG0vJaR8UYUfHKp XHkwta4ms732tiEyd1TuFDqqnBEOoh2RqDkeJ2Sht3sbvsIjPLWTvo5qg33eCNMrVYz9 iXGKukqfDCrB/hFl/4q/nk+9b292Y96xE4YhfCUJQBsWM9MSIkMyddOLVFQ+DSz+HJ4k a6Qn4GjmiPk/VRAgRX8R8wO/dew5+umWp9cfqU8ywAIGXtQoZ05YpPhixHpuNz8QlQdS /06Q== X-Gm-Message-State: ANoB5pkdgnoktDu8EipPWT9IQeEpk022V/MOQGLIZZFvmbNeCrrxbrgV RcyrJMIcf4Rp7ZInWr118t0bUocVeLU= X-Google-Smtp-Source: AA0mqf7xURtWdNItSqKEYaPeoODXAKhC2mx7C8KPCxU0MZ5tz3CIpKZ1DU+Ad1gtYuwV7XL6kKCgKQ== X-Received: by 2002:a05:600c:554b:b0:3d0:88b4:9cda with SMTP id iz11-20020a05600c554b00b003d088b49cdamr13183045wmb.114.1670338048855; Tue, 06 Dec 2022 06:47:28 -0800 (PST) Received: from lancelot ([195.147.220.46]) by smtp.gmail.com with ESMTPSA id z16-20020a5d4d10000000b00241c712916fsm20788110wrt.0.2022.12.06.06.47.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Dec 2022 06:47:28 -0800 (PST) X-Google-Original-From: Gaius Mulley Received: from gaius by lancelot with local (Exim 4.94.2) (envelope-from ) id 1p2ZEE-004QfF-Gz for gcc-patches@gcc.gnu.org; Tue, 06 Dec 2022 14:47:26 +0000 Subject: [PATCH v3 7/19] modula2 front end: libgm2/libm2log contents To: X-Mailer: mail (GNU Mailutils 3.10) Message-Id: Date: Tue, 06 Dec 2022 14:47:26 +0000 X-Spam-Status: No, score=-1.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP 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: 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: , X-Patchwork-Original-From: Gaius Mulley via Gcc-patches From: Gaius Mulley Reply-To: Gaius Mulley Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" This patch set consists of the makefiles, autoconf sources necessary to build the various libgm2 libraries. The c/c++/h files are included in the patch set. The modula-2 sources are found in gcc/m2. ------8<----------8<----------8<----------8<----------8<----------8<---- diff -ruw /dev/null gcc-git-devel-modula2/libgm2/libm2log/Break.c --- /dev/null 2022-08-24 16:22:16.888000070 +0100 +++ gcc-git-devel-modula2/libgm2/libm2log/Break.c 2022-12-06 02:56:51.432775922 +0000 @@ -0,0 +1,134 @@ +/* Break.c implements an interrupt handler for SIGINT. + +Copyright (C) 2004-2022 Free Software Foundation, Inc. +Contributed by Gaius Mulley . + +This file is part of GNU Modula-2. + +GNU Modula-2 is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 3, or (at your option) +any later version. + +GNU Modula-2 is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +Under Section 7 of GPL version 3, you are granted additional +permissions described in the GCC Runtime Library Exception, version +3.1, as published by the Free Software Foundation. + +You should have received a copy of the GNU General Public License and +a copy of the GCC Runtime Library Exception along with this program; +see the files COPYING3 and COPYING.RUNTIME respectively. If not, see +. */ + +#include + +#if defined(HAVE_STDIO_H) +#include +#endif + +#if defined(HAVE_STDARG_H) +#include +#endif + +#if defined(HAVE_STDLIB_H) +#include +#endif + +#if defined(HAVE_MALLOC_H) +#include +#endif + +typedef void (*PROC) (void); + +#if defined(HAVE_SIGNAL_H) +#include + +struct plist +{ + PROC proc; + struct plist *next; +}; + +static struct plist *head = NULL; + +/* localHandler - dismisses the parameter, p, and invokes the GNU + Modula-2 handler. */ + +static void +localHandler (int p) +{ + if (head != NULL) + head->proc (); +} + +/* EnableBreak - enable the current break handler. */ + +void +Break_EnableBreak (void) +{ + signal (SIGINT, localHandler); +} + +/* DisableBreak - disable the current break handler (and all + installed handlers). */ + +void +Break_DisableBreak (void) +{ + signal (SIGINT, SIG_IGN); +} + +/* InstallBreak - installs a procedure, p, to be invoked when a + ctrl-c is caught. Any number of these procedures may be stacked. + Only the top procedure is run when ctrl-c is caught. */ + +void +Break_InstallBreak (PROC p) +{ + struct plist *q = (struct plist *)malloc (sizeof (struct plist)); + + if (q == NULL) + { + perror ("out of memory error in module Break"); + exit (1); + } + q->next = head; + head = q; + head->proc = p; +} + +/* UnInstallBreak - pops the break handler stack. */ + +void +Break_UnInstallBreak (void) +{ + struct plist *q = head; + + if (head != NULL) + { + head = head->next; + free (q); + } +} +#else +void +Break_EnableBreak (void) +{ +} +void +Break_DisableBreak (void) +{ +} +void +Break_InstallBreak (PROC *p) +{ +} +void +Break_UnInstallBreak (void) +{ +} +#endif diff -ruw /dev/null gcc-git-devel-modula2/libgm2/libm2log/Makefile.am --- /dev/null 2022-08-24 16:22:16.888000070 +0100 +++ gcc-git-devel-modula2/libgm2/libm2log/Makefile.am 2022-12-06 02:56:51.432775922 +0000 @@ -0,0 +1,166 @@ +# Makefile for libm2log. +# Copyright 2013-2022 Free Software Foundation, Inc. +# +# This file is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; see the file COPYING3. If not see +# . + +SUFFIXES = .c .mod .def .o .obj .lo .a .la + +ACLOCAL_AMFLAGS = -I . -I .. -I ../config + +VPATH = . @srcdir@ @srcdir@/../../gcc/m2/gm2-libs-pim + +# Multilib support. +MAKEOVERRIDES= + +version := $(shell $(CC) -dumpversion) + +# Directory in which the compiler finds libraries etc. +libsubdir = $(libdir)/gcc/$(target_alias)/$(version) +# Used to install the shared libgcc. +slibdir = @slibdir@ + +toolexeclibdir=@toolexeclibdir@ +toolexecdir=@toolexecdir@ +GM2_FOR_TARGET=@GM2_FOR_TARGET@ + +MULTIDIR := $(shell $(CC) $(CFLAGS) -print-multi-directory) +MULTIOSDIR := $(shell $(CC) $(CFLAGS) -print-multi-os-directory) + +MULTIOSSUBDIR := $(shell if test x$(MULTIOSDIR) != x.; then echo /$(MULTIOSDIR); fi) +inst_libdir = $(libsubdir)$(MULTISUBDIR) +inst_slibdir = $(slibdir)$(MULTIOSSUBDIR) + + +# Work around what appears to be a GNU make bug handling MAKEFLAGS +# values defined in terms of make variables, as is the case for CC and +# friends when we are called from the top level Makefile. +AM_MAKEFLAGS = \ + "GCC_DIR=$(GCC_DIR)" \ + "GM2_SRC=$(GM2_SRC)" \ + "AR_FLAGS=$(AR_FLAGS)" \ + "CC_FOR_BUILD=$(CC_FOR_BUILD)" \ + "CC_FOR_TARGET=$(CC_FOR_TARGET)" \ + "GM2_FOR_TARGET=$(GM2_FOR_TARGET)" \ + "CFLAGS=$(CFLAGS)" \ + "CXXFLAGS=$(CXXFLAGS)" \ + "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \ + "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \ + "INSTALL=$(INSTALL)" \ + "INSTALL_DATA=$(INSTALL_DATA)" \ + "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \ + "INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \ + "LDFLAGS=$(LDFLAGS)" \ + "LIBCFLAGS=$(LIBCFLAGS)" \ + "LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \ + "MAKE=$(MAKE)" \ + "MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" \ + "MULTISUBDIR=$(MULTISUBDIR)" \ + "MULTIOSDIR=$(MULTIOSDIR)" \ + "MULTIBUILDTOP=$(MULTIBUILDTOP)" \ + "MULTIFLAGS=$(MULTIFLAGS)" \ + "PICFLAG=$(PICFLAG)" \ + "PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" \ + "SHELL=$(SHELL)" \ + "RUNTESTFLAGS=$(RUNTESTFLAGS)" \ + "exec_prefix=$(exec_prefix)" \ + "infodir=$(infodir)" \ + "libdir=$(libdir)" \ + "includedir=$(includedir)" \ + "prefix=$(prefix)" \ + "tooldir=$(tooldir)" \ + "gxx_include_dir=$(gxx_include_dir)" \ + "AR=$(AR)" \ + "AS=$(AS)" \ + "LD=$(LD)" \ + "RANLIB=$(RANLIB)" \ + "NM=$(NM)" \ + "NM_FOR_BUILD=$(NM_FOR_BUILD)" \ + "NM_FOR_TARGET=$(NM_FOR_TARGET)" \ + "DESTDIR=$(DESTDIR)" \ + "WERROR=$(WERROR)" \ + "TARGET_LIB_PATH_libgm2=$(TARGET_LIB_PATH_libgm2)" + +# Subdir rules rely on $(FLAGS_TO_PASS) +FLAGS_TO_PASS = $(AM_MAKEFLAGS) + + +if BUILD_LOGLIB +M2DEFS = BitBlockOps.def BitByteOps.def \ + BitWordOps.def BlockOps.def \ + Break.def CardinalIO.def \ + Conversions.def DebugPMD.def \ + DebugTrace.def Delay.def \ + Display.def ErrorCode.def \ + FileSystem.def FloatingUtilities.def \ + InOut.def Keyboard.def \ + LongIO.def NumberConversion.def \ + Random.def RealConversions.def \ + RealInOut.def Strings.def \ + Termbase.def Terminal.def \ + TimeDate.def + +M2MODS = BitBlockOps.mod BitByteOps.mod \ + BitWordOps.mod BlockOps.mod \ + CardinalIO.mod Conversions.mod \ + DebugPMD.mod DebugTrace.mod \ + Delay.mod Display.mod \ + ErrorCode.mod FileSystem.mod \ + FloatingUtilities.mod InOut.mod \ + Keyboard.mod LongIO.mod \ + NumberConversion.mod Random.mod \ + RealConversions.mod RealInOut.mod \ + Strings.mod Termbase.mod \ + Terminal.mod TimeDate.mod + + +libm2logdir = libm2log +toolexeclib_LTLIBRARIES = libm2log.la +libm2log_la_SOURCES = $(M2MODS) Break.c + +libm2log_la_DEPENDENCIES = ../libm2pim/SYSTEM.def $(addsuffix .lo, $(basename $(libm2log_la_SOURCES))) +libm2log_la_CFLAGS = -I. -DBUILD_GM2_LIBS -I@srcdir@/../ +libm2log_la_M2FLAGS = -I../libm2pim -I$(GM2_SRC)/gm2-libs-pim -I$(GM2_SRC)/gm2-libs -I$(GM2_SRC)/gm2-libs-iso +libm2log_la_LINK = $(LINK) -version-info $(libtool_VERSION) +BUILT_SOURCES = ../libm2pim/SYSTEM.def + +M2LIBDIR = /m2/m2log/ + +../libm2pim/SYSTEM.def: ../libm2pim/Makefile + cd ../libm2pim ; $(MAKE) $(AM_MAKEFLAGS) SYSTEM.def + +.mod.lo: + $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(GM2_FOR_TARGET) -c $(CFLAGS_FOR_TARGET) $(LIBCFLAGS) $(libm2log_la_M2FLAGS) $< -o $@ + +install-data-local: force + mkdir -p $(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR) + $(INSTALL_DATA) .libs/libm2log.la $(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR) + chmod 644 $(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)libm2log.la + $(INSTALL_DATA) .libs/libm2log.a $(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR) + chmod 644 $(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)libm2log.a + $(RANLIB) $(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)libm2log.a + for i in $(M2DEFS) $(M2MODS) ; do \ + if [ -f $$i ] ; then \ + $(INSTALL_DATA) $$i '$(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)'; \ + elif [ -f @srcdir@/../../gcc/m2/gm2-libs-pim/$$i ] ; then \ + $(INSTALL_DATA) @srcdir@/../../gcc/m2/gm2-libs-pim/$$i '$(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)'; \ + else \ + echo "cannot find $$i" ; exit 1 ; \ + fi ; \ + chmod 644 $(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)$$i ; \ + done + +force: + +endif