VirtualBox

Changeset 77397 in vbox


Ignore:
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
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Additions/common/VBoxGuest/linux/Makefile

    r77393 r77397  
    130130endif
    131131
    132 MOD_DEFS = -DVBOX -DRT_OS_LINUX -DIN_RING0 -DIN_RT_R0 -DIN_GUEST \
    133            -DIN_GUEST_R0 -DIN_MODULE -DRT_WITH_VBOX -DVBGL_VBOXGUEST \
    134            -DVBOX_WITH_HGCM
     132MOD_DEFS = \
     133        VBOX \
     134        RT_OS_LINUX \
     135        IN_RING0 \
     136        IN_RT_R0 \
     137        IN_GUEST \
     138        IN_GUEST_R0 \
     139        IN_MODULE \
     140        RT_WITH_VBOX \
     141        VBGL_VBOXGUEST \
     142        VBOX_WITH_HGCM
    135143ifeq ($(BUILD_TARGET_ARCH),amd64)
    136 MOD_DEFS += -DRT_ARCH_AMD64
     144MOD_DEFS += RT_ARCH_AMD64
    137145else
    138 MOD_DEFS += -DRT_ARCH_X86
     146MOD_DEFS += RT_ARCH_X86
    139147endif
    140148ifeq ($(BUILD_TARGET_ARCH),amd64)
    141 MOD_DEFS += -DVBOX_WITH_64_BITS_GUESTS
     149MOD_DEFS += VBOX_WITH_64_BITS_GUESTS
    142150endif
    143151ifeq ($(KERN_VERSION),24)
    144 MOD_DEFS += -DEXPORT_SYMTAB
     152MOD_DEFS += EXPORT_SYMTAB
    145153endif
    146154

  • trunk/src/VBox/Additions/linux/sharedfolders/Makefile.module

    r77393 r77397  
    5353        -I$(VBOXSF_DIR)r0drv/linux
    5454MOD_DEFS = \
    55         -DRT_OS_LINUX \
    56         -DIN_RING0 \
    57         -DIN_RT_R0 \
    58         -DIN_SUP_R0 \
    59         -DVBOX \
    60         -DVBOX_WITH_HGCM \
    61         -DIN_MODULE \
    62         -DIN_GUEST \
    63         -DIN_GUEST_R0 \
    64         -DRT_NO_EXPORT_SYMBOL
     55        RT_OS_LINUX \
     56        IN_RING0 \
     57        IN_RT_R0 \
     58        IN_SUP_R0 \
     59        VBOX \
     60        VBOX_WITH_HGCM \
     61        IN_MODULE \
     62        IN_GUEST \
     63        IN_GUEST_R0 \
     64        RT_NO_EXPORT_SYMBOL
    6565ifeq ($(BUILD_TARGET_ARCH),amd64)
    66 MOD_DEFS += -DRT_ARCH_AMD64 -DVBOX_WITH_64_BITS_GUESTS
     66MOD_DEFS += RT_ARCH_AMD64 VBOX_WITH_64_BITS_GUESTS
    6767else
    68 MOD_DEFS += -DRT_ARCH_X86
     68MOD_DEFS += RT_ARCH_X86
    6969endif
    7070ifeq ($(KERN_VERSION),24)

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

    r77394 r77397  
    146146endif
    147147MOD_DEFS = \
    148         -DRT_OS_LINUX \
    149         -DIN_RING0 \
    150         -DIN_RT_R0 \
    151         -DIN_SUP_R0 \
    152         -DVBOX \
    153         -DRT_WITH_VBOX \
    154         -DVBOX_WITH_HARDENING \
    155         -DSUPDRV_WITH_RELEASE_LOGGER \
    156         -DVBOX_WITH_EFLAGS_AC_SET_IN_VBOXDRV \
    157         -DIPRT_WITH_EFLAGS_AC_PRESERVING \
    158         -DVBOX_WITH_64_BITS_GUESTS # <-- must be consistent with Config.kmk!
     148        RT_OS_LINUX \
     149        IN_RING0 \
     150        IN_RT_R0 \
     151        IN_SUP_R0 \
     152        VBOX \
     153        RT_WITH_VBOX \
     154        VBOX_WITH_HARDENING \
     155        SUPDRV_WITH_RELEASE_LOGGER \
     156        VBOX_WITH_EFLAGS_AC_SET_IN_VBOXDRV \
     157        IPRT_WITH_EFLAGS_AC_PRESERVING \
     158        VBOX_WITH_64_BITS_GUESTS # <-- must be consistent with Config.kmk!
    159159ifndef CONFIG_VBOXDRV_FIXEDMAJOR
    160 MOD_DEFS += -DCONFIG_VBOXDRV_AS_MISC
     160MOD_DEFS += CONFIG_VBOXDRV_AS_MISC
    161161endif
    162162ifdef VBOX_WITH_NATIVE_DTRACE
    163 MOD_DEFS += -DVBOX_WITH_NATIVE_DTRACE
    164 endif
    165 ifeq ($(BUILD_TARGET_ARCH),amd64)
    166 MOD_DEFS += -DRT_ARCH_AMD64
    167 else
    168 MOD_DEFS += -DRT_ARCH_X86
     163MOD_DEFS += VBOX_WITH_NATIVE_DTRACE
    169164endif
    170165ifdef VBOX_WITH_TEXT_MODMEM_HACK
    171 MOD_DEFS += -DRTMEMALLOC_EXEC_HEAP -DVBOX_WITH_TEXT_MODMEM_HACK
     166MOD_DEFS += RTMEMALLOC_EXEC_HEAP VBOX_WITH_TEXT_MODMEM_HACK
    172167endif
    173168MOD_CFLAGS = -include $(VBOXDRV_DIR)include/VBox/SUPDrvMangling.h \

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

    r77394 r77397  
    5151        -I$(VBOXNETADPT_DIR)r0drv/linux
    5252MOD_DEFS = \
    53         -DRT_OS_LINUX \
    54         -DIN_RING0 \
    55         -DIN_RT_R0 \
    56         -DIN_SUP_R0 \
    57         -DVBOX \
    58         -DRT_WITH_VBOX \
    59         -DVBOX_WITH_HARDENING
    60 ifeq ($(BUILD_TARGET_ARCH),amd64)
    61  MOD_DEFS += -DRT_ARCH_AMD64
    62 else
    63  MOD_DEFS += -DRT_ARCH_X86
    64 endif
    65 MOD_DEFS += -DVBOX_WITH_64_BITS_GUESTS # <-- must be consistent with Config.kmk!
     53        RT_OS_LINUX \
     54        IN_RING0 \
     55        IN_RT_R0 \
     56        IN_SUP_R0 \
     57        VBOX \
     58        RT_WITH_VBOX \
     59        VBOX_WITH_HARDENING \
     60        VBOX_WITH_64_BITS_GUESTS # <-- must be consistent with Config.kmk!
    6661MOD_CFLAGS = -include $(KBUILD_EXTMOD)/include/VBox/SUPDrvMangling.h -fno-pie -Wno-declaration-after-statement
    6762

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

    r77394 r77397  
    5454        -I$(VBOXNETFLT_DIR)r0drv/linux
    5555MOD_DEFS = \
    56         -DRT_OS_LINUX \
    57         -DIN_RING0 \
    58         -DIN_RT_R0 \
    59         -DIN_SUP_R0 \
    60         -DVBOX \
    61         -DRT_WITH_VBOX \
    62         -DVBOX_WITH_HARDENING \
    63         -DVBOX_WITH_64_BITS_GUESTS # <-- must be consistent with Config.kmk!
     56        RT_OS_LINUX \
     57        IN_RING0 \
     58        IN_RT_R0 \
     59        IN_SUP_R0 \
     60        VBOX \
     61        RT_WITH_VBOX \
     62        VBOX_WITH_HARDENING \
     63        VBOX_WITH_64_BITS_GUESTS # <-- must be consistent with Config.kmk!
    6464ifeq ($(BUILD_TARGET_ARCH),amd64)
    65 MOD_DEFS += -DRT_ARCH_AMD64
     65MOD_DEFS += RT_ARCH_AMD64
    6666else
    67 MOD_DEFS += -DRT_ARCH_X86
     67MOD_DEFS += RT_ARCH_X86
    6868endif
    6969MOD_CFLAGS = -include $(VBOXNETFLT_DIR)include/VBox/SUPDrvMangling.h -fno-pie -Wno-declaration-after-statement

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

    r77394 r77397  
    5555        -I$(VBOXPCI_DIR)r0drv/linux
    5656MOD_DEFS = \
    57         -DRT_OS_LINUX \
    58         -DIN_RING0 \
    59         -DIN_RT_R0 \
    60         -DIN_SUP_R0 \
    61         -DVBOX \
    62         -DRT_WITH_VBOX \
    63         -DVBOX_WITH_HARDENING
    64 ifeq ($(BUILD_TARGET_ARCH),amd64)
    65 MOD_DEFS += -DRT_ARCH_AMD64
    66 else
    67 MOD_DEFS += -DRT_ARCH_X86
    68 endif
     57        RT_OS_LINUX \
     58        IN_RING0 \
     59        IN_RT_R0 \
     60        IN_SUP_R0 \
     61        VBOX \
     62        RT_WITH_VBOX \
     63        VBOX_WITH_HARDENING
    6964MOD_CFLAGS = -include $(VBOXPCI_DIR)include/VBox/SUPDrvMangling.h -fno-pie
    7065

  • trunk/src/VBox/Installer/linux/Makefile-footer.gmk

    r77390 r77397  
    3636VBOX_INCL := $(addprefix -I,$(KERN_INCL) $(EXTRA_INCL)) $(MOD_INCL)
    3737
    38 KFLAGS   := -D__KERNEL__ -DMODULE -DRT_WITHOUT_PRAGMA_ONCE $(MOD_DEFS)
     38KFLAGS := -D__KERNEL__ -DMODULE -DRT_WITHOUT_PRAGMA_ONCE $(addprefix -D,$(MOD_DEFS))
     39ifeq ($(BUILD_TARGET_ARCH),amd64)
     40KFLAGS += -DRT_ARCH_AMD64
     41else
     42KFLAGS += -DRT_ARCH_X86
     43endif
     44
    3945ifeq ($(BUILD_TYPE),debug)
    4046# The -Wno-array-bounds is because of a bug in gcc 4.something, see

  • trunk/src/VBox/Installer/linux/Makefile-header.gmk

    r77390 r77397  
    2727# follows:
    2828#
    29 # # Linux kbuild sets this to our source directory if we are called from
    30 # # there
     29# # Linux kbuild sets this to our source directory if we are called from there
    3130# obj ?= $(CURDIR)
    3231# include $(obj)/Makefile-header.gmk
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette