From 5d97fd75c756b6f9698adefb1f7521c0a4017da6 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Fri, 9 Sep 2016 17:25:56 -0600 Subject: [PATCH] Fix crash in libstd --- arch/x86_64/src/start.rs | 2 +- libstd | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86_64/src/start.rs b/arch/x86_64/src/start.rs index 5b0823f..ab65d17 100644 --- a/arch/x86_64/src/start.rs +++ b/arch/x86_64/src/start.rs @@ -212,7 +212,7 @@ pub unsafe fn usermode(ip: usize, sp: usize) -> ! { push rax # Push stack segment push rbx # Push stack pointer - mov rax, 3 << 12 | 1 << 9 # Set IOPL and interrupt enable flag + mov rax, 0 # 3 << 12 | 1 << 9 # Set IOPL and interrupt enable flag push rax # Push rflags mov rax, 0x23 push rax # Push code segment diff --git a/libstd b/libstd index c6d6f70..7b20e73 160000 --- a/libstd +++ b/libstd @@ -1 +1 @@ -Subproject commit c6d6f70869b435a6c0940d9eb8b0dd6f2ec03663 +Subproject commit 7b20e739903a4877a10b64b875a3fd7a06cdcd16