Code changes to get the code to compile under GCC....

courgette/assembly_program.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "courgette/assembly_program.h"
 
 #include <memory.h>
 #include <algorithm>
 #include <map>
 #include <set>
@@ skipping 67 matching lines @@
     if (label == NULL) NOTREACHED();
   }
   Label* label() const { return label_; }
  private:
   Label* label_;
 };
 
 }  // namespace
 
 AssemblyProgram::AssemblyProgram()
-  : image_base_(0),
-    byte_instruction_cache_(NULL) {
+  : byte_instruction_cache_(NULL),
+    image_base_(0) {
 }
 
 static void DeleteContainedLabels(const RVAToLabel& labels) {
   for (RVAToLabel::const_iterator p = labels.begin();  p != labels.end();  ++p)
     delete p->second;
 }
 
 AssemblyProgram::~AssemblyProgram() {
   for (size_t i = 0;  i < instructions_.size();  ++i) {
     Instruction* instruction = instructions_[i];
@@ skipping 102 matching lines @@
   // An address table compresses best when each index is associated with an
   // address that is slight larger than the previous index.
 
   // First see which indexes have not been used.  The 'available' vector could
   // grow even bigger, but the number of addresses is a better starting size
   // than empty.
   std::vector<bool> available(labels->size(), true);
   int used = 0;
 
   for (RVAToLabel::iterator p = labels->begin();  p != labels->end();  ++p) {
-    size_t index = p->second->index_;
+    int index = p->second->index_;
     if (index != Label::kNoIndex) {
-      while (index >= available.size())
+      while (static_cast<size_t>(index) >= available.size())
         available.push_back(true);
       available.at(index) = false;
       ++used;
     }
   }
 
   LOG(INFO) << used << " of " << labels->size() << " labels pre-assigned";
 
   // Are there any unused labels that happen to be adjacent following a used
   // label?
@@ skipping 12 matching lines @@
         ++fill_forward_count;
       }
     }
     prev = current;
   }
 
   // Are there any unused labels that happen to be adjacent preceeding a used
   // label?
   //
   int fill_backward_count = 0;
-  int backward_refs = 0;
   prev = 0;
   for (RVAToLabel::reverse_iterator p = labels->rbegin();
        p != labels->rend();
        ++p) {
     Label* current = p->second;
     if (current->index_ == Label::kNoIndex) {
       int prev_index;
       if (prev)
         prev_index = prev->index_;
       else
@@ skipping 105 matching lines @@
   EncodedProgram *encoded = program->Encode();
   if (encoded) {
     *output = encoded;
     return C_OK;
   } else {
     return C_GENERAL_ERROR;
   }
 }
 
 }  // namespace courgette