blob: 7b7244b491e6f446283e663f454724915fa43954 [file] [log] [blame]
Andrew Geissler615f2f12022-07-15 14:00:58 -05001From d25cf3b9aa873595a19e197cc29ab46c0093bff1 Mon Sep 17 00:00:00 2001
Andrew Geisslereef63862021-01-29 15:58:13 -06002From: Sinan Kaya <sinan.kaya@microsoft.com>
3Date: Mon, 3 Feb 2020 03:25:57 +0000
Andrew Geissler615f2f12022-07-15 14:00:58 -05004Subject: [PATCH 2/3] Remove maes option from cross-compilation
Andrew Geisslereef63862021-01-29 15:58:13 -06005
6---
7 absl/copts/GENERATED_AbseilCopts.cmake | 4 ----
8 absl/copts/GENERATED_copts.bzl | 4 ----
9 2 files changed, 8 deletions(-)
10
11diff --git a/absl/copts/GENERATED_AbseilCopts.cmake b/absl/copts/GENERATED_AbseilCopts.cmake
Andrew Geissler615f2f12022-07-15 14:00:58 -050012index a4ab1aa2041e..23b9253c1f00 100644
Andrew Geisslereef63862021-01-29 15:58:13 -060013--- a/absl/copts/GENERATED_AbseilCopts.cmake
14+++ b/absl/copts/GENERATED_AbseilCopts.cmake
Andrew Geissler615f2f12022-07-15 14:00:58 -050015@@ -158,7 +158,3 @@ list(APPEND ABSL_RANDOM_HWAES_ARM64_FLAGS
Andrew Geisslereef63862021-01-29 15:58:13 -060016 list(APPEND ABSL_RANDOM_HWAES_MSVC_X64_FLAGS
17 )
18
19-list(APPEND ABSL_RANDOM_HWAES_X64_FLAGS
20- "-maes"
21- "-msse4.1"
22-)
23diff --git a/absl/copts/GENERATED_copts.bzl b/absl/copts/GENERATED_copts.bzl
Andrew Geissler615f2f12022-07-15 14:00:58 -050024index a6efc98e11d4..1e847f769501 100644
Andrew Geisslereef63862021-01-29 15:58:13 -060025--- a/absl/copts/GENERATED_copts.bzl
26+++ b/absl/copts/GENERATED_copts.bzl
Andrew Geissler615f2f12022-07-15 14:00:58 -050027@@ -159,7 +159,3 @@ ABSL_RANDOM_HWAES_ARM64_FLAGS = [
Andrew Geisslereef63862021-01-29 15:58:13 -060028 ABSL_RANDOM_HWAES_MSVC_X64_FLAGS = [
29 ]
30
31-ABSL_RANDOM_HWAES_X64_FLAGS = [
32- "-maes",
33- "-msse4.1",
34-]
35--
Andrew Geissler615f2f12022-07-15 14:00:58 -0500362.36.1
Andrew Geisslereef63862021-01-29 15:58:13 -060037