diff options
| author | Mike Pall <mike> | 2012-06-10 16:41:00 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2012-06-10 16:41:00 +0200 |
| commit | e496a502b0686af25053c161752c044074edc44e (patch) | |
| tree | e0bfb4bfa40d3eb910ed04f4d66b641634b29a47 /src/Makefile | |
| parent | d5a915ccf58bff38f932de752771cd650809787e (diff) | |
| download | luajit-e496a502b0686af25053c161752c044074edc44e.tar.gz luajit-e496a502b0686af25053c161752c044074edc44e.tar.bz2 luajit-e496a502b0686af25053c161752c044074edc44e.zip | |
Pass various build, arch and OS flags to DynASM.
Diffstat (limited to 'src/Makefile')
| -rw-r--r-- | src/Makefile | 45 |
1 files changed, 39 insertions, 6 deletions
diff --git a/src/Makefile b/src/Makefile index 3f733c59..d9bb178b 100644 --- a/src/Makefile +++ b/src/Makefile | |||
| @@ -249,12 +249,12 @@ endif | |||
| 249 | endif | 249 | endif |
| 250 | endif | 250 | endif |
| 251 | 251 | ||
| 252 | ifneq (,$(findstring __CELLOS_LV2__ ,$(TARGET_TESTARCH))) | 252 | ifneq (,$(findstring LJ_TARGET_PS3 1,$(TARGET_TESTARCH))) |
| 253 | TARGET_SYS= PS3 | 253 | TARGET_SYS= PS3 |
| 254 | TARGET_ARCH+= -D__CELLOS_LV2__ | 254 | TARGET_ARCH+= -D__CELLOS_LV2__ |
| 255 | TARGET_XCFLAGS+= -DLUAJIT_USE_SYSMALLOC | 255 | TARGET_XCFLAGS+= -DLUAJIT_USE_SYSMALLOC |
| 256 | endif | 256 | endif |
| 257 | ifneq (,$(findstring LJ_NO_UNWIND ,$(TARGET_TESTARCH))) | 257 | ifneq (,$(findstring LJ_NO_UNWIND 1,$(TARGET_TESTARCH))) |
| 258 | TARGET_ARCH+= -DLUAJIT_NO_UNWIND | 258 | TARGET_ARCH+= -DLUAJIT_NO_UNWIND |
| 259 | endif | 259 | endif |
| 260 | 260 | ||
| @@ -377,13 +377,46 @@ DASM_XFLAGS= | |||
| 377 | DASM_AFLAGS= | 377 | DASM_AFLAGS= |
| 378 | DASM_ARCH= $(TARGET_LJARCH) | 378 | DASM_ARCH= $(TARGET_LJARCH) |
| 379 | 379 | ||
| 380 | ifneq (,$(findstring LJ_HASJIT 1,$(TARGET_TESTARCH))) | ||
| 381 | DASM_AFLAGS+= -D JIT | ||
| 382 | endif | ||
| 383 | ifneq (,$(findstring LJ_HASFFI 1,$(TARGET_TESTARCH))) | ||
| 384 | DASM_AFLAGS+= -D FFI | ||
| 385 | endif | ||
| 386 | ifneq (,$(findstring LJ_DUALNUM 1,$(TARGET_TESTARCH))) | ||
| 387 | DASM_AFLAGS+= -D DUALNUM | ||
| 388 | endif | ||
| 389 | ifneq (,$(findstring LJ_ARCH_HASFPU 1,$(TARGET_TESTARCH))) | ||
| 390 | DASM_AFLAGS+= -D FPU | ||
| 391 | endif | ||
| 392 | ifeq (,$(findstring LJ_ABI_SOFTFP 1,$(TARGET_TESTARCH))) | ||
| 393 | DASM_AFLAGS+= -D HF | ||
| 394 | endif | ||
| 395 | DASM_AFLAGS+= -D VER=$(subst LJ_ARCH_VERSION_,,$(filter LJ_ARCH_VERSION_%,$(subst LJ_ARCH_VERSION ,LJ_ARCH_VERSION_,$(TARGET_TESTARCH)))) | ||
| 396 | ifeq (Windows,$(TARGET_SYS)) | ||
| 397 | DASM_AFLAGS+= -D WIN | ||
| 398 | endif | ||
| 399 | ifeq (x86,$(TARGET_LJARCH)) | ||
| 400 | ifneq (,$(findstring __SSE2__ 1,$(TARGET_TESTARCH))) | ||
| 401 | DASM_AFLAGS+= -D SSE | ||
| 402 | endif | ||
| 403 | else | ||
| 380 | ifeq (x64,$(TARGET_LJARCH)) | 404 | ifeq (x64,$(TARGET_LJARCH)) |
| 405 | DASM_AFLAGS+= -D X64 | ||
| 381 | DASM_ARCH= x86 | 406 | DASM_ARCH= x86 |
| 382 | ifeq (Windows,$(TARGET_SYS)) | 407 | else |
| 383 | DASM_AFLAGS+= -D X64 -D X64WIN | 408 | ifeq (ppc,$(TARGET_LJARCH)) |
| 384 | else | 409 | ifneq (,$(findstring LJ_ARCH_SQRT 1,$(TARGET_TESTARCH))) |
| 385 | DASM_AFLAGS+= -D X64 | 410 | DASM_AFLAGS+= -D SQRT |
| 386 | endif | 411 | endif |
| 412 | ifneq (,$(findstring LJ_ARCH_ROUND 1,$(TARGET_TESTARCH))) | ||
| 413 | DASM_AFLAGS+= -D ROUND | ||
| 414 | endif | ||
| 415 | ifeq (PS3,$(TARGET_SYS)) | ||
| 416 | DASM_AFLAGS+= -D PS3 | ||
| 417 | endif | ||
| 418 | endif | ||
| 419 | endif | ||
| 387 | endif | 420 | endif |
| 388 | 421 | ||
| 389 | DASM_FLAGS= $(DASM_XFLAGS) $(DASM_AFLAGS) | 422 | DASM_FLAGS= $(DASM_XFLAGS) $(DASM_AFLAGS) |