2025-11-10 Jan Dubiec <[email protected]> baseboards/ * h8300-sim.exp: Adjust toolchain name. * h8300.exp: Adjust linker script names and their location.
Signed-off-by: Jan Dubiec <[email protected]> --- baseboards/h8300-sim.exp | 4 ++-- baseboards/h8300.exp | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/baseboards/h8300-sim.exp b/baseboards/h8300-sim.exp index 3f2f8ba..41b019b 100644 --- a/baseboards/h8300-sim.exp +++ b/baseboards/h8300-sim.exp @@ -16,7 +16,7 @@ # along with DejaGnu. If not, see <http://www.gnu.org/licenses/>. # This is a list of toolchains that are supported on this board. -set_board_info target_install {h8300-hms} +set_board_info target_install {h8300-elf} # Load the tool-specific configuration for this board, as well as the # generic configuration. This will define any routines needed by the @@ -55,7 +55,7 @@ set_board_info gcc,stack_size 4096 set_board_info gcc,text_size 60000 # There's no long long support on this target -set_board_info no_long_long 1 +set_board_info no_long_long 0 # sizeof int != sizeof long. set_board_info gdb,short_int 1 diff --git a/baseboards/h8300.exp b/baseboards/h8300.exp index bcca866..f5e2c5a 100644 --- a/baseboards/h8300.exp +++ b/baseboards/h8300.exp @@ -18,7 +18,7 @@ # Load the tool-specific configuration for this board, as well as the # generic configuration. This will define any routines needed by the # tool to communicate with the board. -load_generic_config "h8300" +load_generic_config "gdb-comm" # Don't use anything by default. process_multilib_options "" @@ -52,14 +52,14 @@ set_board_info gcc,stack_size 4096 set_board_info unreliable 1 # There's no long long support on this target -set_board_info no_long_long 1 +set_board_info no_long_long 0 # sizeof int != sizeof long. set_board_info gdb,short_int 1 # Pick the right linker script if -mh/-ms is specified. -set linker_script "h8300.ld" +set linker_script "h8300helf.x" foreach x $board_variant_list { regsub -all "^\[ \t\]*" "$x" "" x @@ -67,10 +67,10 @@ foreach x $board_variant_list { switch -- $x { "h" - - "-mh" { set linker_script "h8300h.ld" } + "-mh" { set linker_script "h8300helf.x" } "s" - - "-ms" { set linker_script "h8300s.ld" } + "-ms" { set linker_script "h8300self.x" } } } @@ -79,6 +79,6 @@ foreach x $board_variant_list { # This one's dependent on the multilib options in use, sadly. And we # *need* a linker script. Really. Otherwise the code gets linked at # the wrong address and it won't run on the board. -set_board_info ldscript "-T${prefix_dir}/h8300-hms/${linker_script}" +set_board_info ldscript "-T${prefix_dir}/h8300-elf/lib/ldscripts/${linker_script}" unset linker_script -- 2.50.1.windows.1
