From nobody Fri Jan 27 00:28:58 2023 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 4P2z2y6JP1z3bGt2; Fri, 27 Jan 2023 00:28:58 +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 4P2z2y5mTqz4Tw6; Fri, 27 Jan 2023 00:28:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674779338; 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=gvQKbEWSNtnPZDtxmaeHe3UKBx4RJpSpEWkD94EyKpE=; b=sK5YqNv3asaCpOr+nGwsiF35sQDi5dDT3NAMSpBKSx5aMTV4cAnBx5UxldGkxAdyYRLjC5 qO6TGbCosZD4etcXhheVHawBYSwNcGDB2KXlKsX2VxF+iA0u7B2sgGrO7SPZu1LjfBYdCV M0bsTAvx7Y2nTHvE3Us3UIGi86kZ6kEQfWgNvzZBNh1ddfkpkf8lYSfB2ppN4zXo76p45P aD/5EPsPznfINTRYbROWzEUY0jOoUbGVYDJHunTsI6jCAba1OhvdXa+obJY2IC9z9oQtYP RPk0AZmIynXIo9EH370imLv1LKf07wd3WWFIXRhd/AhuZvTLxAYbQ58552xfiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674779338; 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=gvQKbEWSNtnPZDtxmaeHe3UKBx4RJpSpEWkD94EyKpE=; b=XPnAoj4j0Rbl9p0xKmM6o8j4bgSk4XDbL5/BHYL8wcifob5/zoUm63oIwthqJDIo8fLLB8 E52I+LZdgi8bW+tSn43t3QSFsMiu9QlTFKVXAOUrCaxbE3EGkiQhMbn2/k87piOtEUQLmi oG7tEYBSpz+JimKRKpF4ZpQAlo1d2nhhgXB5toPhmHHzoWDHpMtvdX25DBzS8wdBfdkO3z ZNZwh2bLjHPISifH+tJUONAdVYqaOhnflA7fP1AAE6ehmueKEXa22bYjqD+WDE0yEjgjIy vSPW1p6ccJwdOj5bPsbDzOMvwkAxePOfmP6slb1A1LJNx+R0CZYOMnjyHzGx9g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674779338; a=rsa-sha256; cv=none; b=YQIqrY+PNiCbREdBcq/S666+HAL9AgwoBp+zTnxUwJW3I8q6nOFkouI2iHr4FkOEl2acw6 U/qevuhESsVJPBuUCtM1aKD4eeYBtc84daysUUcKtXeMS6zubGsxjn1yBxFXfQUpssuhK8 mvOJFU4pMLOy0Isf+RHfB3BDCdfVa663nIYqCKECPuZZ+Q0tZA48sDzKlYQTKjfSynqcvZ EHZipH68vXKXriC4pfTCnlJ3yt+o77hoIvET6vDftJMHrPbq68kHNfZ3yUEcxvrTHL/Oxh hawqx7gYmM/UrWZxlpAktTvZHeNi3+Y8NcDuQ2EH9iwyAB4PeLqqnOXtZMi+nA== 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 4P2z2y4kWfzptx; Fri, 27 Jan 2023 00:28:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30R0Swg4007958; Fri, 27 Jan 2023 00:28:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30R0SwjD007957; Fri, 27 Jan 2023 00:28:58 GMT (envelope-from git) Date: Fri, 27 Jan 2023 00:28:58 GMT Message-Id: <202301270028.30R0SwjD007957@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: e5dc40935f6e - main - Revert "stdlib.h: Fix qsort_r compatibility with GCC 12." 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e5dc40935f6e57c6d1034ae4dea021e677bbae18 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=e5dc40935f6e57c6d1034ae4dea021e677bbae18 commit e5dc40935f6e57c6d1034ae4dea021e677bbae18 Author: John Baldwin AuthorDate: 2023-01-27 00:28:03 +0000 Commit: John Baldwin CommitDate: 2023-01-27 00:28:03 +0000 Revert "stdlib.h: Fix qsort_r compatibility with GCC 12." This reverts commit 43703bc489ec504b947b869045c492ed38c1a69c. Reviewed by: jrtc27 Differential Revision: https://reviews.freebsd.org/D38216 --- include/stdlib.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/include/stdlib.h b/include/stdlib.h index 30d24aea1c10..754e8f5f5fd4 100644 --- a/include/stdlib.h +++ b/include/stdlib.h @@ -352,15 +352,9 @@ void __qsort_r_compat(void *, size_t, size_t, void *, __sym_compat(qsort_r, __qsort_r_compat, FBSD_1.0); #endif #if defined(__generic) && !defined(__cplusplus) -#if __GNUC__ == 12 -#define qsort_r(base, nel, width, arg4, arg5) \ - __generic(arg5, int (void *, const void *, const void *), \ - __qsort_r_compat, qsort_r)(base, nel, width, arg4, arg5) -#else #define qsort_r(base, nel, width, arg4, arg5) \ __generic(arg5, int (*)(void *, const void *, const void *), \ __qsort_r_compat, qsort_r)(base, nel, width, arg4, arg5) -#endif #elif defined(__cplusplus) __END_DECLS extern "C++" {