From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1lHcoq-0006lA-73 for mharc-grub-devel@gnu.org; Wed, 03 Mar 2021 20:30:24 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35976) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lHcol-0006ed-Mt for grub-devel@gnu.org; Wed, 03 Mar 2021 20:30:20 -0500 Received: from mail-pg1-x535.google.com ([2607:f8b0:4864:20::535]:33223) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lHcoe-0001px-1J for grub-devel@gnu.org; Wed, 03 Mar 2021 20:30:17 -0500 Received: by mail-pg1-x535.google.com with SMTP id g4so17769371pgj.0 for ; Wed, 03 Mar 2021 17:30:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=efficientek-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jfrt2G21uHKkxHKXO2FmTvF/G+loMmLOCybErCo07o4=; b=P8Etpnj0zPJM3eI/2dOXXw3DjCvz3/ojijoVLhzfP+6Z2f7ntXai7WX1JpIGve3O4U 2PNfj+esne23zVCWjb2W8WHJsnhrdNCNTkSXMbrMXVJDqfeMRguzHqf2zVXGANTODAv1 6IKkFKR220xULXLWSj61imgxVqqDrONxKp0lTEJPargI5JXicdIMRhyKRqufPRbZCbnA t74wSOyJwGcK0Lm5YnlUKYoTxRvlQoc9daq3c/etM48tmjBs9fYyGS2uZL2nKog7oZ+k rWRT+yIKZfPBGLvJut+zEy0V+qcnXKDImMFHEZA92wR9zxSI08R2Xc9Iu2k3TY0v+Hhn THKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jfrt2G21uHKkxHKXO2FmTvF/G+loMmLOCybErCo07o4=; b=Z8On3sIjOWUpCeLqvPfQ/WEi4T3OF8BarKDfpKQG3TPCChws7lWVQpSkpyg51pKLbQ mkYm2pMVwTsKJ4vYQwOFWz38UXL/dUYu8S/kqSgABn+W8kAB2lhspphfgzRBH6vcObGO JYgaeCloTObnEjVBFsDOWtz9Ensj/SYWlmiGppmM80wMMdmpO60cJtV2jEKDmDHr8Aud Zol+uWD6rN18ApR1YqVw0ITM//7gpUOyQfdV37px9IAcKDGrwExfIW/Lhu64n2Y4FWxd bS2RrfnJaygDXo34hLnjiSF5Zd0tNddbjvwXviXxesiQ3pellRXHtpRc3MTZb/uNX4av +iNA== X-Gm-Message-State: AOAM532cYsJIObI5FH8qzN3YqrpKJPD6wRtFswSt3+1K4RJ8+4jBPDMF xOPDyAGqnb3eA9sYzd8AhPgPY/GmGFQ8AQ== X-Google-Smtp-Source: ABdhPJwq8aX+EE/NdZxvHfQmnRsUwVw7WoH7/fcexEp95Owvnp9VeJLbPMSXC7XuQjQQ22UbIMYI7Q== X-Received: by 2002:a63:ed02:: with SMTP id d2mr1570508pgi.67.1614821409834; Wed, 03 Mar 2021 17:30:09 -0800 (PST) Received: from localhost.localdomain ([2605:a601:aac5:3700:a76b:9596:1e1a:28ee]) by smtp.gmail.com with ESMTPSA id c193sm318190pfc.180.2021.03.03.17.30.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Mar 2021 17:30:09 -0800 (PST) From: Glenn Washburn To: grub-devel@gnu.org, Daniel Kiper Cc: Glenn Washburn Subject: [PATCH v5 10/13] error: Use format code PRIxGRUB_UINT64_T for 64-bit arg in grub_error Date: Wed, 3 Mar 2021 19:29:15 -0600 Message-Id: <059d2b9dbbaaf0f61c793b44118f6281f3d3d2ff.1614820843.git.development@efficientek.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::535; envelope-from=development@efficientek.com; helo=mail-pg1-x535.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Mar 2021 01:30:20 -0000 The macro ELF_R_TYPE does not change the underlying type. Here its argument is a 64-bit Elf64_Xword. Make sure the format code matches. For the riscv architecture, rel->r_info could be either Elf32_Xword or Elf64_Xword depending on if 32 or 64-bit risc is being built. So cast to 64-bit value regardless. Signed-off-by: Glenn Washburn --- grub-core/efiemu/i386/loadcore64.c | 3 ++- grub-core/kern/arm64/dl.c | 3 ++- grub-core/kern/ia64/dl.c | 3 ++- grub-core/kern/riscv/dl.c | 5 +++-- grub-core/kern/sparc64/dl.c | 3 ++- grub-core/kern/x86_64/dl.c | 3 ++- 6 files changed, 13 insertions(+), 7 deletions(-) diff --git a/grub-core/efiemu/i386/loadcore64.c b/grub-core/efiemu/i386/loadcore64.c index 18facf47f..7316efc39 100644 --- a/grub-core/efiemu/i386/loadcore64.c +++ b/grub-core/efiemu/i386/loadcore64.c @@ -122,7 +122,8 @@ grub_arch_efiemu_relocate_symbols64 (grub_efiemu_segment_t segs, break; default: return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET, - N_("relocation 0x%x is not implemented yet"), + N_("relocation 0x%" PRIxGRUB_UINT64_T + " is not implemented yet"), ELF_R_TYPE (rel->r_info)); } } diff --git a/grub-core/kern/arm64/dl.c b/grub-core/kern/arm64/dl.c index fb0337319..401672374 100644 --- a/grub-core/kern/arm64/dl.c +++ b/grub-core/kern/arm64/dl.c @@ -184,7 +184,8 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr, default: return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET, - N_("relocation 0x%x is not implemented yet"), + N_("relocation 0x%" PRIxGRUB_UINT64_T + " is not implemented yet"), ELF_R_TYPE (rel->r_info)); } } diff --git a/grub-core/kern/ia64/dl.c b/grub-core/kern/ia64/dl.c index ebcf31629..ddf240976 100644 --- a/grub-core/kern/ia64/dl.c +++ b/grub-core/kern/ia64/dl.c @@ -137,7 +137,8 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr, break; default: return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET, - N_("relocation 0x%x is not implemented yet"), + N_("relocation 0x%"PRIxGRUB_UINT64_T + " is not implemented yet"), ELF_R_TYPE (rel->r_info)); } } diff --git a/grub-core/kern/riscv/dl.c b/grub-core/kern/riscv/dl.c index 6fb8385ef..e6c4f89ff 100644 --- a/grub-core/kern/riscv/dl.c +++ b/grub-core/kern/riscv/dl.c @@ -331,8 +331,9 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr, break; default: return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET, - N_("relocation 0x%x is not implemented yet"), - ELF_R_TYPE (rel->r_info)); + N_("relocation 0x%"PRIxGRUB_UINT64_T + " is not implemented yet"), + (grub_uint64_t) ELF_R_TYPE (rel->r_info)); } } diff --git a/grub-core/kern/sparc64/dl.c b/grub-core/kern/sparc64/dl.c index 739be4717..60ce183fb 100644 --- a/grub-core/kern/sparc64/dl.c +++ b/grub-core/kern/sparc64/dl.c @@ -177,7 +177,8 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr, break; default: return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET, - N_("relocation 0x%x is not implemented yet"), + N_("relocation 0x%"PRIxGRUB_UINT64_T + " is not implemented yet"), ELF_R_TYPE (rel->r_info)); } } diff --git a/grub-core/kern/x86_64/dl.c b/grub-core/kern/x86_64/dl.c index 3a73e6e6c..8d2800c9e 100644 --- a/grub-core/kern/x86_64/dl.c +++ b/grub-core/kern/x86_64/dl.c @@ -107,7 +107,8 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr, default: return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET, - N_("relocation 0x%x is not implemented yet"), + N_("relocation 0x%"PRIxGRUB_UINT64_T + " is not implemented yet"), ELF_R_TYPE (rel->r_info)); } } -- 2.27.0