From 78d22273ad22b6e6ea9581a44d903bacb4f90fb2 Mon Sep 17 00:00:00 2001
From: Sidong-Wei <Sidong.Wei@ibm.com>
Date: Tue, 24 Nov 2020 22:25:22 -0500
Subject: [PATCH] Apply comment suggestions

---
 tensorflow/lite/kernels/arg_min_max.cc | 3 ++-
 tensorflow/lite/tools/verifier.cc      | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/tensorflow/lite/kernels/arg_min_max.cc b/tensorflow/lite/kernels/arg_min_max.cc
index 0d6563692d5..03a6961e609 100644
--- a/tensorflow/lite/kernels/arg_min_max.cc
+++ b/tensorflow/lite/kernels/arg_min_max.cc
@@ -38,8 +38,9 @@ constexpr int kOutputTensor = 0;
 TfLiteStatus ResizeOutput(TfLiteContext* context, const TfLiteTensor* input,
                           const TfLiteTensor* axis, TfLiteTensor* output) {
   int axis_value;
+  // Retrive all 8 bytes when axis type is kTfLiteInt64 to avoid data loss.
   if (axis->type == kTfLiteInt64) {
-    axis_value = *GetTensorData<int64_t>(axis);
+    axis_value = static_cast<int>(*GetTensorData<int64_t>(axis));
   } else {
     axis_value = *GetTensorData<int>(axis);
   }
diff --git a/tensorflow/lite/tools/verifier.cc b/tensorflow/lite/tools/verifier.cc
index 93276977ce3..fbfbc132e5a 100644
--- a/tensorflow/lite/tools/verifier.cc
+++ b/tensorflow/lite/tools/verifier.cc
@@ -51,7 +51,8 @@ void ReportError(ErrorReporter* error_reporter, const char* format, ...) {
 }
 // Returns the int32_t value pointed by ptr.
 const uint32_t GetIntPtr(const char* ptr) {
-#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
+#if defined(__BYTE_ORDER__) && defined(__ORDER_BIG_ENDIAN__) && \
+    __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
   return flatbuffers::EndianScalar(*reinterpret_cast<const uint32_t*>(ptr));
 #else
   return *reinterpret_cast<const uint32_t*>(ptr);