92 lines
2.7 KiB
Diff
92 lines
2.7 KiB
Diff
|
From bf87ec9e442d554bf1bc5874c1db9607e59899e3 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Esun Kim <veblush@google.com>
|
||
|
|
Date: Wed, 19 Aug 2020 18:17:39 -0700
|
||
|
|
Subject: [PATCH] Add ABSL_RANDOM_HWAES_FLAGS
|
||
|
|
|
||
|
|
|
||
|
|
diff --git a/Makefile b/Makefile
|
||
|
|
index 9fc06b0edf..d22d4bab72 100644
|
||
|
|
--- a/Makefile
|
||
|
|
+++ b/Makefile
|
||
|
|
@@ -34,6 +34,13 @@ ifeq ($(SYSTEM),MINGW64)
|
||
|
|
SYSTEM = MINGW32
|
||
|
|
endif
|
||
|
|
|
||
|
|
+# Basic machine detection
|
||
|
|
+HOST_MACHINE = $(shell uname -m)
|
||
|
|
+ifeq ($(HOST_MACHINE),x86_64)
|
||
|
|
+HOST_IS_X86_64 = true
|
||
|
|
+else
|
||
|
|
+HOST_IS_X86_64 = false
|
||
|
|
+endif
|
||
|
|
|
||
|
|
MAKEFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST)))
|
||
|
|
ifndef BUILDDIR
|
||
|
|
@@ -696,6 +703,11 @@ CPPFLAGS := -Ithird_party/address_sorting/include $(CPPFLAGS)
|
||
|
|
|
||
|
|
GRPC_ABSEIL_DEP = $(LIBDIR)/$(CONFIG)/libgrpc_abseil.a
|
||
|
|
GRPC_ABSEIL_MERGE_LIBS = $(LIBDIR)/$(CONFIG)/libgrpc_abseil.a
|
||
|
|
+ifeq ($(HOST_IS_X86_64),true)
|
||
|
|
+ABSL_RANDOM_HWAES_FLAGS = -maes -msse4
|
||
|
|
+else
|
||
|
|
+ABSL_RANDOM_HWAES_FLAGS =
|
||
|
|
+endif
|
||
|
|
|
||
|
|
RE2_DEP = $(LIBDIR)/$(CONFIG)/libre2.a
|
||
|
|
RE2_MERGE_OBJS = $(LIBRE2_OBJS)
|
||
|
|
@@ -4508,7 +4520,7 @@ LIBGRPC_ABSEIL_SRC = \
|
||
|
|
|
||
|
|
LIBGRPC_ABSEIL_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGRPC_ABSEIL_SRC))))
|
||
|
|
|
||
|
|
-$(LIBGRPC_ABSEIL_OBJS): CPPFLAGS += -g -maes -msse4 -Ithird_party/abseil-cpp
|
||
|
|
+$(LIBGRPC_ABSEIL_OBJS): CPPFLAGS += -g $(ABSL_RANDOM_HWAES_FLAGS) -Ithird_party/abseil-cpp
|
||
|
|
|
||
|
|
$(LIBDIR)/$(CONFIG)/libgrpc_abseil.a: $(LIBGRPC_ABSEIL_OBJS)
|
||
|
|
$(E) "[AR] Creating $@"
|
||
|
|
diff --git a/build_handwritten.yaml b/build_handwritten.yaml
|
||
|
|
index 26e1af3360..63451d14c3 100644
|
||
|
|
--- a/build_handwritten.yaml
|
||
|
|
+++ b/build_handwritten.yaml
|
||
|
|
@@ -196,7 +196,7 @@ configs:
|
||
|
|
UBSAN_OPTIONS: halt_on_error=1:print_stacktrace=1:suppressions=test/core/util/ubsan_suppressions.txt
|
||
|
|
defaults:
|
||
|
|
abseil:
|
||
|
|
- CPPFLAGS: -g -maes -msse4 -Ithird_party/abseil-cpp
|
||
|
|
+ CPPFLAGS: -g $(ABSL_RANDOM_HWAES_FLAGS) -Ithird_party/abseil-cpp
|
||
|
|
ares:
|
||
|
|
CFLAGS: -g
|
||
|
|
CPPFLAGS: -Ithird_party/cares -Ithird_party/cares/cares -fvisibility=hidden -D_GNU_SOURCE
|
||
|
|
diff --git a/templates/Makefile.template b/templates/Makefile.template
|
||
|
|
index 897291ba14..581367e0a6 100644
|
||
|
|
--- a/templates/Makefile.template
|
||
|
|
+++ b/templates/Makefile.template
|
||
|
|
@@ -82,6 +82,13 @@
|
||
|
|
SYSTEM = MINGW32
|
||
|
|
endif
|
||
|
|
|
||
|
|
+ # Basic machine detection
|
||
|
|
+ HOST_MACHINE = $(shell uname -m)
|
||
|
|
+ ifeq ($(HOST_MACHINE),x86_64)
|
||
|
|
+ HOST_IS_X86_64 = true
|
||
|
|
+ else
|
||
|
|
+ HOST_IS_X86_64 = false
|
||
|
|
+ endif
|
||
|
|
|
||
|
|
MAKEFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST)))
|
||
|
|
ifndef BUILDDIR
|
||
|
|
@@ -567,6 +574,11 @@
|
||
|
|
|
||
|
|
GRPC_ABSEIL_DEP = $(LIBDIR)/$(CONFIG)/libgrpc_abseil.a
|
||
|
|
GRPC_ABSEIL_MERGE_LIBS = $(LIBDIR)/$(CONFIG)/libgrpc_abseil.a
|
||
|
|
+ ifeq ($(HOST_IS_X86_64),true)
|
||
|
|
+ ABSL_RANDOM_HWAES_FLAGS = -maes -msse4
|
||
|
|
+ else
|
||
|
|
+ ABSL_RANDOM_HWAES_FLAGS =
|
||
|
|
+ endif
|
||
|
|
|
||
|
|
RE2_DEP = $(LIBDIR)/$(CONFIG)/libre2.a
|
||
|
|
RE2_MERGE_OBJS = $(LIBRE2_OBJS)
|
||
|
|
--
|
||
|
|
2.23.0
|
||
|
|
|