Commit ff27abcd authored by Ramon Nou's avatar Ramon Nou
Browse files

Merge branch 'fix_libc_syscall' into 'master' 

fix riscv syscall_no_intercept


See merge request !302
parents 01279307 ebac7a04

src/client/syscalls/util.S

+3 −2
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 */

#ifndef __riscv



.global syscall_no_intercept;

.type   syscall_no_intercept, @function
@@ -45,6 +45,7 @@ syscall_no_intercept: 
	mv	a4, a5

	mv	a5, a6

	ecall

	ret

#elif __aarch64__

	uxtw x8, w0 /* convert from linux ABI calling */

	mov  x0, x1 /* convention to syscall calling convention */
@@ -69,4 +70,4 @@ syscall_no_intercept: 
#endif



.size   syscall_no_intercept, .-syscall_no_intercept

#endif