Skip to content

Commit 77eca3d

Browse files
Merge branch 'arc-dev' into arc-staging
2 parents 803b1ff + cf10ae4 commit 77eca3d

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

dejagnu/baseboards/arc-sim-nsimdrv.exp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,7 @@ if { [check_target_arc64] } {
202202
# present and, presuambly, that nSIM property disable optional feature.
203203
set nsim_gcc_mapping {
204204
"__ARC_ATOMIC__" 1 nsim_isa_atomic_option=1
205+
"__ARC64_ATOMIC__" 1 nsim_isa_atomic_option=1
205206
"__ARC_BARREL_SHIFTER__" 0 nsim_isa_shift_option=0
206207
"__ARC_CODE_DENSITY__" 1 nsim_isa_code_density_option=2
207208
"__ARC_DIVREM__" 1 nsim_isa_div_rem_option=2

dejagnu/ftp-extra.exp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ proc ftp_open {host} {
5151
set spawn_id -1
5252
set count 3
5353
while {$spawn_id < 0 && $count >= 0} {
54-
spawn ftp -n $remotehost $remoteport
54+
spawn ftp -A -n $remotehost $remoteport
5555
expect {
5656
-i $spawn_id -re ".*220.*$prompt" { }
5757
-i $spawn_id -re ".*Connection refused.*$prompt" {

0 commit comments

Comments
 (0)