From patchwork Mon Feb 12 12:31:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rainer Orth X-Patchwork-Id: 199719 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:50ea:b0:106:860b:bbdd with SMTP id r10csp2395178dyd; Mon, 12 Feb 2024 04:32:02 -0800 (PST) X-Google-Smtp-Source: AGHT+IE3DldT2kODWjkpZkBvt46xqXi118j4WpD0LFW6Qtr2VhjupnuhnNTceoOwvdbcGuhlwTst X-Received: by 2002:a05:620a:d41:b0:783:df39:a1cd with SMTP id o1-20020a05620a0d4100b00783df39a1cdmr7121810qkl.46.1707741122017; Mon, 12 Feb 2024 04:32:02 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707741122; cv=pass; d=google.com; s=arc-20160816; b=SSVIGCCcbLvGxamXD/R01b3cfiQDEpuVYlRp/+O9Zfptu0Nlop6X3t9FvJnXrmy3Jb WX3N7jnIlIvtk1F1xPdGH5QS232jQMZtKNQD39BNwOWpfbjDd6wFy2f5cwFCEApb32WN HCKzABM92VX2PoE8Se8QEoozmFHCzEtcdOq9taQXjmBzzQwNmSPFqaWWRzc4nlhunqQL baPGL3EY8ZUzDyVvdAksB21x+MDaibTOZfST4Sgn/LYIu2k8kUvF9nfEpCz0uej/RkP9 WfUQhFhLbT2HQoH2WVLZUZn/eEHBQx+BSaP7SiwWzm7XQ+FapWZIC8IQOgQo84T6NR68 piVg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:mime-version:user-agent :message-id:date:subject:cc:to:from:dkim-signature:arc-filter :dmarc-filter:delivered-to; bh=QkbMVJQA9EqR5un4eJLOusEw7jnKAAfGlWuCiTlRu6I=; fh=DvMabZm7Q1acKifqyQVdEHfV4p4iYr1Vie74lg6KpOs=; b=RcaEdW5a7i8IlpkPI1nD2FCOmb2r9u7/xPGFDtVpBhBTgp+7n6ikVim0ucKWVwQi5B SVQ70Qy9uopVjvB7icZe79LbcrQJgEK4OEZhy+RCmtqQfkTQ8odq7K8Wg0b7pd9CzCDK 5BZX05dtSRnf0PuleJyE7GDIUw3eB3xuy0YUHcGHEWCVu00SesQydAxZ3aBeNRv/e7d1 OTkCgcV/l83QuT37999kI/TI7Rft2flXGCC1bE1Ks4R689lO/w0G7yROoDiq5LaQO9hr PWs7aE6ufUSTz2j0gTjv1oK4vxsAmLoAKrqdHlfINnBZmnVd4UsgBLdhtpHGqNbFCXRw 2C5Q==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@cebitec.uni-bielefeld.de header.s=20200306 header.b=fERlqT3H; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" X-Forwarded-Encrypted: i=2; AJvYcCXTC/1SDqtwrr3vHEpKusRpA+/v0RlNpp7P3C7+tEwm0d/aqHaE7QAm4l5/eFUCPs0O/DCRpDJOUbDQVkcuEuPSP+pIYQ== Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id b21-20020a05620a089500b00785cd648249si4269895qka.408.2024.02.12.04.32.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Feb 2024 04:32:01 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@cebitec.uni-bielefeld.de header.s=20200306 header.b=fERlqT3H; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id B32173858CDB for ; Mon, 12 Feb 2024 12:32:01 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtp.CeBiTec.Uni-Bielefeld.DE (smtp.CeBiTec.Uni-Bielefeld.DE [129.70.160.84]) by sourceware.org (Postfix) with ESMTPS id 6D06A3858D37 for ; Mon, 12 Feb 2024 12:31:19 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 6D06A3858D37 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=CeBiTec.Uni-Bielefeld.DE Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=cebitec.uni-bielefeld.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 6D06A3858D37 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=129.70.160.84 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1707741081; cv=none; b=xWBBe1gw5a+yr1d7ZSw99hPsX/z4587dS8oPmiUlI7K7ayTSU/wcJNoebaERnK9UGNwR18LFQ30cluFR9guDqgulJk74Z39IOsDzkyGyNv58ycCDc5WAAVj2iiVGp5U4icsXLaFIrLWJI4Cq1nhNczO0DsOGuVcRVvrKiOBdEbc= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1707741081; c=relaxed/simple; bh=iHLDXBuG5n1W6g//jM2TRolX2Sgz4UAZrdOvE37mqPw=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=kDTwiMxXr6BsDpIj+FI8ND6JUv0tO2md7bTiAFdi/oD0acToAExVpcjPJjYDHJdblTQxHM/NGy29cbfO+E+Xtc+r1C8NuU3CEw6DgoELjerMH2t5Ud2vFyzmg7FnWwqq1Gbln+OLgg7eQt0yE6W0rMX5LCbHlS5v/ITyD0TPqzc= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from localhost (localhost [127.0.0.1]) by smtp.CeBiTec.Uni-Bielefeld.DE (Postfix) with ESMTP id 6C611BD6FC; Mon, 12 Feb 2024 13:31:18 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d= cebitec.uni-bielefeld.de; h=content-type:content-type :mime-version:user-agent:message-id:date:date:subject:subject :from:from:received:received; s=20200306; t=1707741077; bh=iHLDX BuG5n1W6g//jM2TRolX2Sgz4UAZrdOvE37mqPw=; b=fERlqT3HQWnB2ZDtF2Zzm gBzGRCEbxr/8qzS4z3P6zo70LnyRa9VKqt9IEesZeU6MkenLqMDLxSKKpYClgNcI b6HchiTyNfUVbQbeojEqiuLAYGMqZhTLR4/jkDI+bDMMVS/M/SSxp9pM3amjWDZD s5sXRTjEVa5IZ2s/rhmEaGxBnT7SwJ5n3HJfm5vxOO4VUkSJaT65UG2w4qBdMOoH fmIY+L79h+M/1oW/F2J3FBMmQXySqyag7pumeeVNvx5gfNMAPMpPbytkEo9xSEfE 0/ceqJ6q7srdxsjEa+2lxXXx2EJTQapMEEnn1ADfphj57KOlQ5ptiWMzE9hDIhfy Q== X-Virus-Scanned: amavisd-new at cebitec.uni-bielefeld.de Received: from smtp.CeBiTec.Uni-Bielefeld.DE ([127.0.0.1]) by localhost (smtp.cebitec.uni-bielefeld.de [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id Ltm-2OGO4hxs; Mon, 12 Feb 2024 13:31:17 +0100 (CET) Received: from manam.CeBiTec.Uni-Bielefeld.DE (p5085539e.dip0.t-ipconnect.de [80.133.83.158]) (Authenticated sender: ro) by smtp.CeBiTec.Uni-Bielefeld.DE (Postfix) with ESMTPSA id B15AEBDCA8; Mon, 12 Feb 2024 13:31:17 +0100 (CET) From: Rainer Orth To: gcc-patches@gcc.gnu.org Cc: Gaius Mulley Subject: [PATCH] libgm2: Define missing configure macros [PR113888] Date: Mon, 12 Feb 2024 13:31:17 +0100 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1.90 (usg-unix-v) MIME-Version: 1.0 X-Spam-Status: No, score=-3791.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, GIT_PATCH_0, SPF_HELO_NONE, 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: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790696354757886345 X-GMAIL-MSGID: 1790696354757886345 As detailed in PR modula2/113888, the 32-bit libm2pim/target.c doesn't assemble in a Linux/sparc64 multilib build. However, the root cause is that the HAVE_EXP10* macros are never defined. While I was at it, I checked for other cases where the code uses HAVE_* macros that are missing from config.h.in. This patch adds the missing checks, changes the configure checks where the names don't match what's used in the code, or corrects the code to use the right names. So far tested on sparc64-unknown-linux-gnu by building libgm2 (32 and 64-bit) and running the gm2 tests. Ok for trunk? Rainer # HG changeset patch # Parent 4f9cde8a5ed4b67cc625923887c1fcf610e8234c libgm2: Define missing configure macros [PR113888] diff --git a/libgm2/configure.ac b/libgm2/configure.ac --- a/libgm2/configure.ac +++ b/libgm2/configure.ac @@ -297,7 +297,7 @@ GM2_CHECK_LIB([c],[getgid],[GETGID]) GM2_CHECK_LIB([c],[getopt_long],[GETOPT_LONG]) GM2_CHECK_LIB([c],[getopt_long_only],[GETOPT_LONG_ONLY]) GM2_CHECK_LIB([c],[getpid],[GETPID]) -GM2_CHECK_LIB([c],[gettimeofday],[GETTIMEOFD]) +GM2_CHECK_LIB([c],[gettimeofday],[GETTIMEOFDAY]) GM2_CHECK_LIB([c],[getuid],[GETUID]) GM2_CHECK_LIB([c],[ioctl],[IOCTL]) GM2_CHECK_LIB([c],[kill],[KILL]) @@ -311,6 +311,7 @@ GM2_CHECK_LIB([c],[read],[READ]) GM2_CHECK_LIB([c],[select],[SELECT]) GM2_CHECK_LIB([c],[setitimer],[SETITIMER]) GM2_CHECK_LIB([c],[setgid],[SETGID]) +GM2_CHECK_LIB([c],[settimeofday],[SETTIMEOFDAY]) GM2_CHECK_LIB([c],[setuid],[SETUID]) GM2_CHECK_LIB([c],[stat],[STAT]) GM2_CHECK_LIB([c],[strsignal],[STRSIGNAL]) @@ -323,10 +324,15 @@ GM2_CHECK_LIB([c],[unlink],[UNLINK]) GM2_CHECK_LIB([c],[wait],[WAIT]) GM2_CHECK_LIB([c],[write],[WRITE]) +GM2_CHECK_LIB([m],[exp10],[EXP10]) +GM2_CHECK_LIB([m],[exp10f],[EXP10F]) +GM2_CHECK_LIB([m],[exp10l],[EXP10L]) GM2_CHECK_LIB([m],[signbit],[SIGNBIT]) GM2_CHECK_LIB([m],[signbitf],[SIGNBITF]) GM2_CHECK_LIB([m],[signbitl],[SIGNBITL]) +AC_CHECK_DECLS([getenv]) + AC_MSG_NOTICE([libgm2 has finished checking target libc and libm contents.]) # We test the host here and later on check the target. diff --git a/libgm2/libm2pim/dtoa.cc b/libgm2/libm2pim/dtoa.cc --- a/libgm2/libm2pim/dtoa.cc +++ b/libgm2/libm2pim/dtoa.cc @@ -33,11 +33,11 @@ see the files COPYING3 and COPYING.RUNTI #define M2EXPORT(FUNC) m2pim ## _M2_dtoa_ ## FUNC #define M2LIBNAME "m2pim" -#if defined(HAVE_STRINGS) +#if defined(HAVE_STRINGS_H) #include #endif -#if defined(HAVE_STRING) +#if defined(HAVE_STRING_H) #include #endif diff --git a/libgm2/libm2pim/ldtoa.cc b/libgm2/libm2pim/ldtoa.cc --- a/libgm2/libm2pim/ldtoa.cc +++ b/libgm2/libm2pim/ldtoa.cc @@ -34,11 +34,11 @@ see the files COPYING3 and COPYING.RUNTI #define M2EXPORT(FUNC) m2pim ## _M2_ldtoa_ ## FUNC #define M2LIBNAME "m2pim" -#if defined(HAVE_STRINGS) +#if defined(HAVE_STRINGS_H) #include #endif -#if defined(HAVE_STRING) +#if defined(HAVE_STRING_H) #include #endif