Просмотр исходного кода

elf2flt: use v2023.09 for bfin and sh2

Waldemar Brodkorb 2 лет назад
Родитель
Сommit
9370796098
2 измененных файлов с 43 добавлено и 2 удалено
  1. 0 2
      target/config/Config.in.elf2flt
  2. 43 0
      toolchain/elf2flt/patches/v2023.09/0002-sh2.patch

+ 0 - 2
target/config/Config.in.elf2flt

@@ -8,9 +8,7 @@ depends on ADK_TARGET_BINFMT_FLAT
 
 config ADK_TOOLCHAIN_ELF2FLT_2023_09
 	bool "2023-09"
-	depends on !ADK_TARGET_ARCH_BFIN
 	depends on !ADK_TARGET_ARCH_LM32
-	depends on !ADK_TARGET_ARCH_SH
 
 config ADK_TOOLCHAIN_ELF2FLT_OLD
 	bool "old version"

+ 43 - 0
toolchain/elf2flt/patches/v2023.09/0002-sh2.patch

@@ -0,0 +1,43 @@
+diff -Nur elf2flt-v2023.09.orig/elf2flt.c elf2flt-v2023.09/elf2flt.c
+--- elf2flt-v2023.09.orig/elf2flt.c	2023-12-22 10:44:11.000000000 +0100
++++ elf2flt-v2023.09/elf2flt.c	2023-12-23 02:26:06.323239781 +0100
+@@ -73,7 +73,7 @@
+ #define FLAT_NIOS2_R_HIADJ_LO	2
+ #define FLAT_NIOS2_R_CALL26		4
+ #include <elf/nios2.h>
+-#elif defined(TARGET_sh)
++#elif defined(TARGET_sh2) || defined(TARGET_sh2eb)
+ #include <elf/sh.h>
+ #elif defined(TARGET_sparc)
+ #include <elf/sparc.h>
+@@ -109,8 +109,10 @@
+ #define	ARCH	"sparc"
+ #elif defined(TARGET_v850)
+ #define	ARCH	"v850"
+-#elif defined(TARGET_sh)
+-#define	ARCH	"sh"
++#elif defined(TARGET_sh2)
++#define	ARCH	"sh2"
++#elif defined(TARGET_sh2eb)
++#define	ARCH	"sh2"
+ #elif defined(TARGET_h8300)
+ #define	ARCH	"h8300"
+ #elif defined(TARGET_microblaze)
+@@ -1289,7 +1291,7 @@
+ #endif /* TARGET_sparc */
+ 
+ 
+-#ifdef TARGET_sh
++#if defined(TARGET_sh2) || defined(TARGET_sh2eb)
+ 				case R_SH_DIR32:
+ 					relocation_needed = 1;
+ 					sym_vma = elf2flt_bfd_section_vma(sym_section);
+@@ -1300,7 +1302,7 @@
+ 					sym_addr += sym_vma + q->addend;
+ 					sym_addr -= q->address;
+ 					break;
+-#endif /* TARGET_sh */
++#endif /* TARGET_sh2 / TARGET_sh2eb */
+ 
+ #ifdef TARGET_e1
+ #define  htoe1l(x)              htonl(x)