mirror of
https://github.com/hashcat/hashcat.git
synced 2025-07-19 21:18:21 +00:00
Merge pull request #4316 from matrix/fix_Makefile_arm64
Fixed build failed for aarch64 (es: rpi)
This commit is contained in:
commit
5af377ac4f
@ -106,6 +106,7 @@
|
|||||||
- Fixed build failed for 18400 with Apple Metal
|
- Fixed build failed for 18400 with Apple Metal
|
||||||
- Fixed build failed for 18600 with Apple Metal
|
- Fixed build failed for 18600 with Apple Metal
|
||||||
- Fixed build failed for 4410 with vector width > 1
|
- Fixed build failed for 4410 with vector width > 1
|
||||||
|
- Fixed build failed for aarch64 (es: rpi)
|
||||||
- Fixed clang identification in src/Makefile
|
- Fixed clang identification in src/Makefile
|
||||||
- Fixed build failure for almost all hash modes that make use of hc_swap64 and/or hc_swap64_S with Apple Metal / Apple Silicon
|
- Fixed build failure for almost all hash modes that make use of hc_swap64 and/or hc_swap64_S with Apple Metal / Apple Silicon
|
||||||
- Fixed debug mode 5 by adding the missing colon between original-word and finding-rule
|
- Fixed debug mode 5 by adding the missing colon between original-word and finding-rule
|
||||||
|
14
src/Makefile
14
src/Makefile
@ -88,6 +88,9 @@ DARWIN_VERSION := $(shell uname -r | cut -d. -f1)
|
|||||||
IS_APPLE_SILICON := $(shell [ "$$(sysctl -in hw.optional.arm64 2>/dev/null)" = "1" ] && echo 1 || echo 0)
|
IS_APPLE_SILICON := $(shell [ "$$(sysctl -in hw.optional.arm64 2>/dev/null)" = "1" ] && echo 1 || echo 0)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
IS_AARCH64 := $(shell [ "$$(arch 2>/dev/null)" = "aarch64" ] && echo 1 || echo 0)
|
||||||
|
IS_ARM := $(or $(filter 1,$(IS_APPLE_SILICON)),$(filter 1,$(IS_AARCH64)))
|
||||||
|
|
||||||
ifneq (,$(filter $(UNAME),FreeBSD NetBSD))
|
ifneq (,$(filter $(UNAME),FreeBSD NetBSD))
|
||||||
CC := cc
|
CC := cc
|
||||||
CXX := c++
|
CXX := c++
|
||||||
@ -380,8 +383,6 @@ LFLAGS_NATIVE += -lpthread
|
|||||||
LFLAGS_NATIVE += -liconv
|
LFLAGS_NATIVE += -liconv
|
||||||
|
|
||||||
ifeq ($(IS_APPLE_SILICON),1)
|
ifeq ($(IS_APPLE_SILICON),1)
|
||||||
CFLAGS_NATIVE += -DSSE2NEON_SUPPRESS_WARNINGS
|
|
||||||
CFLAGS_NATIVE += -I$(DEPS_SSE2NEON)
|
|
||||||
CFLAGS_NATIVE += -arch arm64
|
CFLAGS_NATIVE += -arch arm64
|
||||||
CFLAGS_NATIVE += -arch x86_64
|
CFLAGS_NATIVE += -arch x86_64
|
||||||
ifeq ($(SHARED),1)
|
ifeq ($(SHARED),1)
|
||||||
@ -392,6 +393,11 @@ endif
|
|||||||
|
|
||||||
endif # Darwin
|
endif # Darwin
|
||||||
|
|
||||||
|
ifeq ($(IS_ARM),1)
|
||||||
|
CFLAGS_NATIVE += -DSSE2NEON_SUPPRESS_WARNINGS
|
||||||
|
CFLAGS_NATIVE += -I$(DEPS_SSE2NEON)
|
||||||
|
endif
|
||||||
|
|
||||||
ifeq ($(UNAME),CYGWIN)
|
ifeq ($(UNAME),CYGWIN)
|
||||||
CFLAGS_NATIVE := $(CFLAGS)
|
CFLAGS_NATIVE := $(CFLAGS)
|
||||||
CFLAGS_NATIVE += -DWITH_HWMON
|
CFLAGS_NATIVE += -DWITH_HWMON
|
||||||
@ -838,12 +844,12 @@ CFLAGS_LZMA_WIN += -Wno-misleading-indentation
|
|||||||
|
|
||||||
CFLAGS_UNRAR_WIN += -Wno-misleading-indentation
|
CFLAGS_UNRAR_WIN += -Wno-misleading-indentation
|
||||||
CFLAGS_UNRAR_WIN += -Wno-class-memaccess
|
CFLAGS_UNRAR_WIN += -Wno-class-memaccess
|
||||||
|
endif
|
||||||
|
|
||||||
ifeq ($(IS_APPLE_SILICON),1)
|
ifeq ($(IS_ARM),1)
|
||||||
CFLAGS_CROSS_LINUX += -DSSE2NEON_SUPPRESS_WARNINGS
|
CFLAGS_CROSS_LINUX += -DSSE2NEON_SUPPRESS_WARNINGS
|
||||||
CFLAGS_CROSS_LINUX += -I$(DEPS_SSE2NEON)
|
CFLAGS_CROSS_LINUX += -I$(DEPS_SSE2NEON)
|
||||||
endif
|
endif
|
||||||
endif
|
|
||||||
|
|
||||||
##
|
##
|
||||||
## Targets
|
## Targets
|
||||||
|
Loading…
Reference in New Issue
Block a user