Merge branch 'master' into alexc/riscv-llvm-qemu

alexsifivetw · web-flow · commit 803fc9c4a259 · 2023-06-01T17:20:17.000+08:00
Signed-off-by: Alex Chiang &lt;107899296+alexsifivetw@users.noreply.github.com&gt;
diff --git a/configure b/configure
@@ -3786,9 +3786,6 @@ else
 fi
 
 	}
-
-=======
->>>>>>> 0ae36fc (Update --with-isa-spec default option.)
 {
 
 # Check whether --with-dejagnu-src was given.
@@ -3808,9 +3805,6 @@ else
 fi
 
 	}
-
-=======
->>>>>>> 0ae36fc (Update --with-isa-spec default option.)
 {
 
 # Check whether --with-dejagnu-src was given.

Original file line number	Diff line number	Diff line change
`@@ -3786,9 +3786,6 @@ else`
`3786`	`3786`	`fi`
`3787`	`3787`
`3788`	`3788`	`}`
`3789`		`-`
`3790`		`-=======`
`3791`		`->>>>>>> 0ae36fc (Update --with-isa-spec default option.)`
`3792`	`3789`	`{`
`3793`	`3790`
`3794`	`3791`	`# Check whether --with-dejagnu-src was given.`
`@@ -3808,9 +3805,6 @@ else`
`3808`	`3805`	`fi`
`3809`	`3806`
`3810`	`3807`	`}`
`3811`		`-`
`3812`		`-=======`
`3813`		`->>>>>>> 0ae36fc (Update --with-isa-spec default option.)`
`3814`	`3808`	`{`
`3815`	`3809`
`3816`	`3810`	`# Check whether --with-dejagnu-src was given.`