diff options
| author | Mike Pall <mike> | 2012-07-29 12:22:18 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2012-07-29 12:22:18 +0200 |
| commit | e84c2a9e9ae5ed667e554471015a5df3bfd8634a (patch) | |
| tree | 74dc22fd48c4bdcf9b25062ddb0178060a0f7652 /src/Makefile | |
| parent | b98c1582c9129e7db59e4edaf7236671b36b523c (diff) | |
| download | luajit-e84c2a9e9ae5ed667e554471015a5df3bfd8634a.tar.gz luajit-e84c2a9e9ae5ed667e554471015a5df3bfd8634a.tar.bz2 luajit-e84c2a9e9ae5ed667e554471015a5df3bfd8634a.zip | |
Handle cross-compiles with FPU/no-FPU or hard-fp/soft-fp ABI mismatch.
Diffstat (limited to 'src/Makefile')
| -rw-r--r-- | src/Makefile | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/Makefile b/src/Makefile index 531f8bab..748a4ed7 100644 --- a/src/Makefile +++ b/src/Makefile | |||
| @@ -379,9 +379,15 @@ ifneq (,$(findstring LJ_DUALNUM 1,$(TARGET_TESTARCH))) | |||
| 379 | endif | 379 | endif |
| 380 | ifneq (,$(findstring LJ_ARCH_HASFPU 1,$(TARGET_TESTARCH))) | 380 | ifneq (,$(findstring LJ_ARCH_HASFPU 1,$(TARGET_TESTARCH))) |
| 381 | DASM_AFLAGS+= -D FPU | 381 | DASM_AFLAGS+= -D FPU |
| 382 | TARGET_ARCH+= -DLJ_ARCH_HASFPU=1 | ||
| 383 | else | ||
| 384 | TARGET_ARCH+= -DLJ_ARCH_HASFPU=0 | ||
| 382 | endif | 385 | endif |
| 383 | ifeq (,$(findstring LJ_ABI_SOFTFP 1,$(TARGET_TESTARCH))) | 386 | ifeq (,$(findstring LJ_ABI_SOFTFP 1,$(TARGET_TESTARCH))) |
| 384 | DASM_AFLAGS+= -D HF | 387 | DASM_AFLAGS+= -D HFABI |
| 388 | TARGET_ARCH+= -DLJ_ABI_SOFTFP=0 | ||
| 389 | else | ||
| 390 | TARGET_ARCH+= -DLJ_ABI_SOFTFP=1 | ||
| 385 | endif | 391 | endif |
| 386 | DASM_AFLAGS+= -D VER=$(subst LJ_ARCH_VERSION_,,$(filter LJ_ARCH_VERSION_%,$(subst LJ_ARCH_VERSION ,LJ_ARCH_VERSION_,$(TARGET_TESTARCH)))) | 392 | DASM_AFLAGS+= -D VER=$(subst LJ_ARCH_VERSION_,,$(filter LJ_ARCH_VERSION_%,$(subst LJ_ARCH_VERSION ,LJ_ARCH_VERSION_,$(TARGET_TESTARCH)))) |
| 387 | ifeq (Windows,$(TARGET_SYS)) | 393 | ifeq (Windows,$(TARGET_SYS)) |