From nobody Fri May 17 19:06:14 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VgxJQ3YtRz5LdXR; Fri, 17 May 2024 19:06:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VgxJQ1RdCz4rpR; Fri, 17 May 2024 19:06:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715972774; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UA4ehr+lJtV0nUbb/HSioXxw7mkw4BCknMDKZGEpJ9I=; b=vCp0Fr1avrh2TmE9JrecFQ5Gj0WOZ4qE66vmaVPC6VXVL3myCakGFCvaLcfBJZs0Nf1m8F 4ZPuhATk7+M2HVopvLbKrBBGNqpUNY7lib1okdnYuhWMcwGlLB/OzS96AwXnOJxQchXSmd zCPubFweHQu0uXciJBqxNrR5Eeh3ZmvzXhzawXsTeNW2goJNhFO15dS+y/Tz2CpIXnGSrJ barcdVGFrsl1P4AFlZNTZQN2p/MrND8WYOw1dgQbaZ+tV1/Hdf3k039kfGsLiDF/JmmLDZ DTWBYt7nTfobIKelMYkqipJqXuBFVYGxIOTevR00dKGdCSINoOPj1DkuGlI0Qw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715972774; a=rsa-sha256; cv=none; b=sMtP7zkpNhhN9IfV0MXUNZUTRX1tJL+E1aTaTU6kYKPS1JbY6iLRxDjm+hx8LJJ7KtZGUQ 3RBO4h8zouX/5Uea+tYi62UqhNuq76vPM7sLZzAR1PN7tN+8lJOpAS/UKjYoglhysJEhOM 0sgkTk657cOrvnfdqIthHWkJuQT/zMEJZ9XBN2bKTvqiY54lsEmt2/fkAXt0KY582uWvMB da6VFZ9aKc6rBlhALx/0pATLJAktGXq8Ni4a7p09B6FThUEYYEOFYT9e3wUrLi3UP9HYRo mIKgeYg+OsehOAdyC3wt1iUL+Zdw5xBZJYx7Tm4MxLji0Xi581ZAd2qIyIxVMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715972774; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UA4ehr+lJtV0nUbb/HSioXxw7mkw4BCknMDKZGEpJ9I=; b=wcAgGPk8ljMMWMlGOV3sz522ukXY047zyV2GlL/FesWCCkxfCKyKVLpxcvoYtJGoULHnCx UCMa6osNBl2ZBJb50LWxFsGwOB/+L1b6f09L2K1YHN+YiWqyqAFE7K2C0LxfO831Ozhn0Y BNLWBadz+Ngr/sLjPZov23MmhSY4AR6AEMbaNEGwtURl249GnTfVC7RIEPujjXJ+mlVd5R pkzdlpatP8k9gPvVF/tcyk5bhQsNx2G03FhsMoo2/y4ZdToJDbKo0lHQnGOZ9viUrZhzoP ImN7VnIuzQbFrgE3FyJxrEdohZXCx84Rh3qoTbAJI3nu4K6n+yhduqbhYCfAHQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VgxJQ10SDztvZ; Fri, 17 May 2024 19:06:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44HJ6EiK054530; Fri, 17 May 2024 19:06:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44HJ6EtE054527; Fri, 17 May 2024 19:06:14 GMT (envelope-from git) Date: Fri, 17 May 2024 19:06:14 GMT Message-Id: <202405171906.44HJ6EtE054527@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 25db7bd2fac1 - main - libgcc_s: fix nonsense defines List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 25db7bd2fac18bc6083939a5300d1ae5f0d50b74 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=25db7bd2fac18bc6083939a5300d1ae5f0d50b74 commit 25db7bd2fac18bc6083939a5300d1ae5f0d50b74 Author: Brooks Davis AuthorDate: 2024-05-17 18:49:24 +0000 Commit: Brooks Davis CommitDate: 2024-05-17 19:05:36 +0000 libgcc_s: fix nonsense defines These symbols are present on amd64 or i386. Reported by: kaktus, jhibbits Fixes: 98c8caafffb65 libgcc_s: 80-bit long double function are x86-only --- lib/libgcc_s/Symbol.map | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/libgcc_s/Symbol.map b/lib/libgcc_s/Symbol.map index 00b0ed789cf1..e8f7e824adaf 100644 --- a/lib/libgcc_s/Symbol.map +++ b/lib/libgcc_s/Symbol.map @@ -154,17 +154,17 @@ GCC_3.4.4 { GCC_4.0.0 { __divdc3; __divsc3; -#if defined(__amd64__) && define(__i386__) +#if defined(__amd64__) || defined(__i386__) __divxc3; #endif __muldc3; __mulsc3; -#if defined(__amd64__) && define(__i386__) +#if defined(__amd64__) || defined(__i386__) __mulxc3; #endif __powidf2; __powisf2; -#if defined(__amd64__) && define(__i386__) +#if defined(__amd64__) || defined(__i386__) __powixf2; #endif }; @@ -172,7 +172,7 @@ GCC_4.0.0 { GCC_4.2.0 { __floatundidf; __floatundisf; -#if defined(__amd64__) && define(__i386__) +#if defined(__amd64__) || defined(__i386__) __floatundixf; #endif _Unwind_GetIPInfo;