|
Lines 1-11
Link Here
|
| 1 |
--- lib/freebl/Makefile.orig 2018-08-31 12:55:53 UTC |
1 |
--- lib/freebl/Makefile.orig 2018-08-31 12:55:53 UTC |
| 2 |
+++ lib/freebl/Makefile |
2 |
+++ lib/freebl/Makefile |
| 3 |
@@ -215,7 +215,7 @@ ifeq ($(CPU_ARCH),x86) |
3 |
@@ -119,7 +119,7 @@ else |
|
|
4 |
DEFINES += -DNSS_X86 |
| 4 |
endif |
5 |
endif |
|
|
6 |
endif |
| 7 |
-ifdef NS_USE_GCC |
| 8 |
+ifdef CC_IS_GCC |
| 9 |
ifeq ($(CPU_ARCH),aarch64) |
| 10 |
DEFINES += -DUSE_HW_AES -DUSE_HW_SHA1 -DUSE_HW_SHA2 |
| 11 |
EXTRA_SRCS += aes-armv8.c gcm-aarch64.c sha1-armv8.c sha256-armv8.c |
| 12 |
@@ -247,7 +247,7 @@ else ifeq ($(CPU_ARCH),x86) |
| 13 |
endif |
| 5 |
endif # Darwin |
14 |
endif # Darwin |
| 6 |
|
15 |
|
| 7 |
-ifeq ($(OS_TARGET),Linux) |
16 |
-ifeq ($(OS_TARGET),Linux) |
| 8 |
+ifeq (,$(filter-out Linux FreeBSD, $(OS_TARGET))) |
17 |
+ifeq (,$(filter-out Linux FreeBSD, $(OS_TARGET))) |
| 9 |
ifeq ($(CPU_ARCH),x86_64) |
18 |
ifeq ($(CPU_ARCH),x86_64) |
| 10 |
ASFILES = arcfour-amd64-gas.s mpi_amd64_gas.s |
19 |
# Lower case s on mpi_amd64_common due to make implicit rules. |
| 11 |
ASFLAGS += -fPIC -Wa,--noexecstack |
20 |
ASFILES = arcfour-amd64-gas.s mpi_amd64_common.s |
|
|
21 |
@@ -728,7 +728,7 @@ $(OBJDIR)/$(PROG_PREFIX)gcm-arm32-neon$(OBJ_SUFFIX): C |
| 22 |
endif |
| 23 |
endif |
| 24 |
|
| 25 |
-ifdef NS_USE_GCC |
| 26 |
+ifdef CC_IS_GCC |
| 27 |
ifeq ($(CPU_ARCH),aarch64) |
| 28 |
$(OBJDIR)/$(PROG_PREFIX)aes-armv8$(OBJ_SUFFIX): CFLAGS += -march=armv8-a+crypto |
| 29 |
$(OBJDIR)/$(PROG_PREFIX)gcm-aarch64$(OBJ_SUFFIX): CFLAGS += -march=armv8-a+crypto |