X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=bfd%2Felf32-metag.c;h=45a5229a495229c79567d69533c5f0d6e0a12416;hb=680e019e5aeec49734760653145fee89f0ddc00b;hp=82e67eac99a752f8dd6ad51ae253e4a7b4d199b8;hpb=0a1b45a20eaa98d4d9026dc1fd17e79e741183af;p=binutils-gdb.git

diff --git a/bfd/elf32-metag.c b/bfd/elf32-metag.c
index 82e67eac99a..45a5229a495 100644
--- a/bfd/elf32-metag.c
+++ b/bfd/elf32-metag.c
@@ -1,5 +1,5 @@
 /* Meta support for 32-bit ELF
-   Copyright (C) 2013-2021 Free Software Foundation, Inc.
+   Copyright (C) 2013-2022 Free Software Foundation, Inc.
    Contributed by Imagination Technologies Ltd.
 
    This file is part of BFD, the Binary File Descriptor library.
@@ -1546,8 +1546,8 @@ elf_metag_relocate_section (bfd *output_bfd,
 	  if ((bfd_link_pic (info)
 	       && r_symndx != STN_UNDEF
 	       && (input_section->flags & SEC_ALLOC) != 0
-	       && (r_type != R_METAG_RELBRANCH
-		   || !SYMBOL_CALLS_LOCAL (info, &hh->eh)))
+	       && !(r_type == R_METAG_RELBRANCH
+		    && (hh == NULL || SYMBOL_CALLS_LOCAL (info, &hh->eh))))
 	      || (!bfd_link_pic (info)
 		  && hh != NULL
 		  && hh->eh.dynindx != -1
@@ -3998,8 +3998,7 @@ elf_metag_plt_sym_val (bfd_vma i, const asection *plt,
 #define ELF_ARCH		bfd_arch_metag
 #define ELF_TARGET_ID		METAG_ELF_DATA
 #define ELF_MACHINE_CODE	EM_METAG
-#define ELF_MINPAGESIZE	0x1000
-#define ELF_MAXPAGESIZE	0x4000
+#define ELF_MAXPAGESIZE		0x4000
 #define ELF_COMMONPAGESIZE	0x1000
 
 #define TARGET_LITTLE_SYM	metag_elf32_vec