Changeset 58691 in vbox for trunk

Timestamp:

Nov 15, 2015 9:52:37 PM (9 years ago)

Author:

vboxsync

Message:

iprt/asmdefs.mac: NASM defines PASS=0 or =3 to indicate that we're only-preprocessing or generating dependencies, so we don't actually need kBuild to define KBUILD_GENERATING_MAKEFILE_DEPENDENCIES for us.

File:

• trunk/include/iprt/asmdefs.mac (modified) (3 diffs)

trunk/include/iprt/asmdefs.mac

@@ -895 +895 @@
 
 ;
+; NASM sets __PASS__ to 0 in preprocess-only mode, and to 3 when only generating dependencies.
+; YASM has no such setting which is why we must rely on kBuild to tell us what we're doing.
+; For simplicity, we'll set the kBuild macro when using NASM.
+;
+%ifndef KBUILD_GENERATING_MAKEFILE_DEPENDENCIES
+ %ifdef __NASM__
+  %if __PASS__ == 0 || __PASS__ == 3
+   %define KBUILD_GENERATING_MAKEFILE_DEPENDENCIES
+  %endif
+ %endif
+%endif
+
+
+;
 ; Some simple compile time assertions.
 ;
-; Note! Requires new kBuild to work.
+; Note! Requires new kBuild to work with YASM (see above).
 ;
 
 ;;
 ; Structure size assertion macro.
-%ifdef __NASM__
- %define AssertCompileSize(a_Type, a_Size) ; Not possible?
-%else
- %define AssertCompileSize(a_Type, a_Size) AssertCompileSizeML a_Type, a_Size
-%endif
+%define AssertCompileSize(a_Type, a_Size) AssertCompileSizeML a_Type, a_Size
 %macro AssertCompileSizeML 2
  %ifndef KBUILD_GENERATING_MAKEFILE_DEPENDENCIES
@@ -919 +929 @@
 ;;
 ; Structure memember offset assertion macro.
-%ifdef __NASM__
- %define AssertCompileMemberOffset(a_Type, a_Member, a_off) ; Not possible?
-%else
- %define AssertCompileMemberOffset(a_Type, a_Member, a_off) AssertCompileMemberOffsetML a_Type, a_Member, a_off
-%endif
+%define AssertCompileMemberOffset(a_Type, a_Member, a_off) AssertCompileMemberOffsetML a_Type, a_Member, a_off
 %macro AssertCompileMemberOffsetML 3
  %ifndef KBUILD_GENERATING_MAKEFILE_DEPENDENCIES
@@ -935 +941 @@
 
 %endif
+