x86_64: Fix tdep_init_done when built with libatomic_ops

Use correct size variable.
dougnazar · Apr 11, 2019 · 1b1cd9f · 1b1cd9f
1 parent f2931b3
commit 1b1cd9f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/include/tdep-x86_64/libunwind_i.h b/include/tdep-x86_64/libunwind_i.h
@@ -232,7 +232,11 @@ dwarf_put (struct dwarf_cursor *c, dwarf_loc_t loc, unw_word_t val)
 #define tdep_get_ip(c)                  ((c)->dwarf.ip)
 #define tdep_big_endian(as)             0
 
+#ifdef HAVE_ATOMIC_OPS_H
+extern AO_t tdep_init_done;
+#else
 extern int tdep_init_done;
+#endif
 
 extern void tdep_init (void);
 extern void tdep_init_mem_validate (void);

diff --git a/src/x86_64/Gglobal.c b/src/x86_64/Gglobal.c
@@ -30,7 +30,11 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
 #include "dwarf_i.h"
 
 HIDDEN define_lock (x86_64_lock);
-HIDDEN sig_atomic_t tdep_init_done;
+#ifdef HAVE_ATOMIC_OPS_H
+    HIDDEN AO_t tdep_init_done;
+#else
+    HIDDEN int tdep_init_done;
+#endif
 
 /* See comments for svr4_dbx_register_map[] in gcc/config/i386/i386.c.  */