libwebp: mips32r6 build fix

third_party/libwebp/utils/bit_reader_inl.h

 // Copyright 2014 Google Inc. All Rights Reserved.
 //
 // Use of this source code is governed by a BSD-style license
 // that can be found in the COPYING file in the root of the source
 // tree. An additional intellectual property rights grant can be found
 // in the file PATENTS. All contributing project authors may
 // be found in the AUTHORS file in the root of the source tree.
 // -----------------------------------------------------------------------------
 //
 // Specific inlined methods for boolean decoder [VP8GetBit() ...]
 // This file should be included by the .c sources that actually need to call
 // these methods.
 //
 // Author: Skal (pascal.massimino@gmail.com)
 
 #ifndef WEBP_UTILS_BIT_READER_INL_H_
 #define WEBP_UTILS_BIT_READER_INL_H_
 
 #ifdef HAVE_CONFIG_H
 #include "../webp/config.h"
 #endif
 
 #ifdef WEBP_FORCE_ALIGNED
 #include <string.h>  // memcpy
 #endif
 

[urvang (Google), 2014/08/12 18:21:40]

I see "#include "../dsp/dsp.h" in the original patch 0524d9e:
https://gerrit.chromium.org/gerrit/#/c/71073/3/src/utils/bit_reader_inl.h

[gordanac, 2014/08/12 18:47:35]

Done.

 #include "./bit_reader.h"
 #include "./endian_inl.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 //------------------------------------------------------------------------------
 // Derived type lbit_t = natural type for memory I/O
 
@@ skipping 19 matching lines @@
 // makes sure br->value_ has at least BITS bits worth of data
 static WEBP_INLINE void VP8LoadNewBytes(VP8BitReader* const br) {
   assert(br != NULL && br->buf_ != NULL);
   // Read 'BITS' bits at a time if possible.
   if (br->buf_ + sizeof(lbit_t) <= br->buf_end_) {
     // convert memory type to register type (with some zero'ing!)
     bit_t bits;
 #if defined(WEBP_FORCE_ALIGNED)
     lbit_t in_bits;
     memcpy(&in_bits, br->buf_, sizeof(in_bits));
-#elif defined(__mips__)                        // MIPS
+#elif defined(WEBP_USE_MIPS32)
     // This is needed because of un-aligned read.
     lbit_t in_bits;
     lbit_t* p_buf_ = (lbit_t*)br->buf_;
     __asm__ volatile(
       ".set   push                             \n\t"
       ".set   at                               \n\t"
       ".set   macro                            \n\t"
       "ulw    %[in_bits], 0(%[p_buf_])         \n\t"
       ".set   pop                              \n\t"
       : [in_bits]"=r"(in_bits)
@@ skipping 85 matching lines @@
     br->value_ -= (bit_t)((split + 1) & mask) << pos;
     return (v ^ mask) - mask;
   }
 }
 
 #ifdef __cplusplus
 }    // extern "C"
 #endif
 
 #endif   // WEBP_UTILS_BIT_READER_INL_H_