Update the verifier to work with both gold and ld produced binaries.

src/trusted/service_runtime/elf_util.c

 /*
  * Copyright 2009 The Native Client Authors.  All rights reserved.
  * Use of this source code is governed by a BSD-style license that can
  * be found in the LICENSE file.
  */
 
 /*
  * NaCl helper functions to deal with elf images
  */
 
@@ skipping 298 matching lines @@
           /* record our decision that we will load this segment */
 
           /*
            * NACL_TRAMPOLINE_END <= p_vaddr
            *                     <= p_vaddr + p_memsz
            *                     < ((uintptr_t) 1U << nap->addr_bits)
            */
           if (*max_vaddr < php->p_vaddr + php->p_memsz) {
             *max_vaddr = php->p_vaddr + php->p_memsz;
           }
-        }
 
-        switch (nacl_phdr_check_data[j].action) {
-          case PCA_NONE:
-            break;
-          case PCA_TEXT_CHECK:
-            if (0 == php->p_memsz) {
-              return LOAD_BAD_ELF_TEXT;
-            }
-            *static_text_end = NACL_TRAMPOLINE_END + php->p_filesz;
-            break;
-          case PCA_RODATA:
-            *rodata_start = php->p_vaddr;
-            *rodata_end = php->p_vaddr + php->p_memsz;
-            break;
-          case PCA_DATA:
-            *data_start = php->p_vaddr;
-            *data_end = php->p_vaddr + php->p_memsz;
-            break;
-          case PCA_IGNORE:
-            break;
+          switch (nacl_phdr_check_data[j].action) {
+            case PCA_NONE:
+              break;
+            case PCA_TEXT_CHECK:
+              if (0 == php->p_memsz) {
+                return LOAD_BAD_ELF_TEXT;
+              }
+              *static_text_end = NACL_TRAMPOLINE_END + php->p_filesz;
+              break;
+            case PCA_RODATA:
+              *rodata_start = php->p_vaddr;
+              *rodata_end = php->p_vaddr + php->p_memsz;
+              break;
+            case PCA_DATA:
+              *data_start = php->p_vaddr;
+              *data_end = php->p_vaddr + php->p_memsz;
+              break;
+            case PCA_IGNORE:
+              break;
+          }
         }
         goto next_seg;
       }
     }
     /* segment not in nacl_phdr_check_data */
     if (0 == php->p_memsz) {
       NaClLog(3, "Segment %d zero size: ignored\n", segnum);
       continue;
     }
     NaClLog(2,
@@ skipping 190 matching lines @@
     return 16;
    case EF_NACL_ALIGN_32:
     return 32;
    default:
 #if 0 == NACL_DANGEROUS_DEBUG_MODE_DISABLE_INNER_SANDBOX
     NaClLog(LOG_FATAL, "strange alignment");
 #endif
     return 0;
   }
 }