Make pnacl_generate_pexe=0 nonsfi_nacl=1 bitcode=1 work.

tests/common/register_set.h

 /*
  * Copyright (c) 2012 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.
  */
 
 #ifndef NATIVE_CLIENT_TESTS_COMMON_REGISTER_SET_H_
 #define NATIVE_CLIENT_TESTS_COMMON_REGISTER_SET_H_
 
 #include "native_client/src/include/nacl/nacl_exception.h"
@@ skipping 213 matching lines @@
  * def_func which saves all registers on the stack and passes them to
  * callee_func in the form of a "struct NaClSignalContext *".
  */
 
 #define REGS_SAVER_FUNC(def_func, callee_func) \
     void def_func(void); \
     REGS_SAVER_FUNC_NOPROTO(def_func, callee_func)
 
 #if NACL_ARCH(NACL_BUILD_ARCH) == NACL_x86 && NACL_BUILD_SUBARCH == 32
 
+#if defined(NONSFI_MODE) && NONSFI_MODE
+/*
+ * Look up GOT for PIC.
+ */
+#define STORE_PROG_CTR(def_func)                                \
+  "call 0f\n"                                                   \
+  "0: popl %eax\n"                                              \
+  "1: addl $_GLOBAL_OFFSET_TABLE_ + (1b - 0b), %eax\n"          \
+  "movl " #def_func "@GOT(%eax), %eax\n"                        \
+  "movl %eax, 0x20(%esp)\n"
+
+#else
+#define STORE_PROG_CTR(def_func) "movl $" #def_func ", 0x20(%esp)\n"
+#endif
+
 # define REGS_SAVER_FUNC_NOPROTO(def_func, callee_func) \
     void callee_func(struct NaClSignalContext *regs); \
     __asm__( \
         ".pushsection .text, \"ax\", @progbits\n" \
         ".p2align 5\n" \
         ".global " #def_func "\n"\
         #def_func ":\n" \
         /* Push most of "struct NaClSignalContext" in reverse order. */ \
         "push $0\n"  /* Leave space for flags */ \
-        "push $" #def_func "\n"  /* Fill out prog_ctr with known value */ \
+        /* TODO(uekawa): allow use of @got or use something else. */    \
+        "push $0 \n" /* Leave space for prog_ctr */ \
         "push %edi\n" \
         "push %esi\n" \
         "push %ebp\n" \
         "push %esp\n" \
         "push %ebx\n" \
         "push %edx\n" \
         "push %ecx\n" \
         "push %eax\n" \
         /* Save flags. */ \
         SAVE_X86_FLAGS_INTO_REG("%eax") \
         "movl %eax, 0x24(%esp)\n" \
+        STORE_PROG_CTR(def_func)  /* Fill out prog_ctr with known value */ \
         /* Adjust saved %esp value to account for preceding pushes. */ \
         "addl $5 * 4, 0x10(%esp)\n" \
         /* Save argument to callee_func() temporarily. */ \
         "mov %esp, %eax\n" \
         /* Align the stack pointer and leave space for an argument. */ \
         "pushl $0\n" \
         "and $~15, %esp\n" \
         /* Set argument to callee_func(). */ \
         "mov %eax, (%esp)\n" \
         "call " #callee_func "\n" \
@@ skipping 176 matching lines @@
 void RegsUnsetNonCalleeSavedRegisters(struct NaClSignalContext *regs);
 
 /*
  * For a function called with register state |regs|, extract the first
  * argument.  This is useful for a function entry point defined by
  * REGS_SAVER_FUNC.
  */
 uintptr_t RegsGetArg1(const struct NaClSignalContext *regs);
 
 #endif