From patchwork Tue Dec 17 12:46:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 103267 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 D6C4A3858CD9 for ; Tue, 17 Dec 2024 12:47:12 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D6C4A3858CD9 Authentication-Results: sourceware.org; dkim=pass (2048-bit key, unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=UQNe2UGs X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-oi1-x234.google.com (mail-oi1-x234.google.com [IPv6:2607:f8b0:4864:20::234]) by sourceware.org (Postfix) with ESMTPS id 2AD723858D1E for ; Tue, 17 Dec 2024 12:46:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 2AD723858D1E Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 2AD723858D1E Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::234 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1734439593; cv=none; b=WOTqHne6av5ekw+Y4lM5dGiMHiKxG7/4cUILoPDEVdMYc/ntdI7Sa/DnDVgvRrqDOq4rqkZXeaJ4UInmoTVU6CbjxsDVLbiXJcMBe9oBbVLdJixY0cmZx8VRlMg8N9uCneyK6pmQJYAYzwak2yUOD6ncM59UUorVIvno0dGDYmo= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1734439593; c=relaxed/simple; bh=2p05A3kVOiI5rFV5gWBrxlSsJ/rwdyE1nIAC4Qty7zg=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=LlP24U9/Js5kcVMjYNvH9epTBd3Xk3gcdTnaOidm/UYquTabBY1LrRYpfgfw3BKex/+1BuorJvMTn8i8LHS9XnHtVWy4rl1ANMcS6CPkA6C0BVDjoTPa4+UJx5nFKBRl+2wt17459UMYtDufxu9GkLnCIfmrXriKgg4IX6a8feo= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2AD723858D1E Received: by mail-oi1-x234.google.com with SMTP id 5614622812f47-3eb8db8ae9aso2360469b6e.1 for ; Tue, 17 Dec 2024 04:46:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1734439592; x=1735044392; darn=sourceware.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=Y5mdCWNm4qzPLPLqlQ2triW5fCVXrbSZUuSBxgv7gHw=; b=UQNe2UGsmCOYIBBH7V5Q7r4xXF6PEGaO1pfG6EXMNY9Q3J8FuNgRcLwPprMxqdm0NQ UilKxuqOxwrfoQL4naMNvN+yJo40QNGRTAu2KY3RpZYJKnUjQ2VPrGgl8hT1lmc4URJD tdqB2lDfH1Vu2TInqtWTw1Rv600gTw4N4XIfQtoqteHPeG8J094C+Ki8vgBOKqb2Ulku TYtP/Qg5lpqX26s0UC8Xci3sZN2RKgjNzc6LTOrYqDAMKCjLW+16FLnNUKJ2AsC6iySV /nv764I21NXv1/Lys6SG0V5mafoe4QcNsregVL7LMc59x7kY3P1BmPg1Baxo9+bo/k7o Rg7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734439592; x=1735044392; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Y5mdCWNm4qzPLPLqlQ2triW5fCVXrbSZUuSBxgv7gHw=; b=cH5VzP4wuLeMy6qG1M5O4ZWbLdGvFuiLPx+j9WazaNM9sEN156gonePC6dT37pxvil DEsrWmk/hD27oL/FE9aM8XpYBlGD9NspyiY1p/xuOpDrfJCvdAABx6tnLSbB0GXFqp7C B9e/Cnm6gqfu/RZ+4B/+KkMlCr5wpAJdVU9/Oq3x5QsNxNKXR7BFvWAuJiMUPrkPq0lP UlkTIdg38uiEjq7ObPbAfZi/UnTXqWTnaM3jNQy9P54Zp8HNXJkyxP2xcXZMXssQzIgb uXQF/gFXvEluwtpzYZD8/fGF7VVubH+HftlDJjEkXiTsDHX9VTJUZ6B2kiwfqOf7Nhdr Ut8g== X-Gm-Message-State: AOJu0YyK/H1AK/WFSlL8qt6jk2cyfJ/Hm/Emfpbq0O8UDoMBQJe3nIaN pP8jqMm+2yu5eJoflSvXsvLqHV5wOXuaKCPU50FOrKUEO0UlNwLyy4+vpik93JOti5Wn X-Gm-Gg: ASbGnctVEEKjPFPx71p5p+4Tln6dT/xhRTVAknIdBEyBt0/V2k28eExA2H5wN6brTTE WSfYmka0Ov3HhHNBEVNdvY/iVgdcL5DYnCNyp9cmEWKemVEXqls1Kzu2X5TNK8ng2v6uwoYn9CK tGddPy/lPFvvGnGzyqi9RVL9Gb4q3q1a4cVlbm8BfFm4kiFqzxcHejDH6RsrXmk0at0aw0biEyp /DJlXnqFNTIvU0TkpKDgFkKje8RQxm6aQ40d6z5mrc/R8zO5RgOEoAt/p9Ic1r+MHngaLGC7QyV 2W0Jn2s2lfEpIxnE X-Google-Smtp-Source: AGHT+IHuzrHhosVUcrwtz0RDAeGLdCo9vA4k2PMhH3XseF//r96qOga7ZR5WxFhuHVXfdLLE2FfXCA== X-Received: by 2002:a05:6808:13d6:b0:3e7:b699:915c with SMTP id 5614622812f47-3ebcb314608mr1254088b6e.24.1734439592224; Tue, 17 Dec 2024 04:46:32 -0800 (PST) Received: from gnu-tgl-3.localdomain ([172.58.109.82]) by smtp.gmail.com with ESMTPSA id 5614622812f47-3ebb4936edesm2262275b6e.47.2024.12.17.04.46.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Dec 2024 04:46:31 -0800 (PST) Received: from gnu-tgl-3.. (localhost [IPv6:::1]) by gnu-tgl-3.localdomain (Postfix) with ESMTP id E9485C013B; Tue, 17 Dec 2024 20:46:27 +0800 (CST) From: "H.J. Lu" To: libc-alpha@sourceware.org Cc: sam@gentoo.org Subject: [PATCH] sys/platform/x86.h: Change _Bool to bool Date: Tue, 17 Dec 2024 20:46:27 +0800 Message-ID: <20241217124627.2364634-1-hjl.tools@gmail.com> X-Mailer: git-send-email 2.47.1 MIME-Version: 1.0 X-Spam-Status: No, score=-3019.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, 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: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces~patchwork=sourceware.org@sourceware.org Change _Bool to bool to silence clang++ error: $ cat c.cc int foo () { return CPU_FEATURE_PRESENT (SSE2); } $ clang++ -c -std=c++98 c.cc In file included from c.cc:1: In file included from /usr/include/sys/platform/x86.h:25: /usr/include/bits/platform/features.h:31:19: error: unknown type name '_Bool' 31 | static __inline__ _Bool | ^ In file included from c.cc:1: /usr/include/sys/platform/x86.h:33:19: error: unknown type name '_Bool' 33 | static __inline__ _Bool | ^ /usr/include/sys/platform/x86.h:46:19: error: unknown type name '_Bool' 46 | static __inline__ _Bool | ^ 3 errors generated. $ Signed-off-by: H.J. Lu --- sysdeps/unix/sysv/linux/x86/bits/platform/features.h | 2 +- sysdeps/x86/bits/platform/features.h | 2 +- sysdeps/x86/sys/platform/x86.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sysdeps/unix/sysv/linux/x86/bits/platform/features.h b/sysdeps/unix/sysv/linux/x86/bits/platform/features.h index 7704febe92..1e63743e3f 100644 --- a/sysdeps/unix/sysv/linux/x86/bits/platform/features.h +++ b/sysdeps/unix/sysv/linux/x86/bits/platform/features.h @@ -28,7 +28,7 @@ enum x86_feature_1_shstk = 1U << 1 }; -static __inline__ _Bool +static __inline__ bool x86_cpu_cet_active (unsigned int __index) { #ifdef __x86_64__ diff --git a/sysdeps/x86/bits/platform/features.h b/sysdeps/x86/bits/platform/features.h index f02489266e..676ad0000a 100644 --- a/sysdeps/x86/bits/platform/features.h +++ b/sysdeps/x86/bits/platform/features.h @@ -20,7 +20,7 @@ # error "Never include directly; use instead." #endif -static __inline__ _Bool +static __inline__ bool x86_cpu_cet_active (unsigned int __index) { return false; diff --git a/sysdeps/x86/sys/platform/x86.h b/sysdeps/x86/sys/platform/x86.h index b8066ccc9f..1f5378031c 100644 --- a/sysdeps/x86/sys/platform/x86.h +++ b/sysdeps/x86/sys/platform/x86.h @@ -30,7 +30,7 @@ __BEGIN_DECLS extern const struct cpuid_feature *__x86_get_cpuid_feature_leaf (unsigned int) __attribute__ ((pure)); -static __inline__ _Bool +static __inline__ bool x86_cpu_present (unsigned int __index) { const struct cpuid_feature *__ptr = __x86_get_cpuid_feature_leaf @@ -43,7 +43,7 @@ x86_cpu_present (unsigned int __index) return __ptr->cpuid_array[__reg] & (1 << __bit); } -static __inline__ _Bool +static __inline__ bool x86_cpu_active (unsigned int __index) { if (__index == x86_cpu_IBT || __index == x86_cpu_SHSTK)