Changeset 77397 in vbox for trunk/src/VBox/HostDrivers

Timestamp:

Feb 20, 2019 6:17:14 PM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

128951

Message:

More linux kernel module Makefile cleanups: MOD_DEFS -> implicit -D

Location:

trunk/src/VBox/HostDrivers

Files:

• Support/linux/Makefile (modified) (1 diff)
• VBoxNetAdp/linux/Makefile (modified) (1 diff)
• VBoxNetFlt/linux/Makefile (modified) (1 diff)
• VBoxPci/linux/Makefile (modified) (1 diff)

trunk/src/VBox/HostDrivers/Support/linux/Makefile

@@ -146 +146 @@
 endif
 MOD_DEFS = \
-        -DRT_OS_LINUX \
-        -DIN_RING0 \
-        -DIN_RT_R0 \
-        -DIN_SUP_R0 \
-        -DVBOX \
-        -DRT_WITH_VBOX \
-        -DVBOX_WITH_HARDENING \
-        -DSUPDRV_WITH_RELEASE_LOGGER \
-        -DVBOX_WITH_EFLAGS_AC_SET_IN_VBOXDRV \
-        -DIPRT_WITH_EFLAGS_AC_PRESERVING \
-        -DVBOX_WITH_64_BITS_GUESTS # <-- must be consistent with Config.kmk!
+        RT_OS_LINUX \
+        IN_RING0 \
+        IN_RT_R0 \
+        IN_SUP_R0 \
+        VBOX \
+        RT_WITH_VBOX \
+        VBOX_WITH_HARDENING \
+        SUPDRV_WITH_RELEASE_LOGGER \
+        VBOX_WITH_EFLAGS_AC_SET_IN_VBOXDRV \
+        IPRT_WITH_EFLAGS_AC_PRESERVING \
+        VBOX_WITH_64_BITS_GUESTS # <-- must be consistent with Config.kmk!
 ifndef CONFIG_VBOXDRV_FIXEDMAJOR
-MOD_DEFS += -DCONFIG_VBOXDRV_AS_MISC
+MOD_DEFS += CONFIG_VBOXDRV_AS_MISC
 endif
 ifdef VBOX_WITH_NATIVE_DTRACE
-MOD_DEFS += -DVBOX_WITH_NATIVE_DTRACE
-endif
-ifeq ($(BUILD_TARGET_ARCH),amd64)
-MOD_DEFS += -DRT_ARCH_AMD64
-else
-MOD_DEFS += -DRT_ARCH_X86
+MOD_DEFS += VBOX_WITH_NATIVE_DTRACE
 endif
 ifdef VBOX_WITH_TEXT_MODMEM_HACK
-MOD_DEFS += -DRTMEMALLOC_EXEC_HEAP -DVBOX_WITH_TEXT_MODMEM_HACK
+MOD_DEFS += RTMEMALLOC_EXEC_HEAP VBOX_WITH_TEXT_MODMEM_HACK
 endif
 MOD_CFLAGS = -include $(VBOXDRV_DIR)include/VBox/SUPDrvMangling.h \

trunk/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile

@@ -51 +51 @@
         -I$(VBOXNETADPT_DIR)r0drv/linux
 MOD_DEFS = \
-        -DRT_OS_LINUX \
-        -DIN_RING0 \
-        -DIN_RT_R0 \
-        -DIN_SUP_R0 \
-        -DVBOX \
-        -DRT_WITH_VBOX \
-        -DVBOX_WITH_HARDENING
-ifeq ($(BUILD_TARGET_ARCH),amd64)
- MOD_DEFS += -DRT_ARCH_AMD64
-else
- MOD_DEFS += -DRT_ARCH_X86
-endif
-MOD_DEFS += -DVBOX_WITH_64_BITS_GUESTS # <-- must be consistent with Config.kmk!
+        RT_OS_LINUX \
+        IN_RING0 \
+        IN_RT_R0 \
+        IN_SUP_R0 \
+        VBOX \
+        RT_WITH_VBOX \
+        VBOX_WITH_HARDENING \
+        VBOX_WITH_64_BITS_GUESTS # <-- must be consistent with Config.kmk!
 MOD_CFLAGS = -include $(KBUILD_EXTMOD)/include/VBox/SUPDrvMangling.h -fno-pie -Wno-declaration-after-statement
 

trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile

@@ -54 +54 @@
         -I$(VBOXNETFLT_DIR)r0drv/linux
 MOD_DEFS = \
-        -DRT_OS_LINUX \
-        -DIN_RING0 \
-        -DIN_RT_R0 \
-        -DIN_SUP_R0 \
-        -DVBOX \
-        -DRT_WITH_VBOX \
-        -DVBOX_WITH_HARDENING \
-        -DVBOX_WITH_64_BITS_GUESTS # <-- must be consistent with Config.kmk!
+        RT_OS_LINUX \
+        IN_RING0 \
+        IN_RT_R0 \
+        IN_SUP_R0 \
+        VBOX \
+        RT_WITH_VBOX \
+        VBOX_WITH_HARDENING \
+        VBOX_WITH_64_BITS_GUESTS # <-- must be consistent with Config.kmk!
 ifeq ($(BUILD_TARGET_ARCH),amd64)
-MOD_DEFS += -DRT_ARCH_AMD64
+MOD_DEFS += RT_ARCH_AMD64
 else
-MOD_DEFS += -DRT_ARCH_X86
+MOD_DEFS += RT_ARCH_X86
 endif
 MOD_CFLAGS = -include $(VBOXNETFLT_DIR)include/VBox/SUPDrvMangling.h -fno-pie -Wno-declaration-after-statement

trunk/src/VBox/HostDrivers/VBoxPci/linux/Makefile

@@ -55 +55 @@
         -I$(VBOXPCI_DIR)r0drv/linux
 MOD_DEFS = \
-        -DRT_OS_LINUX \
-        -DIN_RING0 \
-        -DIN_RT_R0 \
-        -DIN_SUP_R0 \
-        -DVBOX \
-        -DRT_WITH_VBOX \
-        -DVBOX_WITH_HARDENING
-ifeq ($(BUILD_TARGET_ARCH),amd64)
-MOD_DEFS += -DRT_ARCH_AMD64
-else
-MOD_DEFS += -DRT_ARCH_X86
-endif
+        RT_OS_LINUX \
+        IN_RING0 \
+        IN_RT_R0 \
+        IN_SUP_R0 \
+        VBOX \
+        RT_WITH_VBOX \
+        VBOX_WITH_HARDENING
 MOD_CFLAGS = -include $(VBOXPCI_DIR)include/VBox/SUPDrvMangling.h -fno-pie