Changeset 3361 in kBuild for trunk/src/kWorker/Makefile.kmk

Timestamp:

Jun 8, 2020 7:27:14 PM (4 years ago)

Author:

bird

Message:

kWorker: Adjustments for VC++ 14.2. Fixed bug in GetFileAttributesExW/A where we'd forget to set the return value on success. Reduced the size of the Tls DLLs, but having to add more as the re-load-same-dll hack doesn't work anymore.

File:

• trunk/src/kWorker/Makefile.kmk (modified) (3 diffs)

trunk/src/kWorker/Makefile.kmk

@@ -34 +34 @@
 kWorker_DEFS.debug = K_STRICT
 kWorker_DEFS.release = NASSERT
+ifeq ($(USERNAME),bird)
+kWorker_CFLAGS = -W4 -wd4127 -wd4100 -wd4214 -wd4201 -wd4204
+endif
 kWorker_SOURCES = \
         kWorker.c \
@@ -50 +53 @@
         $(PATH_SDK_WINDDK71_LIB_WNET)/psapi.lib
 kWorker_LDFLAGS.win = \
-        /BASE:0x10000 /DYNAMICBASE:NO /FIXED
+        /DYNAMICBASE:NO /FIXED
+kWorker_LDFLAGS.win.x86   = /BASE:0x00010000
+kWorker_LDFLAGS.win.amd64 = /BASE:0x0000000420000000
+
 #kWorker_LDFLAGS.win.x86 = \
 #       /SAFESEH:NO - doesn't help anyone.
@@ -159 +165 @@
 # A couple of dummy DLLs we use for grabbing LDR TLS entries.
 #
-DLLS += kWorkerTls1K kWorkerTls64K kWorkerTls512K
+DLLS += kWorkerTls1K kWorkerTls1K01 kWorkerTls1K02 kWorkerTls1K03 kWorkerTls1K04 kWorkerTls1K05 kWorkerTls1K06 kWorkerTls1K07 \
+        kWorkerTls1K08 kWorkerTls1K09 kWorkerTls1K10 kWorkerTls1K11 kWorkerTls1K12 kWorkerTls1K13 kWorkerTls1K14 kWorkerTls1K15
 kWorkerTls1K_TEMPLATE   = BIN-STATIC-THREADED
-kWorkerTls1K_DEFS       = KWORKER_BASE=0x10000 TLS_SIZE=1024
+kWorkerTls1K_DEFS       = TLS_SIZE=1024
 kWorkerTls1K_SOURCES    = kWorkerTlsXxxK.c
 kWorkerTls1K_LDFLAGS    = /Entry:DummyDllEntry
 
+kWorkerTls1K01_EXTENDS = kWorkerTls1K
+kWorkerTls1K02_EXTENDS = kWorkerTls1K
+kWorkerTls1K03_EXTENDS = kWorkerTls1K
+kWorkerTls1K04_EXTENDS = kWorkerTls1K
+kWorkerTls1K05_EXTENDS = kWorkerTls1K
+kWorkerTls1K06_EXTENDS = kWorkerTls1K
+kWorkerTls1K07_EXTENDS = kWorkerTls1K
+kWorkerTls1K08_EXTENDS = kWorkerTls1K
+kWorkerTls1K09_EXTENDS = kWorkerTls1K
+kWorkerTls1K10_EXTENDS = kWorkerTls1K
+kWorkerTls1K11_EXTENDS = kWorkerTls1K
+kWorkerTls1K12_EXTENDS = kWorkerTls1K
+kWorkerTls1K13_EXTENDS = kWorkerTls1K
+kWorkerTls1K14_EXTENDS = kWorkerTls1K
+kWorkerTls1K15_EXTENDS = kWorkerTls1K
+
+DLLS += kWorkerTls64K kWorkerTls512K
+
 kWorkerTls64K_TEMPLATE  = BIN-STATIC-THREADED
-kWorkerTls64K_DEFS      = KWORKER_BASE=0x10000 TLS_SIZE=65536
+kWorkerTls64K_DEFS      = TLS_SIZE=65536
 kWorkerTls64K_SOURCES   = kWorkerTlsXxxK.c
 kWorkerTls64K_LDFLAGS   = /Entry:DummyDllEntry
 
 kWorkerTls512K_TEMPLATE = BIN-STATIC-THREADED
-kWorkerTls512K_DEFS     = KWORKER_BASE=0x10000 TLS_SIZE=524288
+kWorkerTls512K_DEFS     = TLS_SIZE=524288
 kWorkerTls512K_SOURCES  = kWorkerTlsXxxK.c
 kWorkerTls512K_LDFLAGS  = /Entry:DummyDllEntry