From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pj1-x1031.google.com (mail-pj1-x1031.google.com [IPv6:2607:f8b0:4864:20::1031]) by sourceware.org (Postfix) with ESMTPS id A2DE638DA8B6 for ; Sat, 9 Apr 2022 06:03:16 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org A2DE638DA8B6 Received: by mail-pj1-x1031.google.com with SMTP id mp16-20020a17090b191000b001cb5efbcab6so1441039pjb.4 for ; Fri, 08 Apr 2022 23:03:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:subject:message-id:mime-version :content-disposition; bh=uPNd3oTiAiO2QVKkYGbmU+CDPyvqdeNK0/0fVLSE4C8=; b=gILmUJpf4UhlGgbd0Xr2x/PzU91rkxJq0//AbSKyt/DCDb0V+1ksUFjjGyfzlCyShw FImYHhB8h5yVOnZXWZql5R3x05TZT2BjlodMJ68TvXsMRn7vI1Gn9IwWehRkKqgv4XNb /3cndMq8eqSxPpUxSe3TkED+4sJfutBriDrl5Tn1C3wj8Y2Uhv7SGUgTFl2wh1mXNjL0 lShoLFRz/3qPJEZcNbVv2iW7qP0XSynrTLMLdGmDNi9GHXxoRPJol5e3WwkBu699jXiF WNNlzkgJfcVToCc+cbuDK8yhIGOwNIakw3N0kOJQGbztkBGHPOCFAnffzTwkE0rEQG+G CODw== X-Gm-Message-State: AOAM5303amHcY1y9xmC98XQW6aPNfoxAt7aK16t+pVYwq9mX3JnIvFOB 446PiLKrgI35ApfWNiui81Em5CGJtsM= X-Google-Smtp-Source: ABdhPJxh29aMIt77nF1fi/MwDT0jJ0x6+emZQt0mkw2L22OicXUtHPE3MbWfzaOR2wDA2WR9v3Mzng== X-Received: by 2002:a17:902:ecd2:b0:156:9992:5892 with SMTP id a18-20020a170902ecd200b0015699925892mr22447684plh.7.1649484195239; Fri, 08 Apr 2022 23:03:15 -0700 (PDT) Received: from squeak.grove.modra.org ([2406:3400:51d:8cc0:88f:58af:3cb5:79f7]) by smtp.gmail.com with ESMTPSA id y6-20020a17090a154600b001cb59d912f1sm1755564pja.13.2022.04.08.23.03.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Apr 2022 23:03:14 -0700 (PDT) Received: by squeak.grove.modra.org (Postfix, from userid 1000) id 818731140F9D; Sat, 9 Apr 2022 15:33:11 +0930 (ACST) Date: Sat, 9 Apr 2022 15:33:11 +0930 From: Alan Modra To: binutils@sourceware.org Subject: Correct nds32 readelf reloc numbers Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Spam-Status: No, score=-3026.1 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, T_SCC_BODY_TEXT_LINE, UNWANTED_LANGUAGE_BODY autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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: , X-List-Received-Date: Sat, 09 Apr 2022 06:03:18 -0000 This fixes the recent nds32 "FAIL: readelf -wiaoRlL dw5". * readelf.c (is_32bit_abs_reloc, is_16bit_abs_reloc): Comment fixes. (is_none_reloc): Correct nds32 reloc numbers. diff --git a/binutils/readelf.c b/binutils/readelf.c index a9207b0178c..d45e0920788 100644 --- a/binutils/readelf.c +++ b/binutils/readelf.c @@ -14272,7 +14272,7 @@ is_32bit_abs_reloc (Filedata * filedata, unsigned int reloc_type) case EM_MT: return reloc_type == 2; /* R_MT_32. */ case EM_NDS32: - return reloc_type == 20; /* R_NDS32_RELA. */ + return reloc_type == 20; /* R_NDS32_32_RELA. */ case EM_ALTERA_NIOS2: return reloc_type == 12; /* R_NIOS2_BFD_RELOC_32. */ case EM_NIOS32: @@ -14584,7 +14584,7 @@ is_16bit_abs_reloc (Filedata * filedata, unsigned int reloc_type) case EM_MSP430_OLD: return reloc_type == 5; /* R_MSP430_16_BYTE. */ case EM_NDS32: - return reloc_type == 19; /* R_NDS32_RELA. */ + return reloc_type == 19; /* R_NDS32_16_RELA. */ case EM_ALTERA_NIOS2: return reloc_type == 13; /* R_NIOS2_BFD_RELOC_16. */ case EM_NIOS32: @@ -14845,11 +14845,11 @@ is_none_reloc (Filedata * filedata, unsigned int reloc_type) case EM_METAG: return reloc_type == 3; /* R_METAG_NONE. */ case EM_NDS32: - return (reloc_type == 0 /* R_XTENSA_NONE. */ - || reloc_type == 204 /* R_NDS32_DIFF8. */ - || reloc_type == 205 /* R_NDS32_DIFF16. */ - || reloc_type == 206 /* R_NDS32_DIFF32. */ - || reloc_type == 207 /* R_NDS32_ULEB128. */); + return (reloc_type == 0 /* R_NDS32_NONE. */ + || reloc_type == 205 /* R_NDS32_DIFF8. */ + || reloc_type == 206 /* R_NDS32_DIFF16. */ + || reloc_type == 207 /* R_NDS32_DIFF32. */ + || reloc_type == 208 /* R_NDS32_DIFF_ULEB128. */); case EM_TI_PRU: return (reloc_type == 0 /* R_PRU_NONE. */ || reloc_type == 65 /* R_PRU_DIFF8. */ -- Alan Modra Australia Development Lab, IBM