Merge changes from github.

Change: 142074581

1 files changed, 26 insertions, 0 deletions

diff --git a/tensorflow/core/platform/windows/cpu_info.h b/tensorflow/core/platform/windows/cpu_info.h
new file mode 100644
index 0000000000..44c0059d63
--- /dev/null
+++ b/tensorflow/core/platform/windows/cpu_info.h
@@ -0,0 +1,26 @@
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#ifndef TENSORFLOW_PLATFORM_WINDOWS_CPU_INFO_H_
+#define TENSORFLOW_PLATFORM_WINDOWS_CPU_INFO_H_
+
+// Byte order defines provided by gcc. MSVC doesn't define those so 
+// we define them here.
+// We assume that all windows platform out there are little endian.
+#define __ORDER_LITTLE_ENDIAN__ 0x4d2
+#define __ORDER_BIG_ENDIAN__ 0x10e1
+#define __BYTE_ORDER__ __ORDER_LITTLE_ENDIAN__
+
+#endif  // TENSORFLOW_PLATFORM_WINDOWS_CPU_INFO_H_