One time whitespace fixup.

for f in $(find src include -name '*.[ch]'); do
  expand -t 8 $f > $tmp; mv $tmp $f;
done

10 files changed, 120 insertions, 120 deletions

diff --git a/src/aarch64/Gget_save_loc.c b/src/aarch64/Gget_save_loc.c
index c76eb9c8..5ccf5cfd 100644
--- a/src/aarch64/Gget_save_loc.c
+++ b/src/aarch64/Gget_save_loc.c
@@ -72,7 +72,7 @@ unw_get_save_loc (unw_cursor_t *cursor, int reg, unw_save_loc_t *sloc)
       break;
 
     default:
-      loc = DWARF_NULL_LOC;	/* default to "not saved" */
+      loc = DWARF_NULL_LOC;     /* default to "not saved" */
       break;
     }
 
diff --git a/src/aarch64/Gglobal.c b/src/aarch64/Gglobal.c
index b0a7e268..72e36b2d 100644
--- a/src/aarch64/Gglobal.c
+++ b/src/aarch64/Gglobal.c
@@ -50,7 +50,7 @@ tdep_init (void)
 #ifndef UNW_REMOTE_ONLY
     aarch64_local_addr_space_init ();
 #endif
-    tdep_init_done = 1;	/* signal that we're initialized... */
+    tdep_init_done = 1; /* signal that we're initialized... */
   }
  out:
   lock_release (&aarch64_lock, saved_mask);
diff --git a/src/aarch64/Ginit.c b/src/aarch64/Ginit.c
index 3c821b2d..0bc89971 100644
--- a/src/aarch64/Ginit.c
+++ b/src/aarch64/Ginit.c
@@ -74,7 +74,7 @@ put_unwind_info (unw_addr_space_t as, unw_proc_info_t *proc_info, void *arg)
 
 static int
 get_dyn_info_list_addr (unw_addr_space_t as, unw_word_t *dyn_info_list_addr,
-			void *arg)
+                        void *arg)
 {
   *dyn_info_list_addr = (unw_word_t) &_U_dyn_info_list;
   return 0;
@@ -82,7 +82,7 @@ get_dyn_info_list_addr (unw_addr_space_t as, unw_word_t *dyn_info_list_addr,
 
 static int
 access_mem (unw_addr_space_t as, unw_word_t addr, unw_word_t *val, int write,
-	    void *arg)
+            void *arg)
 {
   if (write)
     {
@@ -99,7 +99,7 @@ access_mem (unw_addr_space_t as, unw_word_t addr, unw_word_t *val, int write,
 
 static int
 access_reg (unw_addr_space_t as, unw_regnum_t reg, unw_word_t *val, int write,
-	    void *arg)
+            void *arg)
 {
   unw_word_t *addr;
   ucontext_t *uc = arg;
@@ -129,7 +129,7 @@ access_reg (unw_addr_space_t as, unw_regnum_t reg, unw_word_t *val, int write,
 
 static int
 access_fpreg (unw_addr_space_t as, unw_regnum_t reg, unw_fpreg_t *val,
-	      int write, void *arg)
+              int write, void *arg)
 {
   ucontext_t *uc = arg;
   unw_fpreg_t *addr;
@@ -143,14 +143,14 @@ access_fpreg (unw_addr_space_t as, unw_regnum_t reg, unw_fpreg_t *val,
   if (write)
     {
       Debug (12, "%s <- %08lx.%08lx.%08lx\n", unw_regname (reg),
-	     ((long *)val)[0], ((long *)val)[1], ((long *)val)[2]);
+             ((long *)val)[0], ((long *)val)[1], ((long *)val)[2]);
       *(unw_fpreg_t *) addr = *val;
     }
   else
     {
       *val = *(unw_fpreg_t *) addr;
       Debug (12, "%s -> %08lx.%08lx.%08lx\n", unw_regname (reg),
-	     ((long *)val)[0], ((long *)val)[1], ((long *)val)[2]);
+             ((long *)val)[0], ((long *)val)[1], ((long *)val)[2]);
     }
   return 0;
 
@@ -162,8 +162,8 @@ access_fpreg (unw_addr_space_t as, unw_regnum_t reg, unw_fpreg_t *val,
 
 static int
 get_static_proc_name (unw_addr_space_t as, unw_word_t ip,
-		      char *buf, size_t buf_len, unw_word_t *offp,
-		      void *arg)
+                      char *buf, size_t buf_len, unw_word_t *offp,
+                      void *arg)
 {
   return _Uelf64_get_proc_name (as, getpid (), ip, buf, buf_len, offp);
 }
diff --git a/src/aarch64/Gregs.c b/src/aarch64/Gregs.c
index 0f6b9c67..6288275b 100644
--- a/src/aarch64/Gregs.c
+++ b/src/aarch64/Gregs.c
@@ -28,7 +28,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
 
 HIDDEN int
 tdep_access_reg (struct cursor *c, unw_regnum_t reg, unw_word_t *valp,
-		 int write)
+                 int write)
 {
   dwarf_loc_t loc = DWARF_NULL_LOC;
   unsigned int mask;
@@ -106,7 +106,7 @@ tdep_access_reg (struct cursor *c, unw_regnum_t reg, unw_word_t *valp,
 
 HIDDEN int
 tdep_access_fpreg (struct cursor *c, unw_regnum_t reg, unw_fpreg_t *valp,
-		   int write)
+                   int write)
 {
   Debug (1, "bad register number %u\n", reg);
   return -UNW_EBADREG;
diff --git a/src/aarch64/Gresume.c b/src/aarch64/Gresume.c
index 07f2f2b4..57e72abf 100644
--- a/src/aarch64/Gresume.c
+++ b/src/aarch64/Gresume.c
@@ -39,7 +39,7 @@ aarch64_local_resume (unw_addr_space_t as, unw_cursor_t *cursor, void *arg)
   if (c->sigcontext_format == AARCH64_SCF_NONE)
     {
       /* Since there are no signals involved here we restore the non scratch
-	 registers only.  */
+         registers only.  */
       unsigned long regs[11];
       regs[0] = uc->uc_mcontext.regs[19];
       regs[1] = uc->uc_mcontext.regs[20];
@@ -143,15 +143,15 @@ establish_machine_state (struct cursor *c)
     {
       Debug (16, "copying %s %d\n", unw_regname (reg), reg);
       if (unw_is_fpreg (reg))
-	{
-	  if (tdep_access_fpreg (c, reg, &fpval, 0) >= 0)
-	    as->acc.access_fpreg (as, reg, &fpval, 1, arg);
-	}
+        {
+          if (tdep_access_fpreg (c, reg, &fpval, 0) >= 0)
+            as->acc.access_fpreg (as, reg, &fpval, 1, arg);
+        }
       else
-	{
-	  if (tdep_access_reg (c, reg, &val, 0) >= 0)
-	    as->acc.access_reg (as, reg, &val, 1, arg);
-	}
+        {
+          if (tdep_access_reg (c, reg, &val, 0) >= 0)
+            as->acc.access_reg (as, reg, &val, 1, arg);
+        }
     }
 }
 
@@ -165,7 +165,7 @@ unw_resume (unw_cursor_t *cursor)
   if (!c->dwarf.ip)
     {
       /* This can happen easily when the frame-chain gets truncated
-	 due to bad or missing unwind-info.  */
+         due to bad or missing unwind-info.  */
       Debug (1, "refusing to resume execution at address 0\n");
       return -UNW_EINVAL;
     }
@@ -173,5 +173,5 @@ unw_resume (unw_cursor_t *cursor)
   establish_machine_state (c);
 
   return (*c->dwarf.as->acc.resume) (c->dwarf.as, (unw_cursor_t *) c,
-				     c->dwarf.as_arg);
+                                     c->dwarf.as_arg);
 }
diff --git a/src/aarch64/Gstash_frame.c b/src/aarch64/Gstash_frame.c
index da1ff2cb..9c1a54d4 100644
--- a/src/aarch64/Gstash_frame.c
+++ b/src/aarch64/Gstash_frame.c
@@ -1,7 +1,7 @@
 /* libunwind - a platform-independent unwind library
    Copyright (C) 2010, 2011 by FERMI NATIONAL ACCELERATOR LABORATORY
    Copyright (C) 2014 CERN and Aalto University
-	Contributed by Filip Nyback
+        Contributed by Filip Nyback
 
 This file is part of libunwind.
 
@@ -33,16 +33,16 @@ tdep_stash_frame (struct dwarf_cursor *d, struct dwarf_reg_state *rs)
   unw_tdep_frame_t *f = &c->frame_info;
 
   Debug (4, "ip=0x%lx cfa=0x%lx type %d cfa [where=%d val=%ld] cfaoff=%ld"
-	 " ra=0x%lx fp [where=%d val=%ld @0x%lx] lr [where=%d val=%ld @0x%lx] "
-	 "sp [where=%d val=%ld @0x%lx]\n",
-	 d->ip, d->cfa, f->frame_type,
-	 rs->reg[DWARF_CFA_REG_COLUMN].where,
-	 rs->reg[DWARF_CFA_REG_COLUMN].val,
-	 rs->reg[DWARF_CFA_OFF_COLUMN].val,
-	 DWARF_GET_LOC(d->loc[d->ret_addr_column]),
-	 rs->reg[FP].where, rs->reg[FP].val, DWARF_GET_LOC(d->loc[FP]),
-	 rs->reg[LR].where, rs->reg[LR].val, DWARF_GET_LOC(d->loc[LR]),
-	 rs->reg[SP].where, rs->reg[SP].val, DWARF_GET_LOC(d->loc[SP]));
+         " ra=0x%lx fp [where=%d val=%ld @0x%lx] lr [where=%d val=%ld @0x%lx] "
+         "sp [where=%d val=%ld @0x%lx]\n",
+         d->ip, d->cfa, f->frame_type,
+         rs->reg[DWARF_CFA_REG_COLUMN].where,
+         rs->reg[DWARF_CFA_REG_COLUMN].val,
+         rs->reg[DWARF_CFA_OFF_COLUMN].val,
+         DWARF_GET_LOC(d->loc[d->ret_addr_column]),
+         rs->reg[FP].where, rs->reg[FP].val, DWARF_GET_LOC(d->loc[FP]),
+         rs->reg[LR].where, rs->reg[LR].val, DWARF_GET_LOC(d->loc[LR]),
+         rs->reg[SP].where, rs->reg[SP].val, DWARF_GET_LOC(d->loc[SP]));
 
   /* A standard frame is defined as:
       - CFA is register-relative offset off FP or SP;
@@ -53,24 +53,24 @@ tdep_stash_frame (struct dwarf_cursor *d, struct dwarf_reg_state *rs)
   if (f->frame_type == UNW_AARCH64_FRAME_OTHER
       && (rs->reg[DWARF_CFA_REG_COLUMN].where == DWARF_WHERE_REG)
       && (rs->reg[DWARF_CFA_REG_COLUMN].val == FP
-	  || rs->reg[DWARF_CFA_REG_COLUMN].val == SP)
+          || rs->reg[DWARF_CFA_REG_COLUMN].val == SP)
       && labs(rs->reg[DWARF_CFA_OFF_COLUMN].val) < (1 << 29)
       && d->ret_addr_column == LR
       && (rs->reg[FP].where == DWARF_WHERE_UNDEF
-	  || rs->reg[FP].where == DWARF_WHERE_SAME
-	  || (rs->reg[FP].where == DWARF_WHERE_CFAREL
-	      && labs(rs->reg[FP].val) < (1 << 29)
-	      && rs->reg[FP].val+1 != 0))
+          || rs->reg[FP].where == DWARF_WHERE_SAME
+          || (rs->reg[FP].where == DWARF_WHERE_CFAREL
+              && labs(rs->reg[FP].val) < (1 << 29)
+              && rs->reg[FP].val+1 != 0))
       && (rs->reg[LR].where == DWARF_WHERE_UNDEF
-	  || rs->reg[LR].where == DWARF_WHERE_SAME
-	  || (rs->reg[LR].where == DWARF_WHERE_CFAREL
-	      && labs(rs->reg[LR].val) < (1 << 29)
-	      && rs->reg[LR].val+1 != 0))
+          || rs->reg[LR].where == DWARF_WHERE_SAME
+          || (rs->reg[LR].where == DWARF_WHERE_CFAREL
+              && labs(rs->reg[LR].val) < (1 << 29)
+              && rs->reg[LR].val+1 != 0))
       && (rs->reg[SP].where == DWARF_WHERE_UNDEF
-	  || rs->reg[SP].where == DWARF_WHERE_SAME
-	  || (rs->reg[SP].where == DWARF_WHERE_CFAREL
-	      && labs(rs->reg[SP].val) < (1 << 29)
-	      && rs->reg[SP].val+1 != 0)))
+          || rs->reg[SP].where == DWARF_WHERE_SAME
+          || (rs->reg[SP].where == DWARF_WHERE_CFAREL
+              && labs(rs->reg[SP].val) < (1 << 29)
+              && rs->reg[SP].val+1 != 0)))
   {
     /* Save information for a standard frame. */
     f->frame_type = UNW_AARCH64_FRAME_STANDARD;
diff --git a/src/aarch64/Gstep.c b/src/aarch64/Gstep.c
index 61891f82..0c35f986 100644
--- a/src/aarch64/Gstep.c
+++ b/src/aarch64/Gstep.c
@@ -112,7 +112,7 @@ unw_step (unw_cursor_t *cursor)
   int ret;
 
   Debug (1, "(cursor=%p, ip=0x%016lx, cfa=0x%016lx))\n",
-	 c, c->dwarf.ip, c->dwarf.cfa);
+         c, c->dwarf.ip, c->dwarf.cfa);
 
   /* Check if this is a signal frame. */
   if (unw_is_signal_frame (cursor))
diff --git a/src/aarch64/Gtrace.c b/src/aarch64/Gtrace.c
index c64cc764..c67faf0e 100644
--- a/src/aarch64/Gtrace.c
+++ b/src/aarch64/Gtrace.c
@@ -1,7 +1,7 @@
 /* libunwind - a platform-independent unwind library
    Copyright (C) 2010, 2011 by FERMI NATIONAL ACCELERATOR LABORATORY
    Copyright (C) 2014 CERN and Aalto University
-	Contributed by Filip Nyback
+        Contributed by Filip Nyback
 
 This file is part of libunwind.
 
@@ -43,7 +43,7 @@ typedef struct
   size_t log_size;
   size_t used;
   size_t dtor_count;  /* Counts how many times our destructor has already
-			 been called. */
+                         been called. */
 } unw_trace_cache_t;
 
 static const unw_tdep_frame_t empty_frame = { 0, UNW_AARCH64_FRAME_OTHER, -1, -1, 0, -1, -1, -1 };
@@ -65,7 +65,7 @@ trace_cache_free (void *arg)
     /* Not yet our turn to get destroyed. Re-install ourselves into the key. */
     pthread_setspecific(trace_cache_key, cache);
     Debug(5, "delayed freeing cache %p (%zx to go)\n", cache,
-	  PTHREAD_DESTRUCTOR_ITERATIONS - cache->dtor_count);
+          PTHREAD_DESTRUCTOR_ITERATIONS - cache->dtor_count);
     return;
   }
   tls_cache_destroyed = 1;
@@ -111,7 +111,7 @@ trace_cache_create (void)
     /* The current thread is in the process of exiting. Don't recreate
        cache, as we wouldn't have another chance to free it. */
     Debug(5, "refusing to reallocate cache: "
-	     "thread-locals are being deallocated\n");
+             "thread-locals are being deallocated\n");
     return NULL;
   }
 
@@ -214,11 +214,11 @@ trace_cache_get (void)
    highly unusual unwind info which uses these creatively. */
 static unw_tdep_frame_t *
 trace_init_addr (unw_tdep_frame_t *f,
-		 unw_cursor_t *cursor,
-		 unw_word_t cfa,
-		 unw_word_t pc,
-		 unw_word_t fp,
-		 unw_word_t sp)
+                 unw_cursor_t *cursor,
+                 unw_word_t cfa,
+                 unw_word_t pc,
+                 unw_word_t fp,
+                 unw_word_t sp)
 {
   struct cursor *c = (struct cursor *) cursor;
   struct dwarf_cursor *d = &c->dwarf;
@@ -261,9 +261,9 @@ trace_init_addr (unw_tdep_frame_t *f,
     f->last_frame = -1;
 
   Debug (3, "frame va %lx type %d last %d cfa %s+%d fp @ cfa%+d lr @ cfa%+d sp @ cfa%+d\n",
-	 f->virtual_address, f->frame_type, f->last_frame,
-	 f->cfa_reg_sp ? "sp" : "fp", f->cfa_reg_offset,
-	 f->fp_cfa_offset, f->lr_cfa_offset, f->sp_cfa_offset);
+         f->virtual_address, f->frame_type, f->last_frame,
+         f->cfa_reg_sp ? "sp" : "fp", f->cfa_reg_offset,
+         f->fp_cfa_offset, f->lr_cfa_offset, f->sp_cfa_offset);
 
   return f;
 }
@@ -274,11 +274,11 @@ trace_init_addr (unw_tdep_frame_t *f,
    frame cache slot which describes RIP. */
 static unw_tdep_frame_t *
 trace_lookup (unw_cursor_t *cursor,
-	      unw_trace_cache_t *cache,
-	      unw_word_t cfa,
-	      unw_word_t pc,
-	      unw_word_t fp,
-	      unw_word_t sp)
+              unw_trace_cache_t *cache,
+              unw_word_t cfa,
+              unw_word_t pc,
+              unw_word_t fp,
+              unw_word_t sp)
 {
   /* First look up for previously cached information using cache as
      linear probing hash table with probe step of 1.  Majority of
@@ -441,7 +441,7 @@ tdep_trace (unw_cursor_t *cursor, void **buffer, int *size)
   {
     pc -= d->use_prev_instr;
     Debug (2, "depth %d cfa 0x%lx pc 0x%lx sp 0x%lx fp 0x%lx\n",
-	   depth, cfa, pc, sp, fp);
+           depth, cfa, pc, sp, fp);
 
     /* See if we have this address cached.  If not, evaluate enough of
        the dwarf unwind information to fill the cache line data, or to
@@ -483,7 +483,7 @@ tdep_trace (unw_cursor_t *cursor, void **buffer, int *size)
       /* Advance standard traceable frame. */
       cfa = (f->cfa_reg_sp ? sp : fp) + f->cfa_reg_offset;
       if (likely(f->lr_cfa_offset != -1))
-	ACCESS_MEM_FAST(ret, c->validate, d, cfa + f->lr_cfa_offset, pc);
+        ACCESS_MEM_FAST(ret, c->validate, d, cfa + f->lr_cfa_offset, pc);
       else if (lr != 0)
       {
         /* Use the saved link register as the new pc. */
@@ -491,7 +491,7 @@ tdep_trace (unw_cursor_t *cursor, void **buffer, int *size)
         lr = 0;
       }
       if (likely(ret >= 0) && likely(f->fp_cfa_offset != -1))
-	ACCESS_MEM_FAST(ret, c->validate, d, cfa + f->fp_cfa_offset, fp);
+        ACCESS_MEM_FAST(ret, c->validate, d, cfa + f->fp_cfa_offset, fp);
 
       /* Don't bother reading SP from DWARF, CFA becomes new SP. */
       sp = cfa;
@@ -523,14 +523,14 @@ tdep_trace (unw_cursor_t *cursor, void **buffer, int *size)
 
     default:
       /* We cannot trace through this frame, give up and tell the
-	  caller we had to stop.  Data collected so far may still be
-	  useful to the caller, so let it know how far we got.  */
+          caller we had to stop.  Data collected so far may still be
+          useful to the caller, so let it know how far we got.  */
       ret = -UNW_ESTOPUNWIND;
       break;
     }
 
     Debug (4, "new cfa 0x%lx pc 0x%lx sp 0x%lx fp 0x%lx\n",
-	   cfa, pc, sp, fp);
+           cfa, pc, sp, fp);
 
     /* If we failed or ended up somewhere bogus, stop. */
     if (unlikely(ret < 0 || pc < 0x4000))
diff --git a/src/aarch64/offsets.h b/src/aarch64/offsets.h
index 81aa74f4..e78251d0 100644
--- a/src/aarch64/offsets.h
+++ b/src/aarch64/offsets.h
@@ -4,46 +4,46 @@
 
 /* Offsets for AArch64 Linux "ucontext_t":  */
 
-#define LINUX_UC_FLAGS_OFF	0x0
-#define LINUX_UC_LINK_OFF	0x8
-#define LINUX_UC_STACK_OFF	0x10
-#define LINUX_UC_SIGMASK_OFF	0x28
-#define LINUX_UC_MCONTEXT_OFF	0xb0
+#define LINUX_UC_FLAGS_OFF      0x0
+#define LINUX_UC_LINK_OFF       0x8
+#define LINUX_UC_STACK_OFF      0x10
+#define LINUX_UC_SIGMASK_OFF    0x28
+#define LINUX_UC_MCONTEXT_OFF   0xb0
 
 /* Offsets for AArch64 Linux "struct sigcontext":  */
 
-#define LINUX_SC_FAULTADDRESS_OFF	0x00
-#define LINUX_SC_X0_OFF		0x008
-#define LINUX_SC_X1_OFF		0x010
-#define LINUX_SC_X2_OFF		0x018
-#define LINUX_SC_X3_OFF		0x020
-#define LINUX_SC_X4_OFF		0x028
-#define LINUX_SC_X5_OFF		0x030
-#define LINUX_SC_X6_OFF		0x038
-#define LINUX_SC_X7_OFF		0x040
-#define LINUX_SC_X8_OFF		0x048
-#define LINUX_SC_X9_OFF		0x050
-#define LINUX_SC_X10_OFF	0x058
-#define LINUX_SC_X11_OFF	0x060
-#define LINUX_SC_X12_OFF	0x068
-#define LINUX_SC_X13_OFF	0x070
-#define LINUX_SC_X14_OFF	0x078
-#define LINUX_SC_X15_OFF	0x080
-#define LINUX_SC_X16_OFF	0x088
-#define LINUX_SC_X17_OFF	0x090
-#define LINUX_SC_X18_OFF	0x098
-#define LINUX_SC_X19_OFF	0x0a0
-#define LINUX_SC_X20_OFF	0x0a8
-#define LINUX_SC_X21_OFF	0x0b0
-#define LINUX_SC_X22_OFF	0x0b8
-#define LINUX_SC_X23_OFF	0x0c0
-#define LINUX_SC_X24_OFF	0x0c8
-#define LINUX_SC_X25_OFF	0x0d0
-#define LINUX_SC_X26_OFF	0x0d8
-#define LINUX_SC_X27_OFF	0x0e0
-#define LINUX_SC_X28_OFF	0x0e8
-#define LINUX_SC_X29_OFF	0x0f0
-#define LINUX_SC_X30_OFF	0x0f8
-#define LINUX_SC_SP_OFF		0x100
-#define LINUX_SC_PC_OFF		0x108
-#define LINUX_SC_PSTATE_OFF	0x110
+#define LINUX_SC_FAULTADDRESS_OFF       0x00
+#define LINUX_SC_X0_OFF         0x008
+#define LINUX_SC_X1_OFF         0x010
+#define LINUX_SC_X2_OFF         0x018
+#define LINUX_SC_X3_OFF         0x020
+#define LINUX_SC_X4_OFF         0x028
+#define LINUX_SC_X5_OFF         0x030
+#define LINUX_SC_X6_OFF         0x038
+#define LINUX_SC_X7_OFF         0x040
+#define LINUX_SC_X8_OFF         0x048
+#define LINUX_SC_X9_OFF         0x050
+#define LINUX_SC_X10_OFF        0x058
+#define LINUX_SC_X11_OFF        0x060
+#define LINUX_SC_X12_OFF        0x068
+#define LINUX_SC_X13_OFF        0x070
+#define LINUX_SC_X14_OFF        0x078
+#define LINUX_SC_X15_OFF        0x080
+#define LINUX_SC_X16_OFF        0x088
+#define LINUX_SC_X17_OFF        0x090
+#define LINUX_SC_X18_OFF        0x098
+#define LINUX_SC_X19_OFF        0x0a0
+#define LINUX_SC_X20_OFF        0x0a8
+#define LINUX_SC_X21_OFF        0x0b0
+#define LINUX_SC_X22_OFF        0x0b8
+#define LINUX_SC_X23_OFF        0x0c0
+#define LINUX_SC_X24_OFF        0x0c8
+#define LINUX_SC_X25_OFF        0x0d0
+#define LINUX_SC_X26_OFF        0x0d8
+#define LINUX_SC_X27_OFF        0x0e0
+#define LINUX_SC_X28_OFF        0x0e8
+#define LINUX_SC_X29_OFF        0x0f0
+#define LINUX_SC_X30_OFF        0x0f8
+#define LINUX_SC_SP_OFF         0x100
+#define LINUX_SC_PC_OFF         0x108
+#define LINUX_SC_PSTATE_OFF     0x110
diff --git a/src/aarch64/unwind_i.h b/src/aarch64/unwind_i.h
index 2bea8f3d..79b342cd 100644
--- a/src/aarch64/unwind_i.h
+++ b/src/aarch64/unwind_i.h
@@ -33,19 +33,19 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
 #include "libunwind_i.h"
 
 /* DWARF column numbers for AArch64: */
-#define X29	29
-#define FP	29
-#define X30	30
-#define LR	30
-#define SP	31
+#define X29     29
+#define FP      29
+#define X30     30
+#define LR      30
+#define SP      31
 
-#define aarch64_lock			UNW_OBJ(lock)
-#define aarch64_local_resume		UNW_OBJ(local_resume)
-#define aarch64_local_addr_space_init	UNW_OBJ(local_addr_space_init)
+#define aarch64_lock                    UNW_OBJ(lock)
+#define aarch64_local_resume            UNW_OBJ(local_resume)
+#define aarch64_local_addr_space_init   UNW_OBJ(local_addr_space_init)
 
 extern void aarch64_local_addr_space_init (void);
 extern int aarch64_local_resume (unw_addr_space_t as, unw_cursor_t *cursor,
-			     void *arg);
+                             void *arg);
 
 /* By-pass calls to access_mem() when known to be safe. */
 #ifdef UNW_LOCAL_ONLY