test: Match custom linker config on subset of target name

Instead of requiring exact matches for the whole target name,
look for the longest subset of elements from the target name.
This allow use of more general patterns in the cross file which
makes them less dependent on the specific compiler in use.

Signed-off-by: Keith Packard <[email protected]>

Author: keith-packard

meson.build

@@ -948,7 +948,6 @@ if enable_multilib
   endforeach
 
   foreach target : target_list
-    message('target ' + target)
     tmp = target.split(';')
     matches_exclude = false
     foreach exclude : multilib_exclude
@@ -1035,13 +1034,21 @@ endif
 
 foreach target : ['default-target'] + targets
 
-  message('generate linker script target ' + target)
+  custom_mem_config = ''
 
   if target != 'default-target'
+    target_part = ''
+    foreach part : target.split('_')
+      if target_part == ''
+        target_part = part
+      else
+        target_part += '_' + part
+      endif
+      custom_mem_config = meson.get_cross_property('custom_mem_config_' + target_part, custom_mem_config)
+    endforeach
+
     target_head = get_variable('target_' + target)[0].split('_')[0].underscorify()
-    custom_mem_config = meson.get_cross_property('custom_mem_config_' + target_head, '')
-  else
-    custom_mem_config = ''
+    custom_mem_config = meson.get_cross_property('custom_mem_config_' + target_head, custom_mem_config)
   endif
 
   custom_mem_config = meson.get_cross_property('custom_mem_config_' + target, custom_mem_config)
@@ -1524,7 +1531,6 @@ endif
 # Set config variables for each requested 'from' encoding
 
 foreach from : newlib_iconv_from_encodings
-  message('from ' + from)
   if not available_encodings.contains(from)
     error('Requested from encoding ' + from + ' is not available. Look in newlib/libc/iconv/encoding.aliases')
   endif

scripts/cross-arm-none-eabi.txt

@@ -25,15 +25,8 @@ default_flash_size = '0x00400000'
 default_ram_addr   = '0x20000000'
 default_ram_size   = '0x00200000'
 
-custom_mem_config_thumb_v8_1_m_main_mve_hard = 'mps3_an547'
-custom_mem_config_thumb_v8_m_main_dp_hard = 'mps3_an547'
-custom_mem_config_thumb_v8_m_main_dp_softfp = 'mps3_an547'
-custom_mem_config_thumb_v8_1_m_main_pacbti_bp_nofp = 'mps3_an547'
-custom_mem_config_thumb_v8_1_m_main_pacbti_dp_bp_hard = 'mps3_an547'
-custom_mem_config_thumb_v8_1_m_main_pacbti_dp_bp_softfp = 'mps3_an547'
-custom_mem_config_thumb_v8_1_m_main_pacbti_fp_bp_hard = 'mps3_an547'
-custom_mem_config_thumb_v8_1_m_main_pacbti_fp_bp_softfp = 'mps3_an547'
-custom_mem_config_thumb_v8_1_m_main_pacbti_mve_bp_hard = 'mps3_an547'
+custom_mem_config_thumb_v8_1_m = 'mps3_an547'
+custom_mem_config_thumb_v8_m_main_dp = 'mps3_an547'
 
 separate_boot_flash_mps3_an547 = true
 default_boot_flash_addr_mps3_an547 = '0x00000000'
@@ -43,10 +36,7 @@ default_flash_size_mps3_an547 = '0x00200000'
 default_ram_addr_mps3_an547 = '0x60000000'
 default_ram_size_mps3_an547 = '0x01000000'
 
-custom_mem_config_thumb_v8_m_base_nofp = 'mps2_an505'
-custom_mem_config_thumb_v8_m_main_nofp = 'mps2_an505'
-custom_mem_config_thumb_v8_m_main_fp_hard = 'mps2_an505'
-custom_mem_config_thumb_v8_m_main_fp_softfp = 'mps2_an505'
+custom_mem_config_thumb_v8_m = 'mps2_an505'
 
 separate_boot_flash_mps2_an505 = true
 default_boot_flash_addr_mps2_an505 = '0x10000000'