From cbb155b8d47b337a0450520341558c5b6a4ffc37 Mon Sep 17 00:00:00 2001
From: Ruy Contributors <ruy-eng@google.com>
Date: Thu, 31 Oct 2024 16:48:10 -0700
Subject: [PATCH] Fix export of changes.

FUTURE_COPYBARA_INTEGRATE_REVIEW=https://github.com/google/ruy/pull/354 from jdapena:gcc_fix_2024_03_25 87900ccc58c43039596d0ee916dc70fcff948d1e
PiperOrigin-RevId: 691977271
---
 ruy/BUILD                      | 6 +++---
 ruy/build_defs.bzl             | 3 ---
 ruy/profiler/instrumentation.h | 2 ++
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/ruy/BUILD b/ruy/BUILD
index 81d336aed19..ca2464c3ea7 100644
--- a/ruy/BUILD
+++ b/ruy/BUILD
@@ -4,8 +4,8 @@ load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
 load("@bazel_skylib//lib:selects.bzl", "selects")
 load(":build_defs.bzl", "ruy_copts", "ruy_copts_avx", "ruy_copts_avx2_fma", "ruy_copts_avx512")
 load(":build_defs.oss.bzl", "ruy_linkopts_thread_standard_library")
-load(":ruy_test_ext.oss.bzl", "ruy_test_ext_defines", "ruy_test_ext_deps")
 load(":ruy_test.bzl", "ruy_benchmark", "ruy_test")
+load(":ruy_test_ext.oss.bzl", "ruy_test_ext_defines", "ruy_test_ext_deps")
 
 package(
     default_applicable_licenses = ["//third_party/ruy:license"],
@@ -1229,7 +1229,7 @@ cc_test(
 )
 
 bzl_library(
-    name = "ruy_test_ext.oss_bzl",
+    name = "ruy_test_ext.google3_bzl",
     srcs = ["ruy_test_ext.oss.bzl"],
     visibility = ["//visibility:private"],
 )
@@ -1241,7 +1241,7 @@ bzl_library(
 )
 
 bzl_library(
-    name = "build_defs.oss_bzl",
+    name = "build_defs.google3_bzl",
     srcs = ["build_defs.oss.bzl"],
     visibility = ["//visibility:private"],
 )
diff --git a/ruy/build_defs.bzl b/ruy/build_defs.bzl
index d7c6f214373..28600a7cc3a 100644
--- a/ruy/build_defs.bzl
+++ b/ruy/build_defs.bzl
@@ -54,14 +54,12 @@ def ruy_copts():
 def ruy_copts_avx():
     return select({
         "//ruy:x86_64_and_not_msvc": ["-mavx"],
-        "//tools/cc_target_os:windows_msvc": ["/arch:AVX"],
         "//conditions:default": [],
     })
 
 def ruy_copts_avx2_fma():
     return select({
         "//ruy:x86_64_and_not_msvc": ["-mavx2", "-mfma"],
-        "//tools/cc_target_os:windows_msvc": ["/arch:AVX2"],
         "//conditions:default": [],
     })
 
@@ -71,6 +69,5 @@ def ruy_copts_avx512():
     # in optimized builds (-c opt).
     return select({
         "//ruy:x86_64_and_not_msvc": ["$(STACK_FRAME_UNLIMITED)", "-mavx512f", "-mavx512vl", "-mavx512cd", "-mavx512bw", "-mavx512dq"],
-        "//tools/cc_target_os:windows_msvc": ["/arch:AVX512"],
         "//conditions:default": [],
     })
diff --git a/ruy/profiler/instrumentation.h b/ruy/profiler/instrumentation.h
index c4df1e68fb2..210fa39f8b1 100644
--- a/ruy/profiler/instrumentation.h
+++ b/ruy/profiler/instrumentation.h
@@ -17,8 +17,10 @@ limitations under the License.
 #define RUY_RUY_PROFILER_INSTRUMENTATION_H_
 
 #ifdef RUY_PROFILER
+#include <stdlib.h>
 #include <cstdio>
 #include <mutex>
+#include <string>
 #include <vector>
 #endif