Changeset 98155 in vbox
- Timestamp:
- Jan 20, 2023 11:07:37 AM (2 years ago)
- svn:sync-xref-src-repo-rev:
- 155328
- Location:
- trunk
- Files:
-
- 8 edited
-
Config.kmk (modified) (4 diffs)
-
src/VBox/Frontends/VBoxHeadless/Makefile.kmk (modified) (1 diff)
-
src/VBox/Frontends/VBoxSDL/Makefile.kmk (modified) (1 diff)
-
src/VBox/Frontends/VirtualBox/Makefile.kmk (modified) (1 diff)
-
src/VBox/NetworkServices/Dhcpd/Makefile.kmk (modified) (1 diff)
-
src/VBox/NetworkServices/NAT/Makefile.kmk (modified) (1 diff)
-
src/VBox/VMM/testcase/Makefile.kmk (modified) (6 diffs)
-
src/VBox/VMM/tools/Makefile.kmk (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Config.kmk
r98154 r98155 6748 6748 # These shall have no extra runpaths, esp. not origin ones. 6749 6749 # 6750 TEMPLATE_VB OXR3HARDENEDEXE= Hardened VBox Ring-3 EXE6751 TEMPLATE_VB OXR3HARDENEDEXE_EXTENDS= VBoxR3Exe6752 TEMPLATE_VB OXR3HARDENEDEXE_DEBUG_INST.win = $(INST_DEBUG)hardened-exes/6753 TEMPLATE_VB OXR3HARDENEDEXE_DEFS = $(TEMPLATE_VBoxR3Exe_DEFS) RTMEM_NO_WRAP_TO_EF_APIS6750 TEMPLATE_VBoxR3HardenedExe := Hardened VBox Ring-3 EXE 6751 TEMPLATE_VBoxR3HardenedExe_EXTENDS := VBoxR3Exe 6752 TEMPLATE_VBoxR3HardenedExe_DEBUG_INST.win = $(INST_DEBUG)hardened-exes/ 6753 TEMPLATE_VBoxR3HardenedExe_DEFS = $(TEMPLATE_VBoxR3Exe_DEFS) RTMEM_NO_WRAP_TO_EF_APIS 6754 6754 ifdef VBOX_WITH_HARDENING 6755 TEMPLATE_VB OXR3HARDENEDEXE_LIBS = $(VBOX_LIB_SUPHARDENED) $(TEMPLATE_VBoxR3Exe_LIBS)6755 TEMPLATE_VBoxR3HardenedExe_LIBS = $(VBOX_LIB_SUPHARDENED) $(TEMPLATE_VBoxR3Exe_LIBS) 6756 6756 else 6757 TEMPLATE_VB OXR3HARDENEDEXE_LIBS = $(TEMPLATE_VBoxR3Exe_LIBS)6758 endif 6759 TEMPLATE_VB OXR3HARDENEDEXE_LDFLAGS.darwin = $(TEMPLATE_VBoxR3Exe_LDFLAGS.darwin) -framework IOKit6757 TEMPLATE_VBoxR3HardenedExe_LIBS = $(TEMPLATE_VBoxR3Exe_LIBS) 6758 endif 6759 TEMPLATE_VBoxR3HardenedExe_LDFLAGS.darwin = $(TEMPLATE_VBoxR3Exe_LDFLAGS.darwin) -framework IOKit 6760 6760 ifeq ($(KBUILD_TARGET),linux) 6761 6761 # not necessary except USE_LIB_PCAP is defined in SUPR3HardenedMain.cpp 6762 # TEMPLATE_VB OXR3HARDENEDEXE_LIBS += cap6762 # TEMPLATE_VBoxR3HardenedExe_LIBS += cap 6763 6763 endif 6764 6764 ifeq ($(KBUILD_TARGET),win) # No CRT! 6765 TEMPLATE_VB OXR3HARDENEDEXE_SDKS = VBOX_NTDLL $(TEMPLATE_VBoxR3Exe_SDKS)6766 TEMPLATE_VB OXR3HARDENEDEXE_SDKS.x86 = VBOX_WIN_INT646765 TEMPLATE_VBoxR3HardenedExe_SDKS = VBOX_NTDLL $(TEMPLATE_VBoxR3Exe_SDKS) 6766 TEMPLATE_VBoxR3HardenedExe_SDKS.x86 = VBOX_WIN_INT64 6767 6767 ifneq ($(VBOX_VCC_LD_GUARD_CF),) 6768 TEMPLATE_VB OXR3HARDENEDEXE_CXXFLAGS = $(filter-out -RTC% -GZ $(VBOX_VCC_SANITIZER_FLAGS),$(TEMPLATE_VBoxR3Exe_CXXFLAGS))6769 TEMPLATE_VB OXR3HARDENEDEXE_CXXFLAGS.debug = $(filter-out -RTC% -GZ $(VBOX_VCC_SANITIZER_FLAGS),$(TEMPLATE_VBoxR3Exe_CXXFLAGS.debug)) #-O2 -Oy-6770 TEMPLATE_VB OXR3HARDENEDEXE_PCHFLAGS = $(filter-out -RTC% -GZ $(VBOX_VCC_SANITIZER_FLAGS),$(TEMPLATE_VBoxR3Exe_PCHFLAGS))6771 TEMPLATE_VB OXR3HARDENEDEXE_PCHFLAGS.debug = $(filter-out -RTC% -GZ $(VBOX_VCC_SANITIZER_FLAGS),$(TEMPLATE_VBoxR3Exe_PCHFLAGS.debug)) #-O2 -Oy-6772 TEMPLATE_VB OXR3HARDENEDEXE_CFLAGS = $(filter-out -RTC% -GZ $(VBOX_VCC_SANITIZER_FLAGS),$(TEMPLATE_VBoxR3Exe_CFLAGS))6773 TEMPLATE_VB OXR3HARDENEDEXE_CFLAGS.debug = $(filter-out -RTC% -GZ $(VBOX_VCC_SANITIZER_FLAGS),$(TEMPLATE_VBoxR3Exe_CFLAGS.debug)) -O2 -Oy-6768 TEMPLATE_VBoxR3HardenedExe_CXXFLAGS = $(filter-out -RTC% -GZ $(VBOX_VCC_SANITIZER_FLAGS),$(TEMPLATE_VBoxR3Exe_CXXFLAGS)) 6769 TEMPLATE_VBoxR3HardenedExe_CXXFLAGS.debug = $(filter-out -RTC% -GZ $(VBOX_VCC_SANITIZER_FLAGS),$(TEMPLATE_VBoxR3Exe_CXXFLAGS.debug)) #-O2 -Oy- 6770 TEMPLATE_VBoxR3HardenedExe_PCHFLAGS = $(filter-out -RTC% -GZ $(VBOX_VCC_SANITIZER_FLAGS),$(TEMPLATE_VBoxR3Exe_PCHFLAGS)) 6771 TEMPLATE_VBoxR3HardenedExe_PCHFLAGS.debug = $(filter-out -RTC% -GZ $(VBOX_VCC_SANITIZER_FLAGS),$(TEMPLATE_VBoxR3Exe_PCHFLAGS.debug)) #-O2 -Oy- 6772 TEMPLATE_VBoxR3HardenedExe_CFLAGS = $(filter-out -RTC% -GZ $(VBOX_VCC_SANITIZER_FLAGS),$(TEMPLATE_VBoxR3Exe_CFLAGS)) 6773 TEMPLATE_VBoxR3HardenedExe_CFLAGS.debug = $(filter-out -RTC% -GZ $(VBOX_VCC_SANITIZER_FLAGS),$(TEMPLATE_VBoxR3Exe_CFLAGS.debug)) -O2 -Oy- 6774 6774 else 6775 TEMPLATE_VB OXR3HARDENEDEXE_CXXFLAGS = $(filter-out -RTC% -GZ $(VBOX_VCC_SANITIZER_FLAGS) -GS,$(TEMPLATE_VBoxR3Exe_CXXFLAGS)) -GS-6776 TEMPLATE_VB OXR3HARDENEDEXE_CXXFLAGS.debug = $(filter-out -RTC% -GZ $(VBOX_VCC_SANITIZER_FLAGS) -GS,$(TEMPLATE_VBoxR3Exe_CXXFLAGS.debug)) -GS- #-O2 -Oy-6777 TEMPLATE_VB OXR3HARDENEDEXE_PCHFLAGS = $(filter-out -RTC% -GZ $(VBOX_VCC_SANITIZER_FLAGS) -GS,$(TEMPLATE_VBoxR3Exe_PCHFLAGS)) -GS-6778 TEMPLATE_VB OXR3HARDENEDEXE_PCHFLAGS.debug = $(filter-out -RTC% -GZ $(VBOX_VCC_SANITIZER_FLAGS) -GS,$(TEMPLATE_VBoxR3Exe_PCHFLAGS.debug)) -GS- #-O2 -Oy-6779 TEMPLATE_VB OXR3HARDENEDEXE_CFLAGS = $(filter-out -RTC% -GZ $(VBOX_VCC_SANITIZER_FLAGS) -GS,$(TEMPLATE_VBoxR3Exe_CFLAGS)) -GS-6780 TEMPLATE_VB OXR3HARDENEDEXE_CFLAGS.debug = $(filter-out -RTC% -GZ $(VBOX_VCC_SANITIZER_FLAGS) -GS,$(TEMPLATE_VBoxR3Exe_CFLAGS.debug)) -GS- -O2 -Oy-6781 endif 6782 TEMPLATE_VB OXR3HARDENEDEXE_LDFLAGS = $(filter-out $(VBOX_VCC_SANITIZER_LDFLAGS), $(TEMPLATE_VBoxR3Exe_LDFLAGS)) \6775 TEMPLATE_VBoxR3HardenedExe_CXXFLAGS = $(filter-out -RTC% -GZ $(VBOX_VCC_SANITIZER_FLAGS) -GS,$(TEMPLATE_VBoxR3Exe_CXXFLAGS)) -GS- 6776 TEMPLATE_VBoxR3HardenedExe_CXXFLAGS.debug = $(filter-out -RTC% -GZ $(VBOX_VCC_SANITIZER_FLAGS) -GS,$(TEMPLATE_VBoxR3Exe_CXXFLAGS.debug)) -GS- #-O2 -Oy- 6777 TEMPLATE_VBoxR3HardenedExe_PCHFLAGS = $(filter-out -RTC% -GZ $(VBOX_VCC_SANITIZER_FLAGS) -GS,$(TEMPLATE_VBoxR3Exe_PCHFLAGS)) -GS- 6778 TEMPLATE_VBoxR3HardenedExe_PCHFLAGS.debug = $(filter-out -RTC% -GZ $(VBOX_VCC_SANITIZER_FLAGS) -GS,$(TEMPLATE_VBoxR3Exe_PCHFLAGS.debug)) -GS- #-O2 -Oy- 6779 TEMPLATE_VBoxR3HardenedExe_CFLAGS = $(filter-out -RTC% -GZ $(VBOX_VCC_SANITIZER_FLAGS) -GS,$(TEMPLATE_VBoxR3Exe_CFLAGS)) -GS- 6780 TEMPLATE_VBoxR3HardenedExe_CFLAGS.debug = $(filter-out -RTC% -GZ $(VBOX_VCC_SANITIZER_FLAGS) -GS,$(TEMPLATE_VBoxR3Exe_CFLAGS.debug)) -GS- -O2 -Oy- 6781 endif 6782 TEMPLATE_VBoxR3HardenedExe_LDFLAGS = $(filter-out $(VBOX_VCC_SANITIZER_LDFLAGS), $(TEMPLATE_VBoxR3Exe_LDFLAGS)) \ 6783 6783 /DISALLOWLIB:msvcrt$(VBOX_VCC_CRT_TYPE).lib \ 6784 6784 /DISALLOWLIB:msvcprt$(VBOX_VCC_CRT_TYPE).lib \ 6785 6785 /DISALLOWLIB:vcruntime$(VBOX_VCC_CRT_TYPE).lib \ 6786 6786 /DISALLOWLIB:ucrt$(VBOX_VCC_CRT_TYPE).lib 6787 TEMPLATE_VB OXR3HARDENEDEXE_LDFLAGS.win.x86 = $(TEMPLATE_VBoxR3Exe_LDFLAGS.win.x86) /entry:suplibHardenedWindowsMain6788 TEMPLATE_VB OXR3HARDENEDEXE_LDFLAGS.win.amd64 = $(TEMPLATE_VBoxR3Exe_LDFLAGS.win.amd64) /entry:suplibHardenedWindowsMain6789 TEMPLATE_VB OXR3HARDENEDEXE_LIBS.x86 = $(NOT_SUCH_VARIABLE)6790 TEMPLATE_VB OXR3HARDENEDEXE_LIBS.amd64 = $(NOT_SUCH_VARIABLE)6791 TEMPLATE_VB OXR3HARDENEDEXE_USES.win = $(TEMPLATE_VBoxR3Exe_USES.win) vboximportchecker6792 TEMPLATE_VB OXR3HARDENEDEXE_VBOX_IMPORT_CHECKER.win = noimports6787 TEMPLATE_VBoxR3HardenedExe_LDFLAGS.win.x86 = $(TEMPLATE_VBoxR3Exe_LDFLAGS.win.x86) /entry:suplibHardenedWindowsMain 6788 TEMPLATE_VBoxR3HardenedExe_LDFLAGS.win.amd64 = $(TEMPLATE_VBoxR3Exe_LDFLAGS.win.amd64) /entry:suplibHardenedWindowsMain 6789 TEMPLATE_VBoxR3HardenedExe_LIBS.x86 = $(NOT_SUCH_VARIABLE) 6790 TEMPLATE_VBoxR3HardenedExe_LIBS.amd64 = $(NOT_SUCH_VARIABLE) 6791 TEMPLATE_VBoxR3HardenedExe_USES.win = $(TEMPLATE_VBoxR3Exe_USES.win) vboximportchecker 6792 TEMPLATE_VBoxR3HardenedExe_VBOX_IMPORT_CHECKER.win = noimports 6793 6793 else ifn1of ($(KBUILD_TARGET), os2) 6794 6794 ifneq ($(KBUILD_TYPE),asan) # Keep RPATH in asan builds so we can find libasan.so.X and libubsan.so.Y. 6795 TEMPLATE_VB OXR3HARDENEDEXE_LDFLAGS = $(filter-out '$(VBOX_GCC_RPATH_OPT)%,$(TEMPLATE_VBoxR3Exe_LDFLAGS))6796 TEMPLATE_VB OXR3HARDENEDEXE_LDFLAGS.linux = $(filter-out $(VBOX_GCC_ORIGIN_OPT),$(TEMPLATE_VBoxR3Exe_LDFLAGS.linux))6795 TEMPLATE_VBoxR3HardenedExe_LDFLAGS = $(filter-out '$(VBOX_GCC_RPATH_OPT)%,$(TEMPLATE_VBoxR3Exe_LDFLAGS)) 6796 TEMPLATE_VBoxR3HardenedExe_LDFLAGS.linux = $(filter-out $(VBOX_GCC_ORIGIN_OPT),$(TEMPLATE_VBoxR3Exe_LDFLAGS.linux)) 6797 6797 endif 6798 6798 endif … … 6802 6802 # 6803 6803 TEMPLATE_VBOXR3HARDENEDLIB = Hardened VBox Ring-3 LIB 6804 TEMPLATE_VBOXR3HARDENEDLIB_EXTENDS = VB OXR3HARDENEDEXE6804 TEMPLATE_VBOXR3HARDENEDLIB_EXTENDS = VBoxR3HardenedExe 6805 6805 TEMPLATE_VBOXR3HARDENEDLIB_LIBS = $(NO_SUCH_VARIABLE) 6806 6806 TEMPLATE_VBOXR3HARDENEDLIB_USES.win = $(NO_SUCH_VARIABLE) … … 6812 6812 # 6813 6813 TEMPLATE_VBoxR3HardenedTstExe = VBox Ring-3 Hardened Testcase Exe (currently windows only!) 6814 TEMPLATE_VBoxR3HardenedTstExe_EXTENDS = VB OXR3HARDENEDEXE6814 TEMPLATE_VBoxR3HardenedTstExe_EXTENDS = VBoxR3HardenedExe 6815 6815 TEMPLATE_VBoxR3HardenedTstExe_INST = $(INST_TESTCASE) 6816 6816 … … 6835 6835 TEMPLATE_VBoxR3SetUidToRoot_EXTENDS = VBoxR3Exe 6836 6836 else 6837 TEMPLATE_VBoxR3SetUidToRoot_EXTENDS = VB OXR3HARDENEDEXE6837 TEMPLATE_VBoxR3SetUidToRoot_EXTENDS = VBoxR3HardenedExe 6838 6838 TEMPLATE_VBoxR3SetUidToRoot_LDFLAGS = $(VBOX_GCC_SANITIZER_FLAGS) $(VBOX_GCC_SANITIZER_LDFLAGS) 6839 6839 endif -
trunk/src/VBox/Frontends/VBoxHeadless/Makefile.kmk
r98103 r98155 36 36 ifdef VBOX_WITH_HARDENING 37 37 PROGRAMS += VBoxHeadlessHardened 38 VBoxHeadlessHardened_TEMPLATE = VB OXR3HARDENEDEXE38 VBoxHeadlessHardened_TEMPLATE = VBoxR3HardenedExe 39 39 VBoxHeadlessHardened_DEFS += $(if $(VBOX_WITH_DRIVERLESS_NEM_FALLBACK),VBOX_WITH_DRIVERLESS_NEM_FALLBACK,) 40 40 VBoxHeadlessHardened_SOURCES = VBoxHeadlessHardened.cpp -
trunk/src/VBox/Frontends/VBoxSDL/Makefile.kmk
r98103 r98155 36 36 # 37 37 PROGRAMS += VBoxSDLHardened 38 VBoxSDLHardened_TEMPLATE = VB OXR3HARDENEDEXE38 VBoxSDLHardened_TEMPLATE = VBoxR3HardenedExe 39 39 VBoxSDLHardened_SOURCES = VBoxSDLHardened.cpp 40 40 VBoxSDLHardened_NAME = VBoxSDL -
trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk
r98128 r98155 68 68 # 69 69 ifdef VBOX_WITH_HARDENING 70 VirtualBoxHardenedVM_TEMPLATE = VB OXR3HARDENEDEXE70 VirtualBoxHardenedVM_TEMPLATE = VBoxR3HardenedExe 71 71 VirtualBoxHardenedVM_INST.darwin = $(INST_VIRTUALBOX)Contents/Resources/VirtualBoxVM.app/Contents/MacOS/ 72 72 VirtualBoxHardenedVM_NAME = VirtualBoxVM -
trunk/src/VBox/NetworkServices/Dhcpd/Makefile.kmk
r98128 r98155 38 38 ifdef VBOX_WITH_HARDENING 39 39 PROGRAMS += VBoxNetDHCPHardened 40 VBoxNetDHCPHardened_TEMPLATE = VB OXR3HARDENEDEXE40 VBoxNetDHCPHardened_TEMPLATE = VBoxR3HardenedExe 41 41 VBoxNetDHCPHardened_NAME = VBoxNetDHCP 42 42 VBoxNetDHCPHardened_SOURCES = VBoxNetDhcpdHardened.cpp -
trunk/src/VBox/NetworkServices/NAT/Makefile.kmk
r98103 r98155 45 45 ifdef VBOX_WITH_HARDENING 46 46 PROGRAMS += VBoxNetNATHardened 47 VBoxNetNATHardened_TEMPLATE = VB OXR3HARDENEDEXE47 VBoxNetNATHardened_TEMPLATE = VBoxR3HardenedExe 48 48 VBoxNetNATHardened_NAME = VBoxNetNAT 49 49 ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING -
trunk/src/VBox/VMM/testcase/Makefile.kmk
r98129 r98155 467 467 # 468 468 if defined(VBOX_WITH_HARDENING) && "$(KBUILD_TARGET)" == "win" 469 tstVMREQHardened_TEMPLATE = VB OXR3HARDENEDEXE469 tstVMREQHardened_TEMPLATE = VBoxR3HardenedExe 470 470 tstVMREQHardened_NAME = tstVMREQ 471 471 ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING … … 487 487 # 488 488 if defined(VBOX_WITH_HARDENING) && "$(KBUILD_TARGET)" == "win" 489 tstAnimateHardened_TEMPLATE = VB OXR3HARDENEDEXE489 tstAnimateHardened_TEMPLATE = VBoxR3HardenedExe 490 490 tstAnimateHardened_NAME = tstAnimate 491 491 ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING … … 518 518 # 519 519 if defined(VBOX_WITH_HARDENING) && "$(KBUILD_TARGET)" == "win" 520 tstVMMHardened_TEMPLATE = VB OXR3HARDENEDEXE520 tstVMMHardened_TEMPLATE = VBoxR3HardenedExe 521 521 tstVMMHardened_NAME = tstVMM 522 522 ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING … … 551 551 # 552 552 if defined(VBOX_WITH_HARDENING) && "$(KBUILD_TARGET)" == "win" 553 tstMicroHardened_TEMPLATE = VB OXR3HARDENEDEXE553 tstMicroHardened_TEMPLATE = VBoxR3HardenedExe 554 554 tstMicroHardened_NAME = tstMicro 555 555 ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING … … 626 626 # 627 627 if defined(VBOX_WITH_HARDENING) && "$(KBUILD_TARGET)" == "win" 628 tstPDMAsyncCompletionHardened_TEMPLATE = VB OXR3HARDENEDEXE628 tstPDMAsyncCompletionHardened_TEMPLATE = VBoxR3HardenedExe 629 629 tstPDMAsyncCompletionHardened_NAME = tstPDMAsyncCompletion 630 630 ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING … … 647 647 # 648 648 if defined(VBOX_WITH_HARDENING) && "$(KBUILD_TARGET)" == "win" 649 tstPDMAsyncCompletionStressHardened_TEMPLATE = VB OXR3HARDENEDEXE649 tstPDMAsyncCompletionStressHardened_TEMPLATE = VBoxR3HardenedExe 650 650 tstPDMAsyncCompletionStressHardened_NAME = tstPDMAsyncCompletionStress 651 651 ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING -
trunk/src/VBox/VMM/tools/Makefile.kmk
r98128 r98155 44 44 # Hardened stub. 45 45 # 46 VBoxVMMPreloadHardened_TEMPLATE = VB OXR3HARDENEDEXE46 VBoxVMMPreloadHardened_TEMPLATE = VBoxR3HardenedExe 47 47 VBoxVMMPreloadHardened_SOURCES = VBoxVMMPreloadHardened.cpp 48 48 VBoxVMMPreloadHardened_NAME = VBoxVMMPreload
Note:
See TracChangeset
for help on using the changeset viewer.
