From patchwork Fri Jul 28 05:07:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Maciej W. Rozycki" X-Patchwork-Id: 127334 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp206553vqg; Thu, 27 Jul 2023 22:19:31 -0700 (PDT) X-Google-Smtp-Source: APBJJlHQ8H/Pp1TSX78aHSTdAro1mmhlG1DefkDExd066lOJPZiyq+HTPHOgBWlr5ezynl51iA8Q X-Received: by 2002:a17:907:779a:b0:991:d9cb:247d with SMTP id ky26-20020a170907779a00b00991d9cb247dmr942376ejc.57.1690521571502; Thu, 27 Jul 2023 22:19:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690521571; cv=none; d=google.com; s=arc-20160816; b=PZZXxnhyEfgcX9f2A0pn2FZ3/Rzm7YTm9YbeYsInw9R1nRsCNvUBljxV3Xc/JlSgqA E4/u5zrFCfRLUuERxwHF1A4XOJlN4vVmdsS+NIg8P3T5RhnSyFslUJBlf1A/MqGOTUWY jM0wxNi3mnU3lkHpnQ2D4Gtx+tkMLqehfFcJZxBlzo1KkAG/xtKja+2K3G8x34MA69XX xew6QQRO0brU1YM5+tTqHuVDRjAdyIXlj8LrpE1dxCrlJC51ebjLmS6xmDHTmOuYbw/c j9DrofqLDhwJPGtFE22WrIPsSCSncc8MdU0RGkldxCJaPOoYLK79aWBk1NQL7OA9TamO zL6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:mime-version:user-agent :references:message-id:in-reply-to:subject:cc:to:from:date :dmarc-filter:delivered-to; bh=55lNAdguhi+afUXpVdru+PcYInn8cF9Frb4n1xD4SAI=; fh=Qo2J6dANwcPjQn140TSErRwEzDQnKw4Tx4jp1VOUUcA=; b=aUb3Ar7aMo9GzpJj0igjL8zPZgvYUIMCfgYxZkWhMkxF4dY8s7fYdZpRhZRM+pB7LV CtOGl2MvA2a+pMjsGifs/m/qF0jjjA4CYnvMFkiBUAVRfubyZRC67xfkh3WCrYIGQ/OF NF86Ooy+U1IibzPfcPDomW9yOQqaAol+Z3cpjU9OZurlZheExSNyMtBW8RNMbkFjPRDd 2VIQ/pkKmnFfEqhhJQU+z3D5ao9SZ1V5l/CDYx00WcflVu6vKbVTZsVGqIHwR8FC+Fg4 vyMesaaODPNBcL8Ep9wmX9OogEg6YrNBKm+Uuv2GqQb6oTYxWOIRDCAMOE84Fv9G3UYd lHVw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org" Received: from server2.sourceware.org (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id a13-20020a170906684d00b00997bd26a559si2174038ejs.881.2023.07.27.22.19.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jul 2023 22:19:31 -0700 (PDT) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org" Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 63DE9386F821 for ; Fri, 28 Jul 2023 05:09:33 +0000 (GMT) X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from angie.orcam.me.uk (angie.orcam.me.uk [78.133.224.34]) by sourceware.org (Postfix) with ESMTP id 5949A38308C0 for ; Fri, 28 Jul 2023 05:07:34 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5949A38308C0 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=orcam.me.uk Authentication-Results: sourceware.org; spf=none smtp.mailfrom=orcam.me.uk Received: by angie.orcam.me.uk (Postfix, from userid 500) id 9AF3F92009C; Fri, 28 Jul 2023 07:07:33 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by angie.orcam.me.uk (Postfix) with ESMTP id 94ECA92009B; Fri, 28 Jul 2023 06:07:33 +0100 (BST) Date: Fri, 28 Jul 2023 06:07:33 +0100 (BST) From: "Maciej W. Rozycki" To: Nick Clifton cc: YunQiang Su , binutils@sourceware.org Subject: [committed 14/16] testsuite: Handle composed R_MIPS_NONE relocations In-Reply-To: Message-ID: References: User-Agent: Alpine 2.21 (DEB 202 2017-01-01) MIME-Version: 1.0 X-Spam-Status: No, score=-1162.9 required=5.0 tests=BAYES_00, KAM_ASCII_DIVIDERS, KAM_DMARC_STATUS, KAM_INFOUSMEBIZ, KAM_LAZY_DOMAIN_SECURITY, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=no 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.29 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org Sender: "Binutils" X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772640347337559669 X-GMAIL-MSGID: 1772640347337559669 From: YunQiang Su MIPS n64 ABI has a peculiarity where all relocations are composed of three, with subsequent relocation types set to R_MIPS_NONE if further calculation is not required. Example output produced by `readelf' and `objdump' for such relocations is: Offset Info Type Sym. Value Sym. Name + Addend 000000000000 000800000002 R_MIPS_32 0000000000000000 foo + 0 Type2: R_MIPS_NONE Type3: R_MIPS_NONE and: OFFSET TYPE VALUE 0000000000000000 R_MIPS_32 foo 0000000000000000 R_MIPS_NONE *ABS* 0000000000000000 R_MIPS_NONE *ABS* respectively. The presence of these extra R_MIPS_NONE entries is not relevant for generic or even some MIPS tests, so optionally match them with the respective dump patterns, also discarding `xfail' annotation for MIPS/OpenBSD targets from gas/elf/missing-build-notes.d, removing these regressions: mips64-openbsd -FAIL: readelf -r bintest mips64-openbsd -FAIL: forward expression mips64-openbsd -FAIL: assignment tests mips64-openbsd -FAIL: gas/all/none mips64-openbsd -XFAIL: gas/elf/missing-build-notes mips64-openbsd -FAIL: macro test 2 mips64-openbsd -FAIL: macro irp mips64-openbsd -FAIL: macro rept mips64-openbsd -FAIL: nested irp/irpc/rept mips64-openbsd -FAIL: macro vararg mips64-openbsd -FAIL: mips jalx mips64-openbsd -FAIL: ST Microelectronics Loongson-2F workarounds of Jump Instruction issue mips64el-openbsd -FAIL: readelf -r bintest mips64el-openbsd -FAIL: forward expression mips64el-openbsd -FAIL: assignment tests mips64el-openbsd -FAIL: gas/all/none mips64el-openbsd -XFAIL: gas/elf/missing-build-notes mips64el-openbsd -FAIL: macro test 2 mips64el-openbsd -FAIL: macro irp mips64el-openbsd -FAIL: macro rept mips64el-openbsd -FAIL: nested irp/irpc/rept mips64el-openbsd -FAIL: macro vararg mips64el-openbsd -FAIL: mips jalx mips64el-openbsd -FAIL: ST Microelectronics Loongson-2F workarounds of Jump Instruction issue Co-Authored-By: Maciej W. Rozycki binutils/ * testsuite/binutils-all/readelf.r-64: Optionally match extra R_MIPS_NONE pairs. gas/ * testsuite/gas/all/assign.d: Optionally match extra R_MIPS_NONE pairs. * testsuite/gas/all/fwdexp.d: Likewise. * testsuite/gas/all/none.d: Likewise. * testsuite/gas/macros/irp.d: Likewise. * testsuite/gas/macros/repeat.d: Likewise. * testsuite/gas/macros/rept.d: Likewise. * testsuite/gas/macros/test2.d: Likewise. * testsuite/gas/macros/vararg.d: Likewise. * testsuite/gas/mips/compact-eh-eb-1.d: Likewise. * testsuite/gas/mips/compact-eh-eb-2.d: Likewise. * testsuite/gas/mips/compact-eh-eb-3.d: Likewise. * testsuite/gas/mips/compact-eh-eb-4.d: Likewise. * testsuite/gas/mips/compact-eh-eb-5.d: Likewise. * testsuite/gas/mips/compact-eh-eb-6.d: Likewise. * testsuite/gas/mips/compact-eh-el-1.d: Likewise. * testsuite/gas/mips/compact-eh-el-2.d: Likewise. * testsuite/gas/mips/compact-eh-el-3.d: Likewise. * testsuite/gas/mips/compact-eh-el-4.d: Likewise. * testsuite/gas/mips/compact-eh-el-5.d: Likewise. * testsuite/gas/mips/compact-eh-el-6.d: Likewise. * testsuite/gas/mips/loongson-2f-3.d: Likewise. * testsuite/gas/mips/mips-jalx.d: Likewise. * testsuite/gas/elf/missing-build-notes.d: Likewise. Remove the `xfail' tag. ld/ * testsuite/ld-mips-elf/reloc-estimate-1.d: Optionally match extra R_MIPS_NONE pairs. --- binutils/testsuite/binutils-all/readelf.r-64 | 2 gas/testsuite/gas/all/assign.d | 4 + gas/testsuite/gas/all/fwdexp.d | 2 gas/testsuite/gas/all/none.d | 2 gas/testsuite/gas/elf/missing-build-notes.d | 9 +++ gas/testsuite/gas/macros/irp.d | 12 ++++ gas/testsuite/gas/macros/repeat.d | 72 +++++++++++++++++++++++++++ gas/testsuite/gas/macros/rept.d | 6 ++ gas/testsuite/gas/macros/test2.d | 6 ++ gas/testsuite/gas/macros/vararg.d | 12 ++++ gas/testsuite/gas/mips/compact-eh-eb-1.d | 2 gas/testsuite/gas/mips/compact-eh-eb-2.d | 8 +++ gas/testsuite/gas/mips/compact-eh-eb-3.d | 4 + gas/testsuite/gas/mips/compact-eh-eb-4.d | 4 + gas/testsuite/gas/mips/compact-eh-eb-5.d | 8 +++ gas/testsuite/gas/mips/compact-eh-eb-6.d | 4 + gas/testsuite/gas/mips/compact-eh-el-1.d | 2 gas/testsuite/gas/mips/compact-eh-el-2.d | 8 +++ gas/testsuite/gas/mips/compact-eh-el-3.d | 4 + gas/testsuite/gas/mips/compact-eh-el-4.d | 4 + gas/testsuite/gas/mips/compact-eh-el-5.d | 8 +++ gas/testsuite/gas/mips/compact-eh-el-6.d | 4 + gas/testsuite/gas/mips/loongson-2f-3.d | 2 gas/testsuite/gas/mips/mips-jalx.d | 2 ld/testsuite/ld-mips-elf/reloc-estimate-1.d | 4 + 25 files changed, 194 insertions(+), 1 deletion(-) binutils-yunqiang-test-r-mips-none.diff Index: binutils-gdb/binutils/testsuite/binutils-all/readelf.r-64 =================================================================== --- binutils-gdb.orig/binutils/testsuite/binutils-all/readelf.r-64 +++ binutils-gdb/binutils/testsuite/binutils-all/readelf.r-64 @@ -2,3 +2,5 @@ Relocation section '.rel.*text' at offset 0x.* contains 1 entry: Offset Info Type Sym. Value Sym. Name.* 0+04 [0-9A-Fa-f]+ *R_.*0+00 external_symbol.* +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* Index: binutils-gdb/gas/testsuite/gas/all/assign.d =================================================================== --- binutils-gdb.orig/gas/testsuite/gas/all/assign.d +++ binutils-gdb/gas/testsuite/gas/all/assign.d @@ -3,5 +3,9 @@ #... .*zzz.* +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* .*zzz.* +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* #pass Index: binutils-gdb/gas/testsuite/gas/all/fwdexp.d =================================================================== --- binutils-gdb.orig/gas/testsuite/gas/all/fwdexp.d +++ binutils-gdb/gas/testsuite/gas/all/fwdexp.d @@ -6,6 +6,8 @@ RELOCATION RECORDS FOR .* OFFSET +TYPE +VALUE 0+ .*(\.data|label_i)(|\+0xf+e|\+0xf+c|\+0xf+8|-0x0*2|-0x0*4|-0x0*8) +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* Contents of section .* 0+ (0+|feff|fffe|fcffffff|fffffffc|f8ffffff|f8ffffff ffffffff|ffffffff fffffff8|0+4) .* Index: binutils-gdb/gas/testsuite/gas/all/none.d =================================================================== --- binutils-gdb.orig/gas/testsuite/gas/all/none.d +++ binutils-gdb/gas/testsuite/gas/all/none.d @@ -5,3 +5,5 @@ #... 0+ .*(NONE|NULL|UNUSED0) +\*ABS\* +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* Index: binutils-gdb/gas/testsuite/gas/elf/missing-build-notes.d =================================================================== --- binutils-gdb.orig/gas/testsuite/gas/elf/missing-build-notes.d +++ binutils-gdb/gas/testsuite/gas/elf/missing-build-notes.d @@ -1,6 +1,5 @@ # as: --generate-missing-build-notes=yes # objdump: -r -#xfail: mips*-*-openbsd # Check that the relocations are for increasing addresses... @@ -8,7 +7,15 @@ RELOCATION RECORDS FOR \[.gnu.build.attributes\]: OFFSET +TYPE +VALUE 0+014 .*[ ]+.* +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+0(18|1c) .*[ ]+.* +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+0(30|38) .*[ ]+.* +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+0(34|40) .*[ ]+.* +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* #pass Index: binutils-gdb/gas/testsuite/gas/macros/irp.d =================================================================== --- binutils-gdb.orig/gas/testsuite/gas/macros/irp.d +++ binutils-gdb/gas/testsuite/gas/macros/irp.d @@ -8,9 +8,21 @@ RELOCATION RECORDS FOR .* OFFSET[ ]+TYPE[ ]+VALUE.* 0+00[ ]+[a-zA-Z0-9_]+[ ]+foo1 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+04[ ]+[a-zA-Z0-9_]+[ ]+foo2 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+08[ ]+[a-zA-Z0-9_]+[ ]+foo3 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+0c[ ]+[a-zA-Z0-9_]+[ ]+bar1 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+10[ ]+[a-zA-Z0-9_]+[ ]+bar2 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+14[ ]+[a-zA-Z0-9_]+[ ]+bar3 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* #pass Index: binutils-gdb/gas/testsuite/gas/macros/repeat.d =================================================================== --- binutils-gdb.orig/gas/testsuite/gas/macros/repeat.d +++ binutils-gdb/gas/testsuite/gas/macros/repeat.d @@ -8,39 +8,111 @@ RELOCATION RECORDS FOR .* OFFSET[ ]+TYPE[ ]+VALUE.* 0+00[ ]+[a-zA-Z0-9_]+[ ]+irp_irp_19 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+04[ ]+[a-zA-Z0-9_]+[ ]+irp_irp_18 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+08[ ]+[a-zA-Z0-9_]+[ ]+irp_irp_29 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+0c[ ]+[a-zA-Z0-9_]+[ ]+irp_irp_28 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+10[ ]+[a-zA-Z0-9_]+[ ]+irp_irpc_19 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+14[ ]+[a-zA-Z0-9_]+[ ]+irp_irpc_18 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+18[ ]+[a-zA-Z0-9_]+[ ]+irp_irpc_29 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+1c[ ]+[a-zA-Z0-9_]+[ ]+irp_irpc_28 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+20[ ]+[a-zA-Z0-9_]+[ ]+irp_rept_1 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+24[ ]+[a-zA-Z0-9_]+[ ]+irp_rept_1 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+28[ ]+[a-zA-Z0-9_]+[ ]+irp_rept_2 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+2c[ ]+[a-zA-Z0-9_]+[ ]+irp_rept_2 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+30[ ]+[a-zA-Z0-9_]+[ ]+irpc_irp_19 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+34[ ]+[a-zA-Z0-9_]+[ ]+irpc_irp_18 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+38[ ]+[a-zA-Z0-9_]+[ ]+irpc_irp_29 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+3c[ ]+[a-zA-Z0-9_]+[ ]+irpc_irp_28 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+40[ ]+[a-zA-Z0-9_]+[ ]+irpc_irpc_19 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+44[ ]+[a-zA-Z0-9_]+[ ]+irpc_irpc_18 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+48[ ]+[a-zA-Z0-9_]+[ ]+irpc_irpc_29 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+4c[ ]+[a-zA-Z0-9_]+[ ]+irpc_irpc_28 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+50[ ]+[a-zA-Z0-9_]+[ ]+irpc_rept_1 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+54[ ]+[a-zA-Z0-9_]+[ ]+irpc_rept_1 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+58[ ]+[a-zA-Z0-9_]+[ ]+irpc_rept_2 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+5c[ ]+[a-zA-Z0-9_]+[ ]+irpc_rept_2 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+60[ ]+[a-zA-Z0-9_]+[ ]+rept_irp_9 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+64[ ]+[a-zA-Z0-9_]+[ ]+rept_irp_8 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+68[ ]+[a-zA-Z0-9_]+[ ]+rept_irp_9 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+6c[ ]+[a-zA-Z0-9_]+[ ]+rept_irp_8 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+70[ ]+[a-zA-Z0-9_]+[ ]+rept_irpc_9 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+74[ ]+[a-zA-Z0-9_]+[ ]+rept_irpc_8 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+78[ ]+[a-zA-Z0-9_]+[ ]+rept_irpc_9 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+7c[ ]+[a-zA-Z0-9_]+[ ]+rept_irpc_8 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+80[ ]+[a-zA-Z0-9_]+[ ]+rept_rept +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+84[ ]+[a-zA-Z0-9_]+[ ]+rept_rept +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+88[ ]+[a-zA-Z0-9_]+[ ]+rept_rept +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+8c[ ]+[a-zA-Z0-9_]+[ ]+rept_rept +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* #pass Index: binutils-gdb/gas/testsuite/gas/macros/rept.d =================================================================== --- binutils-gdb.orig/gas/testsuite/gas/macros/rept.d +++ binutils-gdb/gas/testsuite/gas/macros/rept.d @@ -8,6 +8,12 @@ RELOCATION RECORDS FOR .* OFFSET[ ]+TYPE[ ]+VALUE.* 0+00[ ]+[a-zA-Z0-9_]+[ ]+foo1 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+04[ ]+[a-zA-Z0-9_]+[ ]+foo1 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+08[ ]+[a-zA-Z0-9_]+[ ]+foo1 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* #pass Index: binutils-gdb/gas/testsuite/gas/macros/test2.d =================================================================== --- binutils-gdb.orig/gas/testsuite/gas/macros/test2.d +++ binutils-gdb/gas/testsuite/gas/macros/test2.d @@ -8,6 +8,12 @@ RELOCATION RECORDS FOR .* OFFSET[ ]+TYPE[ ]+VALUE.* 0+00[ ]+[a-zA-Z0-9_]+[ ]+foo1 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+04[ ]+[a-zA-Z0-9_]+[ ]+foo2 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+08[ ]+[a-zA-Z0-9_]+[ ]+foo3 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* #pass Index: binutils-gdb/gas/testsuite/gas/macros/vararg.d =================================================================== --- binutils-gdb.orig/gas/testsuite/gas/macros/vararg.d +++ binutils-gdb/gas/testsuite/gas/macros/vararg.d @@ -8,9 +8,21 @@ RELOCATION RECORDS FOR .* OFFSET[ ]+TYPE[ ]+VALUE.* 0+00[ ]+[a-zA-Z0-9_]+[ ]+foo1 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+04[ ]+[a-zA-Z0-9_]+[ ]+foo2 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+08[ ]+[a-zA-Z0-9_]+[ ]+foo3 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+0c[ ]+[a-zA-Z0-9_]+[ ]+foo4 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+10[ ]+[a-zA-Z0-9_]+[ ]+foo5 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+14[ ]+[a-zA-Z0-9_]+[ ]+foo6 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* #pass Index: binutils-gdb/gas/testsuite/gas/mips/compact-eh-eb-1.d =================================================================== --- binutils-gdb.orig/gas/testsuite/gas/mips/compact-eh-eb-1.d +++ binutils-gdb/gas/testsuite/gas/mips/compact-eh-eb-1.d @@ -9,6 +9,8 @@ RELOCATION RECORDS FOR \[.eh_frame_entry\]: OFFSET +TYPE +VALUE 0+000000 R_MIPS_PC32 .text.* +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* Contents of section .text: Index: binutils-gdb/gas/testsuite/gas/mips/compact-eh-eb-2.d =================================================================== --- binutils-gdb.orig/gas/testsuite/gas/mips/compact-eh-eb-2.d +++ binutils-gdb/gas/testsuite/gas/mips/compact-eh-eb-2.d @@ -9,17 +9,25 @@ RELOCATION RECORDS FOR \[.data.DW.ref.__gnu_compact_pr2\]: OFFSET +TYPE +VALUE 0+000000 R_MIPS_32 __gnu_compact_pr2 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* RELOCATION RECORDS FOR \[.gnu_extab\]: OFFSET +TYPE +VALUE 0+000001 R_MIPS_PC32 DW.ref.__gnu_compact_pr2 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* RELOCATION RECORDS FOR \[.eh_frame_entry\]: OFFSET +TYPE +VALUE 0+000000 R_MIPS_PC32 .text.* +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+000004 R_MIPS_PC32 .gnu_extab +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* Contents of section .group: Index: binutils-gdb/gas/testsuite/gas/mips/compact-eh-eb-3.d =================================================================== --- binutils-gdb.orig/gas/testsuite/gas/mips/compact-eh-eb-3.d +++ binutils-gdb/gas/testsuite/gas/mips/compact-eh-eb-3.d @@ -9,7 +9,11 @@ RELOCATION RECORDS FOR \[.eh_frame_entry\]: OFFSET +TYPE +VALUE 0+000000 R_MIPS_PC32 .text.* +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+000004 R_MIPS_PC32 .gnu_extab +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* Contents of section .text: Index: binutils-gdb/gas/testsuite/gas/mips/compact-eh-eb-4.d =================================================================== --- binutils-gdb.orig/gas/testsuite/gas/mips/compact-eh-eb-4.d +++ binutils-gdb/gas/testsuite/gas/mips/compact-eh-eb-4.d @@ -9,7 +9,11 @@ RELOCATION RECORDS FOR \[.eh_frame_entry\]: OFFSET +TYPE +VALUE 0+000000 R_MIPS_PC32 .text.* +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+000004 R_MIPS_PC32 .gnu_extab +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* Contents of section .text: Index: binutils-gdb/gas/testsuite/gas/mips/compact-eh-eb-5.d =================================================================== --- binutils-gdb.orig/gas/testsuite/gas/mips/compact-eh-eb-5.d +++ binutils-gdb/gas/testsuite/gas/mips/compact-eh-eb-5.d @@ -9,17 +9,25 @@ RELOCATION RECORDS FOR \[.data.DW.ref.__gnu_compact_pr2\]: OFFSET +TYPE +VALUE 0+000000 R_MIPS_32 __gnu_compact_pr2 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* RELOCATION RECORDS FOR \[.gnu_extab\]: OFFSET +TYPE +VALUE 0+000001 R_MIPS_PC32 DW.ref.__gnu_compact_pr2 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* RELOCATION RECORDS FOR \[.eh_frame_entry\]: OFFSET +TYPE +VALUE 0+000000 R_MIPS_PC32 .text.* +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+000004 R_MIPS_PC32 .gnu_extab +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* Contents of section .group: Index: binutils-gdb/gas/testsuite/gas/mips/compact-eh-eb-6.d =================================================================== --- binutils-gdb.orig/gas/testsuite/gas/mips/compact-eh-eb-6.d +++ binutils-gdb/gas/testsuite/gas/mips/compact-eh-eb-6.d @@ -9,7 +9,11 @@ RELOCATION RECORDS FOR \[.eh_frame_entry\]: OFFSET +TYPE +VALUE 0+000000 R_MIPS_PC32 .text.* +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+000004 R_MIPS_PC32 .gnu_extab +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* Contents of section .text: Index: binutils-gdb/gas/testsuite/gas/mips/compact-eh-el-1.d =================================================================== --- binutils-gdb.orig/gas/testsuite/gas/mips/compact-eh-el-1.d +++ binutils-gdb/gas/testsuite/gas/mips/compact-eh-el-1.d @@ -9,6 +9,8 @@ RELOCATION RECORDS FOR \[.eh_frame_entry\]: OFFSET +TYPE +VALUE 0+000000 R_MIPS_PC32 .text.* +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* Contents of section .text: Index: binutils-gdb/gas/testsuite/gas/mips/compact-eh-el-2.d =================================================================== --- binutils-gdb.orig/gas/testsuite/gas/mips/compact-eh-el-2.d +++ binutils-gdb/gas/testsuite/gas/mips/compact-eh-el-2.d @@ -9,17 +9,25 @@ RELOCATION RECORDS FOR \[.data.DW.ref.__gnu_compact_pr2\]: OFFSET +TYPE +VALUE 0+000000 R_MIPS_32 __gnu_compact_pr2 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* RELOCATION RECORDS FOR \[.gnu_extab\]: OFFSET +TYPE +VALUE 0+000001 R_MIPS_PC32 DW.ref.__gnu_compact_pr2 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* RELOCATION RECORDS FOR \[.eh_frame_entry\]: OFFSET +TYPE +VALUE 0+000000 R_MIPS_PC32 .text.* +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+000004 R_MIPS_PC32 .gnu_extab +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* Contents of section .group: Index: binutils-gdb/gas/testsuite/gas/mips/compact-eh-el-3.d =================================================================== --- binutils-gdb.orig/gas/testsuite/gas/mips/compact-eh-el-3.d +++ binutils-gdb/gas/testsuite/gas/mips/compact-eh-el-3.d @@ -9,7 +9,11 @@ RELOCATION RECORDS FOR \[.eh_frame_entry\]: OFFSET +TYPE +VALUE 0+000000 R_MIPS_PC32 .text.* +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+000004 R_MIPS_PC32 .gnu_extab +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* Contents of section .text: Index: binutils-gdb/gas/testsuite/gas/mips/compact-eh-el-4.d =================================================================== --- binutils-gdb.orig/gas/testsuite/gas/mips/compact-eh-el-4.d +++ binutils-gdb/gas/testsuite/gas/mips/compact-eh-el-4.d @@ -9,7 +9,11 @@ RELOCATION RECORDS FOR \[.eh_frame_entry\]: OFFSET +TYPE +VALUE 0+000000 R_MIPS_PC32 .text.* +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+000004 R_MIPS_PC32 .gnu_extab +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* Contents of section .text: Index: binutils-gdb/gas/testsuite/gas/mips/compact-eh-el-5.d =================================================================== --- binutils-gdb.orig/gas/testsuite/gas/mips/compact-eh-el-5.d +++ binutils-gdb/gas/testsuite/gas/mips/compact-eh-el-5.d @@ -8,17 +8,25 @@ RELOCATION RECORDS FOR \[.data.DW.ref.__gnu_compact_pr2\]: OFFSET +TYPE +VALUE 0+000000 R_MIPS_32 __gnu_compact_pr2 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* RELOCATION RECORDS FOR \[.gnu_extab\]: OFFSET +TYPE +VALUE 0+000001 R_MIPS_PC32 DW.ref.__gnu_compact_pr2 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* RELOCATION RECORDS FOR \[.eh_frame_entry\]: OFFSET +TYPE +VALUE 0+000000 R_MIPS_PC32 .text.* +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+000004 R_MIPS_PC32 .gnu_extab +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* Contents of section .group: Index: binutils-gdb/gas/testsuite/gas/mips/compact-eh-el-6.d =================================================================== --- binutils-gdb.orig/gas/testsuite/gas/mips/compact-eh-el-6.d +++ binutils-gdb/gas/testsuite/gas/mips/compact-eh-el-6.d @@ -9,7 +9,11 @@ RELOCATION RECORDS FOR \[.eh_frame_entry\]: OFFSET +TYPE +VALUE 0+000000 R_MIPS_PC32 .text.* +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+000004 R_MIPS_PC32 .gnu_extab +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* Contents of section .text: Index: binutils-gdb/gas/testsuite/gas/mips/loongson-2f-3.d =================================================================== --- binutils-gdb.orig/gas/testsuite/gas/mips/loongson-2f-3.d +++ binutils-gdb/gas/testsuite/gas/mips/loongson-2f-3.d @@ -30,5 +30,7 @@ 44: 08000000 j 0x0 44: R_MIPS_26 external_label +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 48: 00000000 nop 4c: 00000000 nop Index: binutils-gdb/gas/testsuite/gas/mips/mips-jalx.d =================================================================== --- binutils-gdb.orig/gas/testsuite/gas/mips/mips-jalx.d +++ binutils-gdb/gas/testsuite/gas/mips/mips-jalx.d @@ -6,6 +6,8 @@ 0+000000 <.text>: 0: 74000000 jalx 0x0 0: R_MIPS_26 external_label +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 4: 00000000 nop 8: 00000000 nop c: 00000000 nop Index: binutils-gdb/ld/testsuite/ld-mips-elf/reloc-estimate-1.d =================================================================== --- binutils-gdb.orig/ld/testsuite/ld-mips-elf/reloc-estimate-1.d +++ binutils-gdb/ld/testsuite/ld-mips-elf/reloc-estimate-1.d @@ -9,7 +9,11 @@ DYNAMIC RELOCATION RECORDS OFFSET +TYPE +VALUE 0+000000 R_MIPS_NONE \*ABS\* +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+010000 R_MIPS_REL32 foo@@V2 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* # The address must be 0x810. We should only ever allocate one dynamic