From patchwork Tue Apr 23 20:54:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 88935 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 E8462385840B for ; Tue, 23 Apr 2024 20:54:46 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pf1-x42c.google.com (mail-pf1-x42c.google.com [IPv6:2607:f8b0:4864:20::42c]) by sourceware.org (Postfix) with ESMTPS id B2B54385840B for ; Tue, 23 Apr 2024 20:54:22 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B2B54385840B 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 B2B54385840B Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::42c ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713905664; cv=none; b=ZWCjHSbMulHRcKwmJRI5BrQt0lkORVNTsYFhQCFjqf4RxqxpCV/Flg6sHXn3Sk9Bk5nJxQs2WHCWCKnZnakmcg7O37tVKB0oIIzJXW66DvjuSVJCGhC+N6VH4/K0ATmvXTFQpFKDe+gbjNkDIm2R5Cnxz/hAGWPTXEb04dJ41Fo= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713905664; c=relaxed/simple; bh=IlQbS91Fjfluwlf8JQe25aXRopcE2hnJEKqGzTuTHYE=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=XsrVZ8a+3/pkD+cMtP29qu6MgHIQ2qLsmDlHoweuP5/xAoMIRT0FVwO+eckcOsjhBq+Ck5y/68i+rzpkPzIUHSZfpxlGxFRUgwoOHufQcDaQDK/pmQRoaVmu1fl2BofTJFWZ6QPvXppecP4Tk4LS6DRHNoU/j7lG5zExqH805Xo= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pf1-x42c.google.com with SMTP id d2e1a72fcca58-6effe9c852eso5235591b3a.3 for ; Tue, 23 Apr 2024 13:54:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713905661; x=1714510461; 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=WdZdxCEwBptHy5JPc941qHkNoqmQXGXZk19cga/C678=; b=M1NgiluphzwDljVSJgi6tQQZhvwfJWGuFEQHHsnH74XqIhSe84hdPyvNWolq2h6EDU iOexlqanR9KIIQbl0hTK9iK6AmLtdVArQkOWLRMpFku+laO9lZ8vZgMoho/kbLWcx8hg JRP/y+CBiOxu4JhEimSu7pxmBj9qbjNP8PeMr1a6YN1Uak05LKEA+ttrhC9d1mkAXAqb zKHaad0RyfhlYzPjmo/icCny18aw6CgOrrfNlBYc3PKSoXaDF1Dd6fvZ3fM571fanmvO 2+tAnFjNQQXWJ5Bjf+Wke2HLrRh0HrC3/kCXPDPFSy9eRHONZYX3woN/7Bt354S7IkhA Wt/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713905661; x=1714510461; 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=WdZdxCEwBptHy5JPc941qHkNoqmQXGXZk19cga/C678=; b=SpOppZG95ZSjN80hShvzv8UxK0GCoX+9OBg7uHf8SwVDxcdyNc0vyo4pNTaOaYChxT IctQEPIdLRB85gpf7vfhZtMATmWvXxJ/oZdImCkdCLy/DHTW0xVeRsgzW3tgXQzFASXu 7dsGqjtECKVYNpINyjSl7xewD4YdLBHeKVoPgOkj82g7KvtgrcFwDIh4P5Z9pC2wmQdb 7/xE2ElOK0m3C2pa+/DtRi8km8DnHBiMdXLF/iKFlM8Ieizy36NDficTP7srN1TYEWn5 79TJ/JbEnyAEzXyvHteQ/o7s1RXTStWKWREaQwXrVwMOkXxH0UOcjR+hnynU3gnMCQcd 5nLw== X-Gm-Message-State: AOJu0YxUX/41ZwsccCHCw99J4yUaVMFIthIkYk5cPhxJCsB+DI8eQlD/ jpa2tk++0AopLqo9IZn1iNa0zXbs/YPJLk4uOXu4+vPpIso7hzTa X-Google-Smtp-Source: AGHT+IFH7Ip56y2MOk/GT0v82XX6YA0maRC1+rphRFxQlG5T9chH/nWgdm6W5GDmhAhfj3Uif89ABA== X-Received: by 2002:a05:6a00:a1b:b0:6ed:d8d2:503d with SMTP id p27-20020a056a000a1b00b006edd8d2503dmr792409pfh.20.1713905659616; Tue, 23 Apr 2024 13:54:19 -0700 (PDT) Received: from gnu-cfl-3.localdomain ([172.56.168.158]) by smtp.gmail.com with ESMTPSA id i13-20020a63e44d000000b005d8b89bbf20sm9743814pgk.63.2024.04.23.13.54.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Apr 2024 13:54:19 -0700 (PDT) Received: from gnu-cfl-3.. (localhost [IPv6:::1]) by gnu-cfl-3.localdomain (Postfix) with ESMTP id 162247402B9; Tue, 23 Apr 2024 13:54:18 -0700 (PDT) From: "H.J. Lu" To: libc-alpha@sourceware.org Cc: fweimer@redhat.com, skpgkp2@gmail.com Subject: [PATCH] x86: Define MINIMUM_X86_ISA_LEVEL in config.h [BZ #31676] Date: Tue, 23 Apr 2024 13:54:17 -0700 Message-ID: <20240423205417.47445-1-hjl.tools@gmail.com> X-Mailer: git-send-email 2.44.0 MIME-Version: 1.0 X-Spam-Status: No, score=-3022.4 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 Define MINIMUM_X86_ISA_LEVEL at configure time to avoid /usr/bin/ld: …/build/elf/librtld.os: in function `init_cpu_features': …/git/elf/../sysdeps/x86/cpu-features.c:1202: undefined reference to `_dl_runtime_resolve_fxsave' /usr/bin/ld: …/build/elf/librtld.os: relocation R_X86_64_PC32 against undefined hidden symbol `_dl_runtime_resolve_fxsave' can not be used when making a shared object /usr/bin/ld: final link failed: bad value collect2: error: ld returned 1 exit status when glibc is built with -march=x86-64-v3 and configured with --with-rtld-early-cflags=-march=x86-64, which is used to allow ld.so to print an error message on unsupported CPUs: Fatal glibc error: CPU does not support x86-64-v3 This fixes BZ #31676. --- config.h.in | 3 +++ sysdeps/x86/configure | 7 +++++++ sysdeps/x86/configure.ac | 5 +++++ sysdeps/x86/isa-level.h | 4 +++- 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/config.h.in b/config.h.in index 69ac450356..ac5a68b405 100644 --- a/config.h.in +++ b/config.h.in @@ -285,6 +285,9 @@ /* Define if x86 ISA level should be included in shared libraries. */ #undef INCLUDE_X86_ISA_LEVEL +/* The x86 ISA level. 0 for baseline. Undefined on non-x86. */ +#undef MINIMUM_X86_ISA_LEVEL + /* Define if -msahf is enabled by default on x86. */ #undef HAVE_X86_LAHF_SAHF diff --git a/sysdeps/x86/configure b/sysdeps/x86/configure index 2a5421bb31..d28d9bcb29 100644 --- a/sysdeps/x86/configure +++ b/sysdeps/x86/configure @@ -151,6 +151,13 @@ printf "%s\n" "$libc_cv_have_x86_isa_level" >&6; } else libc_cv_have_x86_isa_level=baseline fi +if test $libc_cv_have_x86_isa_level = baseline; then + printf "%s\n" "#define MINIMUM_X86_ISA_LEVEL 1" >>confdefs.h + +else + printf "%s\n" "#define MINIMUM_X86_ISA_LEVEL $libc_cv_have_x86_isa_level" >>confdefs.h + +fi config_vars="$config_vars have-x86-isa-level = $libc_cv_have_x86_isa_level" config_vars="$config_vars diff --git a/sysdeps/x86/configure.ac b/sysdeps/x86/configure.ac index 78ff7c8f41..5b0acd03d2 100644 --- a/sysdeps/x86/configure.ac +++ b/sysdeps/x86/configure.ac @@ -105,6 +105,11 @@ EOF else libc_cv_have_x86_isa_level=baseline fi +if test $libc_cv_have_x86_isa_level = baseline; then + AC_DEFINE_UNQUOTED(MINIMUM_X86_ISA_LEVEL, 1) +else + AC_DEFINE_UNQUOTED(MINIMUM_X86_ISA_LEVEL, $libc_cv_have_x86_isa_level) +fi LIBC_CONFIG_VAR([have-x86-isa-level], [$libc_cv_have_x86_isa_level]) LIBC_CONFIG_VAR([x86-isa-level-3-or-above], [3 4]) LIBC_CONFIG_VAR([enable-x86-isa-level], [$libc_cv_include_x86_isa_level]) diff --git a/sysdeps/x86/isa-level.h b/sysdeps/x86/isa-level.h index 11fe1ca90c..2c7f74212b 100644 --- a/sysdeps/x86/isa-level.h +++ b/sysdeps/x86/isa-level.h @@ -61,8 +61,10 @@ # define __X86_ISA_V4 0 #endif -#define MINIMUM_X86_ISA_LEVEL \ +#ifndef MINIMUM_X86_ISA_LEVEL +# define MINIMUM_X86_ISA_LEVEL \ (__X86_ISA_V1 + __X86_ISA_V2 + __X86_ISA_V3 + __X86_ISA_V4) +#endif /* Depending on the minimum ISA level, a feature check result can be a compile-time constant.. */