Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/2225754/?format=api
{ "id": 2225754, "url": "http://patchwork.ozlabs.org/api/patches/2225754/?format=api", "web_url": "http://patchwork.ozlabs.org/project/glibc/patch/20260421143804.3933020-9-yury.khrustalev@arm.com/", "project": { "id": 41, "url": "http://patchwork.ozlabs.org/api/projects/41/?format=api", "name": "GNU C Library", "link_name": "glibc", "list_id": "libc-alpha.sourceware.org", "list_email": "libc-alpha@sourceware.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20260421143804.3933020-9-yury.khrustalev@arm.com>", "list_archive_url": null, "date": "2026-04-21T14:38:04", "name": "[v4,8/8] tests: misc: Use new tunable handling for BTI and GCS tests", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "657d478b1d3d8937fe47e98b3864e048673d3297", "submitter": { "id": 88214, "url": "http://patchwork.ozlabs.org/api/people/88214/?format=api", "name": "Yury Khrustalev", "email": "yury.khrustalev@arm.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/glibc/patch/20260421143804.3933020-9-yury.khrustalev@arm.com/mbox/", "series": [ { "id": 500822, "url": "http://patchwork.ozlabs.org/api/series/500822/?format=api", "web_url": "http://patchwork.ozlabs.org/project/glibc/list/?series=500822", "date": "2026-04-21T14:38:03", "name": "tests: Allow tests to append tunables", "version": 4, "mbox": "http://patchwork.ozlabs.org/series/500822/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/2225754/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2225754/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<libc-alpha-bounces~incoming=patchwork.ozlabs.org@sourceware.org>", "X-Original-To": [ "incoming@patchwork.ozlabs.org", "libc-alpha@sourceware.org" ], "Delivered-To": [ "patchwork-incoming@legolas.ozlabs.org", "libc-alpha@sourceware.org" ], "Authentication-Results": [ "legolas.ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n unprotected) header.d=arm.com header.i=@arm.com header.a=rsa-sha256\n header.s=foss header.b=VAvb5Wbl;\n\tdkim-atps=neutral", "legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org\n (client-ip=2620:52:6:3111::32; helo=vm01.sourceware.org;\n envelope-from=libc-alpha-bounces~incoming=patchwork.ozlabs.org@sourceware.org;\n receiver=patchwork.ozlabs.org)", "sourceware.org;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key,\n unprotected) header.d=arm.com header.i=@arm.com header.a=rsa-sha256\n header.s=foss header.b=VAvb5Wbl", "sourceware.org;\n dmarc=pass (p=none dis=none) header.from=arm.com", "sourceware.org; spf=pass smtp.mailfrom=arm.com", "server2.sourceware.org;\n arc=none smtp.remote-ip=217.140.110.172" ], "Received": [ "from vm01.sourceware.org (vm01.sourceware.org\n [IPv6:2620:52:6:3111::32])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519 server-signature ECDSA (secp384r1) server-digest SHA384)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4g0Q4D6TXPz1yGs\n\tfor <incoming@patchwork.ozlabs.org>; Wed, 22 Apr 2026 00:39:56 +1000 (AEST)", "from vm01.sourceware.org (localhost [127.0.0.1])\n\tby sourceware.org (Postfix) with ESMTP id BFD174B9DB48\n\tfor <incoming@patchwork.ozlabs.org>; Tue, 21 Apr 2026 14:39:49 +0000 (GMT)", "from foss.arm.com (foss.arm.com [217.140.110.172])\n by sourceware.org (Postfix) with ESMTP id 3026E4B9DB76\n for <libc-alpha@sourceware.org>; Tue, 21 Apr 2026 14:38:21 +0000 (GMT)", "from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14])\n by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 2153A263D;\n Tue, 21 Apr 2026 07:38:15 -0700 (PDT)", "from fdebian.localdomain (G7GWP2TF97.cambridge.arm.com [10.1.25.51])\n by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id\n 09C6D3FAF5; Tue, 21 Apr 2026 07:38:19 -0700 (PDT)" ], "DKIM-Filter": [ "OpenDKIM Filter v2.11.0 sourceware.org BFD174B9DB48", "OpenDKIM Filter v2.11.0 sourceware.org 3026E4B9DB76" ], "DMARC-Filter": "OpenDMARC Filter v1.4.2 sourceware.org 3026E4B9DB76", "ARC-Filter": "OpenARC Filter v1.0.0 sourceware.org 3026E4B9DB76", "ARC-Seal": "i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1776782301; cv=none;\n b=o2GnWYidKeNUDQ1OlLBw0nOsiicSVE57aKsdLCm8tC+p1APMAc8VHEZzQeKGdGaiK43X+k51qQdkgYad/eyJ7vxIvONNfRfvm8n9zT4im0uRtGavNFOI+UDrYSjoN/pEZurBza7AUBUhtjeXI3/S7QOHuY7J5utz/cnvwrlR2ew=", "ARC-Message-Signature": "i=1; a=rsa-sha256; d=sourceware.org; s=key;\n t=1776782301; c=relaxed/simple;\n bh=P1TyNWXICNvBzK3ava+xHEudm1bwnaf8IAgTAxPVucg=;\n h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version;\n b=aKURV9wXakZDLQaTcfFW/Grx6/WiwGaySelKkkd+pDOy8rULCX5fcapIp6EAVfRmRL3t4uhqdNuYirWqAkbJ68bmkEBB99XfwgaTVeP8ye4bBphPhoHZc6F4Lx8Lv0GnlXYjz/a4hz3y6EGrxwG+fEb5Gapk2ZMeZV66VdRXS1w=", "ARC-Authentication-Results": "i=1; server2.sourceware.org", "DKIM-Signature": "v=1; a=rsa-sha256; c=simple/simple; d=arm.com; s=foss;\n t=1776782300; bh=P1TyNWXICNvBzK3ava+xHEudm1bwnaf8IAgTAxPVucg=;\n h=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n b=VAvb5WblX7sm8vcn0AhV4Fqf6AMYmkVPjNb5IkdG4jLfagBeOoLcJlavE26UrUJ7Z\n jLdWz3uI8qpgjodlHIZJA3Z3ZzYLyy127eIoKLLDglMEjYT1KEQvH2wVkAa9udpqWL\n zVrrxrmXLCRwMDf82yKNiLIsfXBG+ajtg9CE7hjc=", "From": "Yury Khrustalev <yury.khrustalev@arm.com>", "To": "libc-alpha@sourceware.org", "Cc": "Adhemerval Zanella <adhemerval.zanella@linaro.org>,\n Andreas Schwab <schwab@suse.de>, Wilco Dijkstra <wilco.dijkstra@arm.com>", "Subject": "[PATCH v4 8/8] tests: misc: Use new tunable handling for BTI and GCS\n tests", "Date": "Tue, 21 Apr 2026 15:38:04 +0100", "Message-ID": "<20260421143804.3933020-9-yury.khrustalev@arm.com>", "X-Mailer": "git-send-email 2.47.3", "In-Reply-To": "<20260421143804.3933020-1-yury.khrustalev@arm.com>", "References": "<20260421143804.3933020-1-yury.khrustalev@arm.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "X-BeenThere": "libc-alpha@sourceware.org", "X-Mailman-Version": "2.1.30", "Precedence": "list", "List-Id": "Libc-alpha mailing list <libc-alpha.sourceware.org>", "List-Unsubscribe": "<https://sourceware.org/mailman/options/libc-alpha>,\n <mailto:libc-alpha-request@sourceware.org?subject=unsubscribe>", "List-Archive": "<https://sourceware.org/pipermail/libc-alpha/>", "List-Post": "<mailto:libc-alpha@sourceware.org>", "List-Help": "<mailto:libc-alpha-request@sourceware.org?subject=help>", "List-Subscribe": "<https://sourceware.org/mailman/listinfo/libc-alpha>,\n <mailto:libc-alpha-request@sourceware.org?subject=subscribe>", "Errors-To": "libc-alpha-bounces~incoming=patchwork.ozlabs.org@sourceware.org" }, "content": "Use new way of handling test tunables for BTI and GCS tests.\n\nFix tests that would fail when ambient GLIBC_TUNABLES variable\nis used with the aarch64_gcs tunable.\n---\n sysdeps/unix/sysv/linux/aarch64/Makefile | 129 +++++++++---------\n .../linux/aarch64/tst-gcs-audit-skeleton.c | 2 +-\n 2 files changed, 66 insertions(+), 65 deletions(-)", "diff": "diff --git a/sysdeps/unix/sysv/linux/aarch64/Makefile b/sysdeps/unix/sysv/linux/aarch64/Makefile\nindex 57461fded7..7e17e7741f 100644\n--- a/sysdeps/unix/sysv/linux/aarch64/Makefile\n+++ b/sysdeps/unix/sysv/linux/aarch64/Makefile\n@@ -70,21 +70,19 @@ $(objpfx)tst-bti-ld-debug-dlopen.out: $(objpfx)tst-bti-mod-unprot.so\n $(objpfx)tst-bti-permissive-dlopen.out: $(objpfx)tst-bti-mod-unprot.so\n \n $(objpfx)tst-bti-abort-unprot-preload.out: $(objpfx)tst-bti-mod-unprot-preload.so\n-tst-bti-abort-unprot-preload-ENV = \\\n- GLIBC_TUNABLES=glibc.cpu.aarch64_bti=1 \\\n- LD_PRELOAD=$(objpfx)tst-bti-mod-unprot-preload.so\n+tst-bti-abort-unprot-preload-ENV = LD_PRELOAD=$(objpfx)tst-bti-mod-unprot-preload.so\n+tst-bti-abort-unprot-preload-TUNABLES = glibc.cpu.aarch64_bti=1\n \n $(objpfx)tst-bti-dep-prot-preload.out: $(objpfx)tst-bti-mod-prot-preload.so\n # The 'fun' function will be provided by the preload library\n LDFLAGS-tst-bti-dep-prot-preload = -Wl,--unresolved-symbols=ignore-all\n-tst-bti-dep-prot-preload-ENV = \\\n- GLIBC_TUNABLES=glibc.cpu.aarch64_bti=0 \\\n- LD_PRELOAD=$(objpfx)tst-bti-mod-prot-preload.so\n+tst-bti-dep-prot-preload-ENV = LD_PRELOAD=$(objpfx)tst-bti-mod-prot-preload.so\n+tst-bti-dep-prot-preload-TUNABLES += glibc.cpu.aarch64_bti=0\n+\n \n $(objpfx)tst-bti-permissive-preload.out: $(objpfx)tst-bti-mod-unprot-preload.so\n-tst-bti-permissive-preload-ENV = \\\n- GLIBC_TUNABLES=glibc.cpu.aarch64_bti=0 \\\n- LD_PRELOAD=$(objpfx)tst-bti-mod-unprot-preload.so\n+tst-bti-permissive-preload-ENV = LD_PRELOAD=$(objpfx)tst-bti-mod-unprot-preload.so\n+tst-bti-permissive-preload-TUNABLES += glibc.cpu.aarch64_bti=0\n \n CFLAGS-tst-bti-abort-unprot.o += -mbranch-protection=none\n CFLAGS-tst-bti-ld-debug-exe.o += -mbranch-protection=none\n@@ -93,17 +91,17 @@ CFLAGS-tst-bti-mod-unprot.os += -mbranch-protection=none\n CFLAGS-tst-bti-mod-unprot-preload.os += -mbranch-protection=none\n CFLAGS-tst-bti-mod-unprot-audit.os += -mbranch-protection=none\n \n-tst-bti-abort-imm-ENV = GLIBC_TUNABLES=glibc.cpu.aarch64_bti=1\n-tst-bti-abort-transitive-ENV = GLIBC_TUNABLES=glibc.cpu.aarch64_bti=1\n-tst-bti-abort-unprot-ENV = GLIBC_TUNABLES=glibc.cpu.aarch64_bti=1\n-tst-bti-dep-prot-ENV = GLIBC_TUNABLES=glibc.cpu.aarch64_bti=1\n-tst-bti-dlopen-imm-ENV = GLIBC_TUNABLES=glibc.cpu.aarch64_bti=1\n-tst-bti-dlopen-prot-ENV = GLIBC_TUNABLES=glibc.cpu.aarch64_bti=1\n-tst-bti-dlopen-transitive-ENV = GLIBC_TUNABLES=glibc.cpu.aarch64_bti=1\n+tst-bti-abort-imm-TUNABLES = glibc.cpu.aarch64_bti=1\n+tst-bti-abort-transitive-TUNABLES = glibc.cpu.aarch64_bti=1\n+tst-bti-abort-unprot-TUNABLES = glibc.cpu.aarch64_bti=1\n+tst-bti-dep-prot-TUNABLES += glibc.cpu.aarch64_bti=1\n+tst-bti-dlopen-imm-TUNABLES += glibc.cpu.aarch64_bti=1\n+tst-bti-dlopen-prot-TUNABLES += glibc.cpu.aarch64_bti=1\n+tst-bti-dlopen-transitive-TUNABLES += glibc.cpu.aarch64_bti=1\n \n-tst-bti-permissive-imm-ENV = GLIBC_TUNABLES=glibc.cpu.aarch64_bti=0\n-tst-bti-permissive-transitive-ENV = GLIBC_TUNABLES=glibc.cpu.aarch64_bti=0\n-tst-bti-permissive-dlopen-ENV = GLIBC_TUNABLES=glibc.cpu.aarch64_bti=0\n+tst-bti-permissive-imm-TUNABLES += glibc.cpu.aarch64_bti=0\n+tst-bti-permissive-transitive-TUNABLES += glibc.cpu.aarch64_bti=0\n+tst-bti-permissive-dlopen-TUNABLES-only = glibc.cpu.aarch64_bti=0\n \n $(objpfx)tst-bti-unprot-audit.out: $(objpfx)tst-bti-mod-unprot-audit.so\n tst-bti-unprot-audit-ARGS = -- $(host-test-program-cmd)\n@@ -112,14 +110,16 @@ $(objpfx)tst-bti-prot-audit.out: $(objpfx)tst-bti-mod-prot-audit.so\n $(objpfx)tst-bti-prot-audit: $(objpfx)tst-bti-mod-prot.so\n tst-bti-prot-audit-ARGS = -- $(host-test-program-cmd)\n \n-tst-bti-permissive-audit-ENV = GLIBC_TUNABLES=glibc.cpu.aarch64_bti=0\n+tst-bti-permissive-audit-TUNABLES += glibc.cpu.aarch64_bti=0\n $(objpfx)tst-bti-permissive-audit.out: $(objpfx)tst-bti-mod-unprot-audit.so\n $(objpfx)tst-bti-permissive-audit: $(objpfx)tst-bti-mod.so\n tst-bti-permissive-audit-ARGS = -- $(host-test-program-cmd)\n \n define run-bti-abort-test\n $(test-wrapper-env) $(run-program-env) \\\n- $(tst-bti-abort-$*-ENV) $(host-test-program-cmd)\n+ $(tst-bti-abort-$*-ENV) \\\n+ GLIBC_TUNABLES=$(subst $(empty) ,:,$(strip $(tst-bti-abort-$*-TUNABLES))) \\\n+ $(host-test-program-cmd)\n endef\n \n $(objpfx)tst-bti-abort-%.out: $(..)sysdeps/unix/sysv/linux/aarch64/tst-bti-abort.sh \\\n@@ -131,7 +131,7 @@ tests-static += \\\n tst-bti-abort-static \\\n # tests-static\n \n-tst-bti-abort-static-ENV = GLIBC_TUNABLES=glibc.cpu.aarch64_bti=1\n+tst-bti-abort-static-TUNABLES = glibc.cpu.aarch64_bti=1\n CFLAGS-tst-bti-abort-static.o += -mbranch-protection=none\n \n $(objpfx)tst-bti-ld-debug-%.out: $(..)elf/tst-dl-debug-protect.sh $(objpfx)tst-bti-ld-debug-%\n@@ -202,7 +202,9 @@ tests-static += \\\n \n define run-gcs-abort-test\n $(test-wrapper-env) $(run-program-env) \\\n- $(tst-gcs-$*-abort-ENV) $(host-test-program-cmd)\n+ $(tst-gcs-$*-abort-ENV) \\\n+ GLIBC_TUNABLES=$(subst $(empty) ,:,$(strip $(tst-gcs-$*-abort-TUNABLES))) \\\n+ $(host-test-program-cmd)\n endef\n \n $(objpfx)tst-gcs-%-abort.out: $(..)sysdeps/unix/sysv/linux/aarch64/tst-gcs-abort.sh \\\n@@ -224,37 +226,37 @@ LDFLAGS-tst-gcs-optional-static-on += -Wl,-z,gcs=always\n LDFLAGS-tst-gcs-optional-static-off += -Wl,-z,gcs=never\n LDFLAGS-tst-gcs-override-static += -Wl,-z,gcs=never\n \n-tst-gcs-disabled-ENV = GLIBC_TUNABLES=glibc.cpu.aarch64_gcs=0\n-tst-gcs-enforced-ENV = GLIBC_TUNABLES=glibc.cpu.aarch64_gcs=1\n-tst-gcs-enforced-abort-ENV = GLIBC_TUNABLES=glibc.cpu.aarch64_gcs=1\n-tst-gcs-optional-on-ENV = GLIBC_TUNABLES=glibc.cpu.aarch64_gcs=2\n-tst-gcs-optional-off-ENV = GLIBC_TUNABLES=glibc.cpu.aarch64_gcs=2\n-tst-gcs-override-ENV = GLIBC_TUNABLES=glibc.cpu.aarch64_gcs=3\n+tst-gcs-disabled-TUNABLES += glibc.cpu.aarch64_gcs=0\n+tst-gcs-enforced-TUNABLES += glibc.cpu.aarch64_gcs=1\n+tst-gcs-enforced-abort-TUNABLES += glibc.cpu.aarch64_gcs=1\n+tst-gcs-optional-on-TUNABLES += glibc.cpu.aarch64_gcs=2\n+tst-gcs-optional-off-TUNABLES += glibc.cpu.aarch64_gcs=2\n+tst-gcs-override-TUNABLES += glibc.cpu.aarch64_gcs=3\n \n-tst-gcs-disabled-static-ENV = GLIBC_TUNABLES=glibc.cpu.aarch64_gcs=0\n-tst-gcs-enforced-static-ENV = GLIBC_TUNABLES=glibc.cpu.aarch64_gcs=1\n-tst-gcs-enforced-static-abort-ENV = GLIBC_TUNABLES=glibc.cpu.aarch64_gcs=1\n-tst-gcs-optional-static-on-ENV = GLIBC_TUNABLES=glibc.cpu.aarch64_gcs=2\n-tst-gcs-optional-static-off-ENV = GLIBC_TUNABLES=glibc.cpu.aarch64_gcs=2\n-tst-gcs-override-static-ENV = GLIBC_TUNABLES=glibc.cpu.aarch64_gcs=3\n+tst-gcs-disabled-static-TUNABLES += glibc.cpu.aarch64_gcs=0\n+tst-gcs-enforced-static-TUNABLES += glibc.cpu.aarch64_gcs=1\n+tst-gcs-enforced-static-abort-TUNABLES += glibc.cpu.aarch64_gcs=1\n+tst-gcs-optional-static-on-TUNABLES += glibc.cpu.aarch64_gcs=2\n+tst-gcs-optional-static-off-TUNABLES += glibc.cpu.aarch64_gcs=2\n+tst-gcs-override-static-TUNABLES += glibc.cpu.aarch64_gcs=3\n \n LDFLAGS-tst-gcs-execv += -Wl,-z,gcs=always\n-tst-gcs-execv-ENV = GLIBC_TUNABLES=glibc.cpu.aarch64_gcs=1\n+tst-gcs-execv-TUNABLES += glibc.cpu.aarch64_gcs=1\n tst-gcs-execv-ARGS = -- $(host-test-program-cmd)\n LDFLAGS-tst-gcs-fork += -Wl,-z,gcs=always\n-tst-gcs-fork-ENV = GLIBC_TUNABLES=glibc.cpu.aarch64_gcs=2\n+tst-gcs-fork-TUNABLES += glibc.cpu.aarch64_gcs=2\n \n LDFLAGS-tst-gcs-lock += -Wl,-z,gcs=always\n-tst-gcs-lock-ENV = GLIBC_TUNABLES=glibc.cpu.aarch64_gcs=1\n+tst-gcs-lock-TUNABLES += glibc.cpu.aarch64_gcs=1\n LDFLAGS-tst-gcs-lock-ptrace += -Wl,-z,gcs=always\n-tst-gcs-lock-ptrace-ENV = GLIBC_TUNABLES=glibc.cpu.aarch64_gcs=1\n+tst-gcs-lock-ptrace-TUNABLES += glibc.cpu.aarch64_gcs=1\n tst-gcs-lock-ptrace-ARGS = -- $(host-test-program-cmd)\n LDFLAGS-tst-gcs-lock-static += -Wl,-z,gcs=always\n-tst-gcs-lock-static-ENV = GLIBC_TUNABLES=glibc.cpu.aarch64_gcs=1\n+tst-gcs-lock-static-TUNABLES += glibc.cpu.aarch64_gcs=1\n LDFLAGS-tst-gcs-unlock += -Wl,-z,gcs=always\n-tst-gcs-unlock-ENV = GLIBC_TUNABLES=glibc.cpu.aarch64_gcs=2\n+tst-gcs-unlock-TUNABLES += glibc.cpu.aarch64_gcs=2\n LDFLAGS-tst-gcs-unlock-static += -Wl,-z,gcs=always\n-tst-gcs-unlock-static-ENV = GLIBC_TUNABLES=glibc.cpu.aarch64_gcs=2\n+tst-gcs-unlock-static-TUNABLES += glibc.cpu.aarch64_gcs=2\n \n # force one of the dependencies to be unmarked\n LDFLAGS-tst-gcs-mod2.so += -Wl,-z,gcs=never\n@@ -283,10 +285,10 @@ $(objpfx)tst-gcs-mod1.so: $(objpfx)tst-gcs-mod2.so\n $(objpfx)tst-gcs-ld-debug-both: $(objpfx)tst-gcs-mod2.so\n $(objpfx)tst-gcs-ld-debug-shared: $(objpfx)tst-gcs-mod1.so $(objpfx)tst-gcs-mod3.so\n \n-tst-gcs-shared-disabled-ENV = GLIBC_TUNABLES=glibc.cpu.aarch64_gcs=0\n-tst-gcs-shared-enforced-abort-ENV = GLIBC_TUNABLES=glibc.cpu.aarch64_gcs=1\n-tst-gcs-shared-optional-ENV = GLIBC_TUNABLES=glibc.cpu.aarch64_gcs=2\n-tst-gcs-shared-override-ENV = GLIBC_TUNABLES=glibc.cpu.aarch64_gcs=3\n+tst-gcs-shared-disabled-TUNABLES += glibc.cpu.aarch64_gcs=0\n+tst-gcs-shared-enforced-abort-TUNABLES = glibc.cpu.aarch64_gcs=1\n+tst-gcs-shared-optional-TUNABLES += glibc.cpu.aarch64_gcs=2\n+tst-gcs-shared-override-TUNABLES += glibc.cpu.aarch64_gcs=3\n \n LDFLAGS-tst-gcs-dlopen-disabled = -Wl,-z,gcs=always\n LDFLAGS-tst-gcs-dlopen-enforced = -Wl,-z,gcs=always\n@@ -296,11 +298,11 @@ LDFLAGS-tst-gcs-dlopen-override = -Wl,-z,gcs=always\n LDFLAGS-tst-gcs-ld-debug-exe = -Wl,-z,gcs=never\n LDFLAGS-tst-gcs-ld-debug-both = -Wl,-z,gcs=never\n \n-tst-gcs-dlopen-disabled-ENV = GLIBC_TUNABLES=glibc.cpu.aarch64_gcs=0\n-tst-gcs-dlopen-enforced-ENV = GLIBC_TUNABLES=glibc.cpu.aarch64_gcs=1\n-tst-gcs-dlopen-optional-on-ENV = GLIBC_TUNABLES=glibc.cpu.aarch64_gcs=2\n-tst-gcs-dlopen-optional-off-ENV = GLIBC_TUNABLES=glibc.cpu.aarch64_gcs=2\n-tst-gcs-dlopen-override-ENV = GLIBC_TUNABLES=glibc.cpu.aarch64_gcs=3\n+tst-gcs-dlopen-disabled-TUNABLES += glibc.cpu.aarch64_gcs=0\n+tst-gcs-dlopen-enforced-TUNABLES += glibc.cpu.aarch64_gcs=1\n+tst-gcs-dlopen-optional-on-TUNABLES += glibc.cpu.aarch64_gcs=2\n+tst-gcs-dlopen-optional-off-TUNABLES += glibc.cpu.aarch64_gcs=2\n+tst-gcs-dlopen-override-TUNABLES += glibc.cpu.aarch64_gcs=3\n \n $(objpfx)tst-gcs-dlopen-disabled.out: $(objpfx)tst-gcs-mod2.so\n $(objpfx)tst-gcs-dlopen-enforced.out: $(objpfx)tst-gcs-mod2.so\n@@ -311,7 +313,7 @@ $(objpfx)tst-gcs-ld-debug-dlopen.out: $(objpfx)tst-gcs-mod2.so\n \n LDFLAGS-tst-gcs-noreturn = -Wl,-z,gcs=always\n \n-tst-gcs-noreturn-ENV = GLIBC_TUNABLES=glibc.cpu.aarch64_gcs=0\n+tst-gcs-noreturn-TUNABLES += glibc.cpu.aarch64_gcs=0\n \n $(objpfx)tst-gcs-ld-debug-%.out: $(..)elf/tst-dl-debug-protect.sh $(objpfx)tst-gcs-ld-debug-%\n \t$(SHELL) $< $(objpfx) '$(test-wrapper-env)' '$(rtld-prefix)' \\\n@@ -329,18 +331,17 @@ $(objpfx)tst-gcs-preload-enforced-abort: $(objpfx)tst-gcs-mod1.so\n $(objpfx)tst-gcs-preload-optional: $(objpfx)tst-gcs-mod1.so\n $(objpfx)tst-gcs-preload-override: $(objpfx)tst-gcs-mod1.so\n \n-tst-gcs-preload-disabled-ENV = \\\n- GLIBC_TUNABLES=glibc.cpu.aarch64_gcs=0 \\\n- LD_PRELOAD=$(objpfx)tst-gcs-mod1.so\n-tst-gcs-preload-enforced-abort-ENV = \\\n- GLIBC_TUNABLES=glibc.cpu.aarch64_gcs=1 \\\n- LD_PRELOAD=$(objpfx)tst-gcs-mod1.so\n-tst-gcs-preload-optional-ENV = \\\n- GLIBC_TUNABLES=glibc.cpu.aarch64_gcs=2 \\\n- LD_PRELOAD=$(objpfx)tst-gcs-mod1.so\n-tst-gcs-preload-override-ENV = \\\n- GLIBC_TUNABLES=glibc.cpu.aarch64_gcs=3 \\\n- LD_PRELOAD=$(objpfx)tst-gcs-mod1.so\n+tst-gcs-preload-disabled-ENV = LD_PRELOAD=$(objpfx)tst-gcs-mod1.so\n+tst-gcs-preload-disabled-TUNABLES += glibc.cpu.aarch64_gcs=0\n+\n+tst-gcs-preload-enforced-abort-ENV = LD_PRELOAD=$(objpfx)tst-gcs-mod1.so\n+tst-gcs-preload-enforced-abort-TUNABLES += glibc.cpu.aarch64_gcs=1\n+\n+tst-gcs-preload-optional-ENV = LD_PRELOAD=$(objpfx)tst-gcs-mod1.so\n+tst-gcs-preload-optional-TUNABLES += glibc.cpu.aarch64_gcs=2\n+\n+tst-gcs-preload-override-ENV = LD_PRELOAD=$(objpfx)tst-gcs-mod1.so\n+tst-gcs-preload-override-TUNABLES += glibc.cpu.aarch64_gcs=3\n \n LDFLAGS-tst-gcs-audit1.so += -Wl,-z,gcs=never\n \ndiff --git a/sysdeps/unix/sysv/linux/aarch64/tst-gcs-audit-skeleton.c b/sysdeps/unix/sysv/linux/aarch64/tst-gcs-audit-skeleton.c\nindex 5526a2313b..847cf4a4a2 100644\n--- a/sysdeps/unix/sysv/linux/aarch64/tst-gcs-audit-skeleton.c\n+++ b/sysdeps/unix/sysv/linux/aarch64/tst-gcs-audit-skeleton.c\n@@ -71,7 +71,7 @@ do_test (int argc, char *argv[])\n spargv[i] = NULL;\n \n setenv (\"LD_AUDIT\", AUDIT_MOD, 0);\n- setenv (\"GLIBC_TUNABLES\", \"glibc.cpu.aarch64_gcs=\" GCS_MODE, 0);\n+ setenv (\"GLIBC_TUNABLES\", \"glibc.cpu.aarch64_gcs=\" GCS_MODE, 1);\n \n struct support_capture_subprocess result\n = support_capture_subprogram (spargv[0], spargv, NULL);\n", "prefixes": [ "v4", "8/8" ] }