diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup
index 9f4104da8b..41b6398a01 100644
--- a/build/jam/BuildSetup
+++ b/build/jam/BuildSetup
@@ -300,7 +300,7 @@ if $(HOST_PLATFORM) != cygwin {
 }
 
 if $(HOST_GCC_VERSION[1]) >= 3 {
-	HOST_GCC_BASE_FLAGS += -fno-strict-aliasing -fno-tree-vrp ;
+	HOST_GCC_BASE_FLAGS += -fno-strict-aliasing -fno-delete-null-pointer-checks ;
 }
 
 HOST_KERNEL_CCFLAGS += $(HOST_GCC_BASE_FLAGS) -finline -fno-builtin
@@ -387,7 +387,7 @@ if $(HOST_PLATFORM_BEOS_COMPATIBLE) {
 }
 
 HOST_DEFINES += ARCH_$(HOST_CPU) ;
-HOST_DEFINES += _NO_INLINE_ASM ;
+HOST_DEFINES += _NO_INLINE_ASM __NO_INLINE__ ;
 
 # for builds of tools in the current environment
 HOST_BUILD_COMPATIBILITY_LIB_DIR = [ FDirName $(HOST_OBJECT_BASE_DIR) lib ] ;