From patchwork Sat Jan 6 15:03:56 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: 83453 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 7C9083858284 for ; Sat, 6 Jan 2024 15:04:28 +0000 (GMT) X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail-pj1-x102b.google.com (mail-pj1-x102b.google.com [IPv6:2607:f8b0:4864:20::102b]) by sourceware.org (Postfix) with ESMTPS id AC6103858D1E for ; Sat, 6 Jan 2024 15:04:00 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org AC6103858D1E 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 AC6103858D1E Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::102b ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704553445; cv=none; b=pKPiLVznhx7dBJ4CC0gW0PsVB434lvTJ4xWrbraR/jcyr26lK8fyClaqTbwBz87sd7bpb+bxBScjoQ4oVW5h7AuNttRjBPZUxDse1YsfXf1gGHBmf2PtphJ+MqaKKGLItqV0dhb9VXFmp0skkDHMHH+RPIZYjVX/DIfi+TRKf48= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704553445; c=relaxed/simple; bh=01QQjBCN5sN2hamJZJAOH0fFvkYez4eODuRVse6qhzI=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=melKrLzlAYYxJM/Kw9rBxZEQec+3JOfA12A+s/4GxSTLOPx829ZM0XUCgjoGe8LZ7OpDvtF1Sj/Sf5dWR/z4U5IXZ2zf4MNYtKdDxDCVWXV+nK2nQtGaNpaIBDG15y3S+xFF/BMw+vpvTc3TvXZBEhBIeyl/9pkuUF++IRk0A7A= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pj1-x102b.google.com with SMTP id 98e67ed59e1d1-28bf1410e37so463512a91.2 for ; Sat, 06 Jan 2024 07:04:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704553439; x=1705158239; darn=sourceware.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=02oEN9k+CVXhaaSXM9aczMEUuy7WmyuaOzE1s90if8A=; b=OSskHL88fi5y9eyTRw6EnwqAOqTdSmmq0CcfVsAgNcjbgJiyPCp8vXjeXSEkvqmlde BzW6nAyVTbAiZW56HILApLdTG8VnbClMyem74j00i8Kbyg+VJF0qspbkqAKjOVnkY7aR 8sJfA/ZcCkla254QTkZ+udBPmyo5KxVSTh1CUVYCqf05zgBbFY9hLeEp8/RgOWqWzZmV NhqeCNLS7K3VyfJIz5T4MxUYVP5WEZiBNfvGRciSYZOSMF3L5sLrqnXbWJZ2g5zAbeo2 0pAG6PalV25GRsppUdwc/f2zSrhDJooSYQnWQypsyNvypDEfgh1RC2GZPhMw120mnp+F N8Yg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704553439; x=1705158239; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=02oEN9k+CVXhaaSXM9aczMEUuy7WmyuaOzE1s90if8A=; b=nqHVaAzp7XgJ+wwD7jAeNatCzCDpCrpZaac7nf3WkA3V7aq9V6+pimw3R8T1Ewoxtq 60pj8+Xpsyj4xuSY+iDTkGKyYqsQz8VCdkdrFgqQkc6wkBPtUfM3YlzxnXsLovopBxlr vzaP4AUf2KzQ58lpwGm43lyPN9e24PzlIpv+NWFXT1HNxPRNdIRA7OoWPCycPK3zegx+ /0VJzwoItzKDG3l8sgp5qf3zGnO4kmsdqRcb31lzEzKRVx5buHN9FiV2XbWifZgchfPE Sfz9R+mOK71tkeQobxwyx+08GgHcprVY8jVoTSy2bt1NMhzWfCYgzmNqgG3lRUpnO3h4 llIw== X-Gm-Message-State: AOJu0Yzq4NnlyYo1BC9nLjlzqllsl2IZq4kOjTgM80xkdD6n5lRzDzdK qqrULpKfnSxSts0u2M+adnKdG6QOIg0= X-Google-Smtp-Source: AGHT+IF/I4mluUzZXEKO1mjbw5YHYg6OTUYgsfgU3HmvS0LPnvA2Icov9G57jNnNSQ0+v81jaNjTNA== X-Received: by 2002:a17:90a:3488:b0:28c:c31:244e with SMTP id p8-20020a17090a348800b0028c0c31244emr728050pjb.59.1704553438954; Sat, 06 Jan 2024 07:03:58 -0800 (PST) Received: from gnu-cfl-3.localdomain ([172.56.169.119]) by smtp.gmail.com with ESMTPSA id a23-20020a17090a6d9700b0028d2521dc53sm1776903pjk.46.2024.01.06.07.03.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Jan 2024 07:03:58 -0800 (PST) Received: from gnu-cfl-3.. (localhost [IPv6:::1]) by gnu-cfl-3.localdomain (Postfix) with ESMTP id C8DF77402D1 for ; Sat, 6 Jan 2024 07:03:56 -0800 (PST) From: "H.J. Lu" To: binutils@sourceware.org Subject: [PATCH] ld: Adjust x86 and x86-64 tests for -z mark-plt Date: Sat, 6 Jan 2024 07:03:56 -0800 Message-ID: <20240106150356.153214-1-hjl.tools@gmail.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Spam-Status: No, score=-3021.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_ABUSEAT, RCVD_IN_DNSWL_NONE, RCVD_IN_SBL_CSS, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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: binutils@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: binutils-bounces+patchwork=sourceware.org@sourceware.org To support -z mark-plt enabled by default, adjust x86 tests to accept non-zero r_addend for JUMP_SLOT relocation and pass -z nomark-plt to x86-64 tests if -z mark-plt changes the expected outputs. * testsuite/ld-elf/indirect-extern-access-2.rd: Allow non-zero r_addend for JUMP_SLOT relocation. * testsuite/ld-elf/pr23161d.rd: Likewise. * testsuite/ld-ifunc/ifunc-25c-x86.d: Likewise. * testsuite/ld-ifunc/ifunc-16-x86-64-now.d: Pass -z nomark-plt to linker. * testsuite/ld-ifunc/ifunc-16-x86-64.d: Likewise. * testsuite/ld-ifunc/ifunc-2-local-x86-64-now.d: Likewise. * testsuite/ld-ifunc/ifunc-2-local-x86-64.d: Likewise. * testsuite/ld-ifunc/ifunc-2-x86-64-now.d: Likewise. * testsuite/ld-ifunc/ifunc-2-x86-64.d: Likewise. * testsuite/ld-ifunc/ifunc-20-x86-64.d: Likewise. * testsuite/ld-ifunc/ifunc-5b-x86-64.d: Likewise. * testsuite/ld-ifunc/pr17154-x86-64-now.d: Likewise. * testsuite/ld-ifunc/pr17154-x86-64.d: Likewise. * testsuite/ld-x86-64/dt-relr-1a-x32.d: Likewise. * testsuite/ld-x86-64/dt-relr-1a.d: Likewise. * testsuite/ld-x86-64/dt-relr-1b-x32.d: Likewise. * testsuite/ld-x86-64/dt-relr-1b.d: Likewise. * testsuite/ld-x86-64/ibt-plt-2a-x32.d: Likewise. * testsuite/ld-x86-64/ibt-plt-2a.d: Likewise. * testsuite/ld-x86-64/ibt-plt-3a-x32.d: Likewise. * testsuite/ld-x86-64/ibt-plt-3a.d: Likewise. * testsuite/ld-x86-64/pr19636-2d.d: Likewise. * testsuite/ld-x86-64/pr19636-2e.d: Likewise. * testsuite/ld-x86-64/pr19636-2f.d: Likewise. * testsuite/ld-x86-64/pr19636-2l.d: Likewise. * testsuite/ld-x86-64/x86-64.exp: Pass -z nomark-plt to linker in 6 tests. --- ld/testsuite/ld-elf/indirect-extern-access-2.rd | 2 +- ld/testsuite/ld-elf/pr23161d.rd | 2 +- ld/testsuite/ld-ifunc/ifunc-16-x86-64-now.d | 2 +- ld/testsuite/ld-ifunc/ifunc-16-x86-64.d | 2 +- ld/testsuite/ld-ifunc/ifunc-2-local-x86-64-now.d | 2 +- ld/testsuite/ld-ifunc/ifunc-2-local-x86-64.d | 2 +- ld/testsuite/ld-ifunc/ifunc-2-x86-64-now.d | 2 +- ld/testsuite/ld-ifunc/ifunc-2-x86-64.d | 2 +- ld/testsuite/ld-ifunc/ifunc-20-x86-64.d | 2 +- ld/testsuite/ld-ifunc/ifunc-25c-x86.d | 2 +- ld/testsuite/ld-ifunc/ifunc-5b-x86-64.d | 2 +- ld/testsuite/ld-ifunc/pr17154-x86-64-now.d | 2 +- ld/testsuite/ld-ifunc/pr17154-x86-64.d | 2 +- ld/testsuite/ld-x86-64/dt-relr-1a-x32.d | 2 +- ld/testsuite/ld-x86-64/dt-relr-1a.d | 2 +- ld/testsuite/ld-x86-64/dt-relr-1b-x32.d | 2 +- ld/testsuite/ld-x86-64/dt-relr-1b.d | 2 +- ld/testsuite/ld-x86-64/ibt-plt-2a-x32.d | 2 +- ld/testsuite/ld-x86-64/ibt-plt-2a.d | 2 +- ld/testsuite/ld-x86-64/ibt-plt-3a-x32.d | 2 +- ld/testsuite/ld-x86-64/ibt-plt-3a.d | 2 +- ld/testsuite/ld-x86-64/pr19636-2d.d | 2 +- ld/testsuite/ld-x86-64/pr19636-2e.d | 2 +- ld/testsuite/ld-x86-64/pr19636-2f.d | 2 +- ld/testsuite/ld-x86-64/pr19636-2l.d | 2 +- ld/testsuite/ld-x86-64/x86-64.exp | 6 ++++++ 26 files changed, 31 insertions(+), 25 deletions(-) diff --git a/ld/testsuite/ld-elf/indirect-extern-access-2.rd b/ld/testsuite/ld-elf/indirect-extern-access-2.rd index 9c7d72fae25..89c9e2ed336 100644 --- a/ld/testsuite/ld-elf/indirect-extern-access-2.rd +++ b/ld/testsuite/ld-elf/indirect-extern-access-2.rd @@ -1,5 +1,5 @@ #... -[a-f0-9]+ +[0-9a-f]+ +R_.*_JUMP_SLO(T|) +[a-f0-9]+ +indirect_extern_access( \+ 0|) +[a-f0-9]+ +[0-9a-f]+ +R_.*_JUMP_SLO(T|) +[a-f0-9]+ +indirect_extern_access( \+ [a-f0-9]+|) #... Displaying notes found in: .note.gnu.property [ ]+Owner[ ]+Data size[ ]+Description diff --git a/ld/testsuite/ld-elf/pr23161d.rd b/ld/testsuite/ld-elf/pr23161d.rd index 338cfad336b..e7756b3f61b 100644 --- a/ld/testsuite/ld-elf/pr23161d.rd +++ b/ld/testsuite/ld-elf/pr23161d.rd @@ -1,6 +1,6 @@ Relocation section '\.rel(a|)\.plt' at offset 0x[0-9a-f]+ contains 1 entry: +Offset +Info +Type +Sym.* Value +Sym.* Name( \+ Addend|) -[a-f0-9]+ +[0-9a-f]+ +R_.*_JUMP_SLOT +[a-f0-9]+ +foo( \+ 0|) +[a-f0-9]+ +[0-9a-f]+ +R_.*_JUMP_SLOT +[a-f0-9]+ +foo( \+ [a-f0-9]+|) Symbol table '\.dynsym' contains [0-9]+ entries: +Num: +Value +Size Type +Bind +Vis +Ndx Name diff --git a/ld/testsuite/ld-ifunc/ifunc-16-x86-64-now.d b/ld/testsuite/ld-ifunc/ifunc-16-x86-64-now.d index db6c0e285a1..32ab488ca7a 100644 --- a/ld/testsuite/ld-ifunc/ifunc-16-x86-64-now.d +++ b/ld/testsuite/ld-ifunc/ifunc-16-x86-64-now.d @@ -1,6 +1,6 @@ #source: ifunc-16-x86.s #as: --64 -#ld: -z now -shared -melf_x86_64 +#ld: -z now -z nomark-plt -shared -melf_x86_64 #readelf: -r --wide #target: x86_64-*-* diff --git a/ld/testsuite/ld-ifunc/ifunc-16-x86-64.d b/ld/testsuite/ld-ifunc/ifunc-16-x86-64.d index d69626d3021..06c1ed90b92 100644 --- a/ld/testsuite/ld-ifunc/ifunc-16-x86-64.d +++ b/ld/testsuite/ld-ifunc/ifunc-16-x86-64.d @@ -1,6 +1,6 @@ #source: ifunc-16-x86.s #as: --64 -#ld: -shared -melf_x86_64 +#ld: -z nomark-plt -shared -melf_x86_64 #readelf: -r --wide #target: x86_64-*-* diff --git a/ld/testsuite/ld-ifunc/ifunc-2-local-x86-64-now.d b/ld/testsuite/ld-ifunc/ifunc-2-local-x86-64-now.d index e038b37a6d6..6d98d66ebd4 100644 --- a/ld/testsuite/ld-ifunc/ifunc-2-local-x86-64-now.d +++ b/ld/testsuite/ld-ifunc/ifunc-2-local-x86-64-now.d @@ -1,6 +1,6 @@ #source: ifunc-2-local-x86-64.s #as: --64 -#ld: -z now -shared -melf_x86_64 --hash-style=sysv -z max-page-size=0x200000 -z noseparate-code $NO_DT_RELR_LDFLAGS +#ld: -z now -shared -melf_x86_64 --hash-style=sysv -z max-page-size=0x200000 -z noseparate-code -z nomark-plt $NO_DT_RELR_LDFLAGS #objdump: -dw #target: x86_64-*-* diff --git a/ld/testsuite/ld-ifunc/ifunc-2-local-x86-64.d b/ld/testsuite/ld-ifunc/ifunc-2-local-x86-64.d index 14a57280327..4d2f4bff82c 100644 --- a/ld/testsuite/ld-ifunc/ifunc-2-local-x86-64.d +++ b/ld/testsuite/ld-ifunc/ifunc-2-local-x86-64.d @@ -1,5 +1,5 @@ #as: --64 -#ld: -shared -melf_x86_64 --hash-style=sysv -z noseparate-code +#ld: -shared -melf_x86_64 --hash-style=sysv -z noseparate-code -z nomark-plt #objdump: -dw #target: x86_64-*-* diff --git a/ld/testsuite/ld-ifunc/ifunc-2-x86-64-now.d b/ld/testsuite/ld-ifunc/ifunc-2-x86-64-now.d index 47db0125612..8b248d393b0 100644 --- a/ld/testsuite/ld-ifunc/ifunc-2-x86-64-now.d +++ b/ld/testsuite/ld-ifunc/ifunc-2-x86-64-now.d @@ -1,6 +1,6 @@ #source: ifunc-2-x86-64.s #as: --64 -#ld: -z now -shared -melf_x86_64 --hash-style=sysv -z max-page-size=0x200000 -z noseparate-code $NO_DT_RELR_LDFLAGS +#ld: -z now -shared -melf_x86_64 --hash-style=sysv -z max-page-size=0x200000 -z noseparate-code -z nomark-plt $NO_DT_RELR_LDFLAGS #objdump: -dw #target: x86_64-*-* diff --git a/ld/testsuite/ld-ifunc/ifunc-2-x86-64.d b/ld/testsuite/ld-ifunc/ifunc-2-x86-64.d index 2a1f2698a2a..8eb7583a3d3 100644 --- a/ld/testsuite/ld-ifunc/ifunc-2-x86-64.d +++ b/ld/testsuite/ld-ifunc/ifunc-2-x86-64.d @@ -1,5 +1,5 @@ #as: --64 -#ld: -shared -melf_x86_64 --hash-style=sysv -z max-page-size=0x200000 -z noseparate-code +#ld: -shared -melf_x86_64 --hash-style=sysv -z max-page-size=0x200000 -z noseparate-code -z nomark-plt #objdump: -dw #target: x86_64-*-* diff --git a/ld/testsuite/ld-ifunc/ifunc-20-x86-64.d b/ld/testsuite/ld-ifunc/ifunc-20-x86-64.d index 0ea46a6a2d2..5cd12aa4e3f 100644 --- a/ld/testsuite/ld-ifunc/ifunc-20-x86-64.d +++ b/ld/testsuite/ld-ifunc/ifunc-20-x86-64.d @@ -1,5 +1,5 @@ #source: ifunc-20.s -#ld: -shared -m elf_x86_64 -z nocombreloc +#ld: -shared -m elf_x86_64 -z nocombreloc -z nomark-plt #as: --64 #readelf: -r --wide #target: x86_64-*-* diff --git a/ld/testsuite/ld-ifunc/ifunc-25c-x86.d b/ld/testsuite/ld-ifunc/ifunc-25c-x86.d index e2401a9f160..c278c5784d6 100644 --- a/ld/testsuite/ld-ifunc/ifunc-25c-x86.d +++ b/ld/testsuite/ld-ifunc/ifunc-25c-x86.d @@ -9,4 +9,4 @@ Relocation section '.rel(a|).dyn' at offset 0x[0-9a-f]+ contains 1 entry: Relocation section '.rel(a|).plt' at offset 0x[0-9a-f]+ contains 1 entry: +Offset +Info +Type +Sym.* Value +Symbol's Name.* -[0-9a-f]+[ ]+[0-9a-f]+[ ]+R_(386|X86_64)_JUMP_SLOT +foo\(\) +foo( \+ 0|) +[0-9a-f]+[ ]+[0-9a-f]+[ ]+R_(386|X86_64)_JUMP_SLOT +foo\(\) +foo( \+ [0-9a-f]+|) diff --git a/ld/testsuite/ld-ifunc/ifunc-5b-x86-64.d b/ld/testsuite/ld-ifunc/ifunc-5b-x86-64.d index 02aff6b7c85..715271f65ff 100644 --- a/ld/testsuite/ld-ifunc/ifunc-5b-x86-64.d +++ b/ld/testsuite/ld-ifunc/ifunc-5b-x86-64.d @@ -1,6 +1,6 @@ #source: ifunc-5-x86-64.s #as: --64 -#ld: -melf_x86_64 -shared -z nocombreloc +#ld: -melf_x86_64 -shared -z nocombreloc -z nomark-plt #readelf: -r --wide #target: x86_64-*-* diff --git a/ld/testsuite/ld-ifunc/pr17154-x86-64-now.d b/ld/testsuite/ld-ifunc/pr17154-x86-64-now.d index f6920272b63..4d2ae8413f2 100644 --- a/ld/testsuite/ld-ifunc/pr17154-x86-64-now.d +++ b/ld/testsuite/ld-ifunc/pr17154-x86-64-now.d @@ -1,6 +1,6 @@ #source: pr17154-x86.s #as: --64 -#ld: -z now -shared -melf_x86_64 --hash-style=sysv -z max-page-size=0x200000 -z noseparate-code $NO_DT_RELR_LDFLAGS +#ld: -z now -shared -melf_x86_64 --hash-style=sysv -z max-page-size=0x200000 -z noseparate-code -z nomark-plt $NO_DT_RELR_LDFLAGS #objdump: -dw #target: x86_64-*-* diff --git a/ld/testsuite/ld-ifunc/pr17154-x86-64.d b/ld/testsuite/ld-ifunc/pr17154-x86-64.d index 90918426ee5..fbe6e225d5c 100644 --- a/ld/testsuite/ld-ifunc/pr17154-x86-64.d +++ b/ld/testsuite/ld-ifunc/pr17154-x86-64.d @@ -1,6 +1,6 @@ #source: pr17154-x86.s #as: --64 -#ld: -shared -melf_x86_64 --hash-style=sysv -z max-page-size=0x200000 -z noseparate-code $NO_DT_RELR_LDFLAGS +#ld: -shared -melf_x86_64 --hash-style=sysv -z max-page-size=0x200000 -z noseparate-code -z nomark-plt $NO_DT_RELR_LDFLAGS #objdump: -dw #target: x86_64-*-* diff --git a/ld/testsuite/ld-x86-64/dt-relr-1a-x32.d b/ld/testsuite/ld-x86-64/dt-relr-1a-x32.d index 3b603cd4b01..8f2f6fc2f74 100644 --- a/ld/testsuite/ld-x86-64/dt-relr-1a-x32.d +++ b/ld/testsuite/ld-x86-64/dt-relr-1a-x32.d @@ -1,6 +1,6 @@ #source: dt-relr-1.s #as: --x32 -#ld: -shared -melf32_x86_64 $DT_RELR_LDFLAGS +#ld: -shared -melf32_x86_64 $DT_RELR_LDFLAGS -z nomark-plt #readelf: -r -s --wide #target: x86_64-*-linux* diff --git a/ld/testsuite/ld-x86-64/dt-relr-1a.d b/ld/testsuite/ld-x86-64/dt-relr-1a.d index abf2352a92a..218594dfb98 100644 --- a/ld/testsuite/ld-x86-64/dt-relr-1a.d +++ b/ld/testsuite/ld-x86-64/dt-relr-1a.d @@ -1,6 +1,6 @@ #source: dt-relr-1.s #as: --64 -#ld: -shared -melf_x86_64 $DT_RELR_LDFLAGS +#ld: -shared -melf_x86_64 $DT_RELR_LDFLAGS -z nomark-plt #readelf: -r -s --wide #target: x86_64-*-linux* diff --git a/ld/testsuite/ld-x86-64/dt-relr-1b-x32.d b/ld/testsuite/ld-x86-64/dt-relr-1b-x32.d index 05c376c5d46..0ddffc82429 100644 --- a/ld/testsuite/ld-x86-64/dt-relr-1b-x32.d +++ b/ld/testsuite/ld-x86-64/dt-relr-1b-x32.d @@ -1,6 +1,6 @@ #source: dt-relr-1.s #as: --x32 -#ld: -shared -melf32_x86_64 $DT_RELR_LDFLAGS -z nocombreloc +#ld: -shared -melf32_x86_64 $DT_RELR_LDFLAGS -z nocombreloc -z nomark-plt #readelf: -r -s --wide #target: x86_64-*-linux* diff --git a/ld/testsuite/ld-x86-64/dt-relr-1b.d b/ld/testsuite/ld-x86-64/dt-relr-1b.d index 703b68f6fa8..4e462dd1fcb 100644 --- a/ld/testsuite/ld-x86-64/dt-relr-1b.d +++ b/ld/testsuite/ld-x86-64/dt-relr-1b.d @@ -1,6 +1,6 @@ #source: dt-relr-1.s #as: --64 -#ld: -shared -melf_x86_64 $DT_RELR_LDFLAGS -z nocombreloc +#ld: -shared -melf_x86_64 $DT_RELR_LDFLAGS -z nocombreloc -z nomark-plt #readelf: -r -s --wide #target: x86_64-*-linux* diff --git a/ld/testsuite/ld-x86-64/ibt-plt-2a-x32.d b/ld/testsuite/ld-x86-64/ibt-plt-2a-x32.d index e4e6fabff17..31201c6498f 100644 --- a/ld/testsuite/ld-x86-64/ibt-plt-2a-x32.d +++ b/ld/testsuite/ld-x86-64/ibt-plt-2a-x32.d @@ -1,6 +1,6 @@ #source: ibt-plt-2.s #as: --x32 -#ld: -shared -m elf32_x86_64 -z ibtplt --hash-style=sysv -z max-page-size=0x200000 -z noseparate-code $NO_DT_RELR_LDFLAGS +#ld: -shared -m elf32_x86_64 -z ibtplt --hash-style=sysv -z max-page-size=0x200000 -z noseparate-code $NO_DT_RELR_LDFLAGS -z nomark-plt #objdump: -dw .*: +file format .* diff --git a/ld/testsuite/ld-x86-64/ibt-plt-2a.d b/ld/testsuite/ld-x86-64/ibt-plt-2a.d index 6f8ec7e0b1f..7f66eedbcfd 100644 --- a/ld/testsuite/ld-x86-64/ibt-plt-2a.d +++ b/ld/testsuite/ld-x86-64/ibt-plt-2a.d @@ -1,6 +1,6 @@ #source: ibt-plt-2.s #as: --64 -defsym __64_bit__=1 -#ld: -shared -m elf_x86_64 -z ibtplt --hash-style=sysv -z max-page-size=0x200000 -z noseparate-code $NO_DT_RELR_LDFLAGS +#ld: -shared -m elf_x86_64 -z ibtplt --hash-style=sysv -z max-page-size=0x200000 -z noseparate-code $NO_DT_RELR_LDFLAGS -z nomark-plt #objdump: -dw .*: +file format .* diff --git a/ld/testsuite/ld-x86-64/ibt-plt-3a-x32.d b/ld/testsuite/ld-x86-64/ibt-plt-3a-x32.d index b738e951420..0ba3d07adad 100644 --- a/ld/testsuite/ld-x86-64/ibt-plt-3a-x32.d +++ b/ld/testsuite/ld-x86-64/ibt-plt-3a-x32.d @@ -1,6 +1,6 @@ #source: ibt-plt-3.s #as: --x32 -#ld: -shared -m elf32_x86_64 -z ibtplt --hash-style=sysv -z max-page-size=0x200000 -z noseparate-code $NO_DT_RELR_LDFLAGS +#ld: -shared -m elf32_x86_64 -z ibtplt --hash-style=sysv -z max-page-size=0x200000 -z noseparate-code $NO_DT_RELR_LDFLAGS -z nomark-plt #objdump: -dw .*: +file format .* diff --git a/ld/testsuite/ld-x86-64/ibt-plt-3a.d b/ld/testsuite/ld-x86-64/ibt-plt-3a.d index a0ef8b11597..306592ac9cc 100644 --- a/ld/testsuite/ld-x86-64/ibt-plt-3a.d +++ b/ld/testsuite/ld-x86-64/ibt-plt-3a.d @@ -1,6 +1,6 @@ #source: ibt-plt-3.s #as: --64 -defsym __64_bit__=1 -#ld: -shared -m elf_x86_64 -z ibtplt --hash-style=sysv -z max-page-size=0x200000 -z noseparate-code $NO_DT_RELR_LDFLAGS +#ld: -shared -m elf_x86_64 -z ibtplt --hash-style=sysv -z max-page-size=0x200000 -z noseparate-code $NO_DT_RELR_LDFLAGS -z nomark-plt #objdump: -dw .*: +file format .* diff --git a/ld/testsuite/ld-x86-64/pr19636-2d.d b/ld/testsuite/ld-x86-64/pr19636-2d.d index 092992be9d4..75c87871684 100644 --- a/ld/testsuite/ld-x86-64/pr19636-2d.d +++ b/ld/testsuite/ld-x86-64/pr19636-2d.d @@ -1,6 +1,6 @@ #source: pr19636-2.s #as: --64 -mrelax-relocations=no -#ld: -pie -m elf_x86_64 --no-dynamic-linker --hash-style=sysv -z max-page-size=0x200000 -z noseparate-code $NO_DT_RELR_LDFLAGS +#ld: -pie -m elf_x86_64 --no-dynamic-linker --hash-style=sysv -z max-page-size=0x200000 -z noseparate-code $NO_DT_RELR_LDFLAGS -z nomark-plt #objdump: -dw .*: +file format .* diff --git a/ld/testsuite/ld-x86-64/pr19636-2e.d b/ld/testsuite/ld-x86-64/pr19636-2e.d index 32a326cf429..5d982414824 100644 --- a/ld/testsuite/ld-x86-64/pr19636-2e.d +++ b/ld/testsuite/ld-x86-64/pr19636-2e.d @@ -1,6 +1,6 @@ #source: pr19636-2.s #as: --64 -mrelax-relocations=no -#ld: -shared -m elf_x86_64 --no-dynamic-linker +#ld: -shared -m elf_x86_64 --no-dynamic-linker -z nomark-plt #readelf : -r --wide --dyn-syms Relocation section '\.rela\.dyn' at offset [0x0-9a-f]+ contains 2 entries: diff --git a/ld/testsuite/ld-x86-64/pr19636-2f.d b/ld/testsuite/ld-x86-64/pr19636-2f.d index 528bce1bded..a3fe23df643 100644 --- a/ld/testsuite/ld-x86-64/pr19636-2f.d +++ b/ld/testsuite/ld-x86-64/pr19636-2f.d @@ -1,6 +1,6 @@ #source: pr19636-2.s #as: --64 -mrelax-relocations=no -#ld: -shared -Bsymbolic -m elf_x86_64 --no-dynamic-linker +#ld: -shared -Bsymbolic -m elf_x86_64 --no-dynamic-linker -z nomark-plt #readelf : -r --wide --dyn-syms Relocation section '\.rela\.dyn' at offset [0x0-9a-f]+ contains 2 entries: diff --git a/ld/testsuite/ld-x86-64/pr19636-2l.d b/ld/testsuite/ld-x86-64/pr19636-2l.d index 8c23c0b7411..3cb00d7aac1 100644 --- a/ld/testsuite/ld-x86-64/pr19636-2l.d +++ b/ld/testsuite/ld-x86-64/pr19636-2l.d @@ -1,6 +1,6 @@ #source: pr19636-2.s #as: --64 -mrelax-relocations=no -#ld: -pie -m elf_x86_64 --no-dynamic-linker --hash-style=sysv -z dynamic-undefined-weak -z max-page-size=0x200000 -z noseparate-code $NO_DT_RELR_LDFLAGS +#ld: -pie -m elf_x86_64 --no-dynamic-linker --hash-style=sysv -z dynamic-undefined-weak -z max-page-size=0x200000 -z noseparate-code $NO_DT_RELR_LDFLAGS -z nomark-plt #objdump: -dw #warning: -z dynamic-undefined-weak ignored diff --git a/ld/testsuite/ld-x86-64/x86-64.exp b/ld/testsuite/ld-x86-64/x86-64.exp index ebb3d882067..0af9f047600 100644 --- a/ld/testsuite/ld-x86-64/x86-64.exp +++ b/ld/testsuite/ld-x86-64/x86-64.exp @@ -49,6 +49,7 @@ set x86_64tests { "--64" {tlslib.s} {} "libtlslib.so"} {"TLS -fpic and -fno-pic exec transitions" "-melf_x86_64 tmpdir/libtlslib.so --no-ld-generated-unwind-info \ + -z nomark-plt \ -z noseparate-code -z max-page-size=0x200000 --hash-style=sysv" "" "--64" {tlsbinpic.s tlsbin.s} {{readelf -WSsrl tlsbin.rd} {objdump -drj.text tlsbin.dd} @@ -70,6 +71,7 @@ set x86_64tests { "tlsbindesc"} {"TLS with global dynamic and descriptors" "-shared -melf_x86_64 --no-ld-generated-unwind-info \ + -z nomark-plt \ -z noseparate-code -z max-page-size=0x200000 --hash-style=sysv" "" "--64" {tlsgdesc.s} {{readelf -WSsrl tlsgdesc.rd} {objdump -drj.text\ -Mintel64 tlsgdesc.dd}} @@ -222,6 +224,7 @@ run_ld_link_tests [list \ [list \ "TLS -fpic -shared transitions" \ "-shared -melf_x86_64 --no-ld-generated-unwind-info \ + -z nomark-plt \ -z noseparate-code -z max-page-size=0x200000 --hash-style=sysv \ $NO_DT_RELR_LDFLAGS" \ "" "--64" \ @@ -235,6 +238,7 @@ run_ld_link_tests [list \ [list \ "TLS -fpic -shared transitions with r15 as GOT base" \ "-shared -melf_x86_64 --no-ld-generated-unwind-info \ + -z nomark-plt \ -z noseparate-code -z max-page-size=0x200000 --hash-style=sysv \ $NO_DT_RELR_LDFLAGS" \ "" "--64 -mrelax-relocations=yes" \ @@ -248,6 +252,7 @@ run_ld_link_tests [list \ [list \ "TLS descriptor -fpic -shared transitions" \ "-shared -melf_x86_64 --no-ld-generated-unwind-info \ + -z nomark-plt \ -z noseparate-code -z max-page-size=0x200000 --hash-style=sysv \ $NO_DT_RELR_LDFLAGS" \ "" "--64" \ @@ -2096,6 +2101,7 @@ run_ld_link_tests [list \ [list \ "basic PLT generation (-z now)" \ "-z now -melf_x86_64 --hash-style=sysv tmpdir/libpltlib.so \ + -z nomark-plt \ -z noseparate-code -z max-page-size=0x200000" \ "" \ "--64" \