Index: /trunk/src/VBox/Runtime/common/asm/ASMGetFlags.asm
===================================================================
--- /trunk/src/VBox/Runtime/common/asm/ASMGetFlags.asm	(revision 78425)
+++ /trunk/src/VBox/Runtime/common/asm/ASMGetFlags.asm	(revision 78425)
@@ -0,0 +1,43 @@
+; $Id$
+;; @file
+; IPRT - ASMGetFlags().
+;
+
+;
+; Copyright (C) 2006-2019 Oracle Corporation
+;
+; This file is part of VirtualBox Open Source Edition (OSE), as
+; available from http://www.virtualbox.org. This file is free software;
+; you can redistribute it and/or modify it under the terms of the GNU
+; General Public License (GPL) as published by the Free Software
+; Foundation, in version 2 as it comes in the "COPYING" file of the
+; VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+; hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+;
+; The contents of this file may alternatively be used under the terms
+; of the Common Development and Distribution License Version 1.0
+; (CDDL) only, as it comes in the "COPYING.CDDL" file of the
+; VirtualBox OSE distribution, in which case the provisions of the
+; CDDL are applicable instead of those of the GPL.
+;
+; You may elect to license modified versions of this file under the
+; terms and conditions of either the GPL or the CDDL or both.
+;
+
+;*******************************************************************************
+;* Header Files                                                                *
+;*******************************************************************************
+%include "iprt/asmdefs.mac"
+
+BEGINCODE
+
+BEGINPROC_EXPORTED ASMGetFlags
+%if    ARCH_BITS == 32
+        pushfd
+%else
+        pushf
+%endif
+        pop     xAX
+        ret
+ENDPROC ASMGetFlags
+
Index: /trunk/src/VBox/Runtime/common/asm/ASMSetFlags.asm
===================================================================
--- /trunk/src/VBox/Runtime/common/asm/ASMSetFlags.asm	(revision 78425)
+++ /trunk/src/VBox/Runtime/common/asm/ASMSetFlags.asm	(revision 78425)
@@ -0,0 +1,59 @@
+; $Id$
+;; @file
+; IPRT - ASMSetFlags().
+;
+
+;
+; Copyright (C) 2006-2019 Oracle Corporation
+;
+; This file is part of VirtualBox Open Source Edition (OSE), as
+; available from http://www.virtualbox.org. This file is free software;
+; you can redistribute it and/or modify it under the terms of the GNU
+; General Public License (GPL) as published by the Free Software
+; Foundation, in version 2 as it comes in the "COPYING" file of the
+; VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+; hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+;
+; The contents of this file may alternatively be used under the terms
+; of the Common Development and Distribution License Version 1.0
+; (CDDL) only, as it comes in the "COPYING.CDDL" file of the
+; VirtualBox OSE distribution, in which case the provisions of the
+; CDDL are applicable instead of those of the GPL.
+;
+; You may elect to license modified versions of this file under the
+; terms and conditions of either the GPL or the CDDL or both.
+;
+
+
+;*******************************************************************************
+;* Header Files                                                                *
+;*******************************************************************************
+%include "iprt/asmdefs.mac"
+
+BEGINCODE
+
+;;
+; @param rcx  eflags
+BEGINPROC_EXPORTED ASMSetFlags
+%if    ARCH_BITS == 64
+ %ifdef ASM_CALL64_GCC
+        push    rdi
+ %else
+        push    rcx
+ %endif
+        popfq
+%elif  ARCH_BITS == 32
+        push    dword [esp + 4]
+        popfd
+%elif  ARCH_BITS == 16
+        push    bp
+        mov     bp, sp
+        push    word [bp + 2 + 2]
+        popf
+        leave
+%else
+ %error ARCH_BITS
+%endif
+        ret
+ENDPROC ASMSetFlags
+
Index: unk/src/VBox/Runtime/win/amd64/ASMGetFlags.asm
===================================================================
--- /trunk/src/VBox/Runtime/win/amd64/ASMGetFlags.asm	(revision 78424)
+++ 	(revision )
@@ -1,38 +1,0 @@
-;; @file
-; IPRT - ASMGetFlags().
-;
-
-;
-; Copyright (C) 2006-2019 Oracle Corporation
-;
-; This file is part of VirtualBox Open Source Edition (OSE), as
-; available from http://www.virtualbox.org. This file is free software;
-; you can redistribute it and/or modify it under the terms of the GNU
-; General Public License (GPL) as published by the Free Software
-; Foundation, in version 2 as it comes in the "COPYING" file of the
-; VirtualBox OSE distribution. VirtualBox OSE is distributed in the
-; hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
-;
-; The contents of this file may alternatively be used under the terms
-; of the Common Development and Distribution License Version 1.0
-; (CDDL) only, as it comes in the "COPYING.CDDL" file of the
-; VirtualBox OSE distribution, in which case the provisions of the
-; CDDL are applicable instead of those of the GPL.
-;
-; You may elect to license modified versions of this file under the
-; terms and conditions of either the GPL or the CDDL or both.
-;
-
-;*******************************************************************************
-;* Header Files                                                                *
-;*******************************************************************************
-%include "iprt/asmdefs.mac"
-
-BEGINCODE
-
-BEGINPROC_EXPORTED ASMGetFlags
-        pushf
-        pop     rax
-        ret
-ENDPROC ASMGetFlags
-
Index: unk/src/VBox/Runtime/win/amd64/ASMSetFlags.asm
===================================================================
--- /trunk/src/VBox/Runtime/win/amd64/ASMSetFlags.asm	(revision 78424)
+++ 	(revision )
@@ -1,41 +1,0 @@
-;; @file
-; IPRT - ASMSetFlags().
-;
-
-;
-; Copyright (C) 2006-2019 Oracle Corporation
-;
-; This file is part of VirtualBox Open Source Edition (OSE), as
-; available from http://www.virtualbox.org. This file is free software;
-; you can redistribute it and/or modify it under the terms of the GNU
-; General Public License (GPL) as published by the Free Software
-; Foundation, in version 2 as it comes in the "COPYING" file of the
-; VirtualBox OSE distribution. VirtualBox OSE is distributed in the
-; hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
-;
-; The contents of this file may alternatively be used under the terms
-; of the Common Development and Distribution License Version 1.0
-; (CDDL) only, as it comes in the "COPYING.CDDL" file of the
-; VirtualBox OSE distribution, in which case the provisions of the
-; CDDL are applicable instead of those of the GPL.
-;
-; You may elect to license modified versions of this file under the
-; terms and conditions of either the GPL or the CDDL or both.
-;
-
-
-;*******************************************************************************
-;* Header Files                                                                *
-;*******************************************************************************
-%include "iprt/asmdefs.mac"
-
-BEGINCODE
-
-;;
-; @param rcx  eflags
-BEGINPROC_EXPORTED ASMSetFlags
-        push    rcx
-        popfq
-        ret
-ENDPROC ASMSetFlags
-
Index: /trunk/src/VBox/ValidationKit/bootsectors/bs3kit/Makefile.kmk
===================================================================
--- /trunk/src/VBox/ValidationKit/bootsectors/bs3kit/Makefile.kmk	(revision 78424)
+++ /trunk/src/VBox/ValidationKit/bootsectors/bs3kit/Makefile.kmk	(revision 78425)
@@ -235,4 +235,6 @@
        ../../../Runtime/common/asm/ASMGetXcr0.asm \
        ../../../Runtime/common/asm/ASMSetXcr0.asm \
+       ../../../Runtime/common/asm/ASMSetFlags.asm \
+       ../../../Runtime/common/asm/ASMGetFlags.asm \
 
 # The 16-bit BS3Kit library.
