From af4e8ef9443e258ebeb0ddf3c5c9579f24dfacd5 Mon Sep 17 00:00:00 2001
From: Richard Henderson <rth@redhat.com>
Date: Sun, 25 May 2014 13:00:00 -0400
Subject: [PATCH] aarch64: Tabify sysdep-cancel.h

---
 ChangeLog                                     |   5 +
 .../sysv/linux/aarch64/nptl/sysdep-cancel.h   | 102 +++++++++---------
 2 files changed, 56 insertions(+), 51 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a93d36717a..9bc50c34ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-29  Richard Henderson  <rth@twiddle.net>
+
+	* sysdeps/unix/sysv/linux/aarch64/nptl/sysdep-cancel.h: Adjust
+	whitespace; tabs before and after asm mnemonics.
+
 2014-05-29  Eric Wong  <normalperson@yhbt.net>
 
 	[BZ #15132]
diff --git a/sysdeps/unix/sysv/linux/aarch64/nptl/sysdep-cancel.h b/sysdeps/unix/sysv/linux/aarch64/nptl/sysdep-cancel.h
index c300b2d4ac..26d4c0ec8b 100644
--- a/sysdeps/unix/sysv/linux/aarch64/nptl/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/aarch64/nptl/sysdep-cancel.h
@@ -26,42 +26,42 @@
 
 # undef PSEUDO
 # define PSEUDO(name, syscall_name, args)				\
-  .section ".text";							\
-  .type __##syscall_name##_nocancel,%function;				\
-  .globl __##syscall_name##_nocancel;					\
-  __##syscall_name##_nocancel:						\
-    cfi_startproc;							\
-    DO_CALL (syscall_name, args);					\
-    cmn x0, 4095;							\
-    b.cs .Lsyscall_error;						\
-    PSEUDO_RET;								\
-    cfi_endproc;							\
-    .size __##syscall_name##_nocancel,.-__##syscall_name##_nocancel;	\
-  ENTRY (name);								\
-    SINGLE_THREAD_P;							\
-    bne .Lpseudo_cancel;						\
-    DO_CALL (syscall_name, 0);						\
-    cmn x0, 4095;							\
-    b.cs .Lsyscall_error;						\
-    PSEUDO_RET;								\
-  .Lpseudo_cancel:							\
-    DOCARGS_##args;	/* save syscall args etc. around CENABLE.  */	\
-    CENABLE;								\
-    mov x16, x0;	/* put mask in safe place.  */			\
-    UNDOCARGS_##args;	/* restore syscall args.  */			\
-    mov x8, SYS_ify (syscall_name);	/* do the call.  */		\
-    svc	0;								\
-    str x0, [sp, -16]!;	/* save syscall return value.  */		\
-    cfi_adjust_cfa_offset (16);						\
-    mov x0, x16;	 /* get mask back.  */				\
-    CDISABLE;								\
-    ldr x0, [sp], 16;							\
-    cfi_adjust_cfa_offset (-16);					\
-    ldr x30, [sp], 16;							\
-    cfi_adjust_cfa_offset (-16);					\
-    cfi_restore (x30);							\
-    cmn x0, 4095;							\
-    b.cs .Lsyscall_error;
+	.section ".text";						\
+	.type	__##syscall_name##_nocancel,%function;			\
+	.globl	__##syscall_name##_nocancel;				\
+__##syscall_name##_nocancel:						\
+	cfi_startproc;							\
+	DO_CALL (syscall_name, args);					\
+	cmn	x0, 4095;						\
+	b.cs	.Lsyscall_error;					\
+	PSEUDO_RET;							\
+	cfi_endproc;							\
+	.size __##syscall_name##_nocancel,.-__##syscall_name##_nocancel; \
+ENTRY (name);								\
+	SINGLE_THREAD_P;						\
+	bne .Lpseudo_cancel;						\
+	DO_CALL (syscall_name, 0);					\
+	cmn x0, 4095;							\
+	b.cs .Lsyscall_error;						\
+	PSEUDO_RET;							\
+.Lpseudo_cancel:							\
+	DOCARGS_##args;	/* save syscall args etc. around CENABLE.  */	\
+	CENABLE;							\
+	mov	x16, x0;	/* put mask in safe place.  */		\
+	UNDOCARGS_##args;	/* restore syscall args.  */		\
+	mov	x8, SYS_ify (syscall_name);	/* do the call.  */	\
+	svc	0;							\
+	str	x0, [sp, -16]!;	/* save syscall return value.  */	\
+	cfi_adjust_cfa_offset (16);					\
+	mov	x0, x16;	 /* get mask back.  */			\
+	CDISABLE;							\
+	ldr	x0, [sp], 16;						\
+	cfi_adjust_cfa_offset (-16);					\
+	ldr	x30, [sp], 16;						\
+	cfi_adjust_cfa_offset (-16);					\
+	cfi_restore (x30);						\
+	cmn	x0, 4095;						\
+	b.cs	.Lsyscall_error;
 
 # define DOCARGS_0							\
 	str x30, [sp, -16]!;						\
@@ -162,9 +162,9 @@ extern int __local_multiple_threads attribute_hidden;
 #   define SINGLE_THREAD_P __builtin_expect (__local_multiple_threads == 0, 1)
 #  else
 #   define SINGLE_THREAD_P						\
-  adrp	x16, __local_multiple_threads;					\
-  ldr	w16, [x16, :lo12:__local_multiple_threads];			\
-  cmp	w16, 0;
+	adrp	x16, __local_multiple_threads;				\
+	ldr	w16, [x16, :lo12:__local_multiple_threads];		\
+	cmp	w16, 0;
 #  endif
 # else
 /*  There is no __local_multiple_threads for librt, so use the TCB.  */
@@ -174,18 +174,18 @@ extern int __local_multiple_threads attribute_hidden;
 				   header.multiple_threads) == 0, 1)
 #  else
 #   define SINGLE_THREAD_P						\
-  stp	x0, x30, [sp, -16]!;						\
-  cfi_adjust_cfa_offset (16);						\
-  cfi_rel_offset (x0, 0);						\
-  cfi_rel_offset (x30, 8);						\
-  bl	__read_tp;							\
-  sub	x0, x0, PTHREAD_SIZEOF;						\
-  ldr	w16, [x0, PTHREAD_MULTIPLE_THREADS_OFFSET];			\
-  ldp	x0, x30, [sp], 16;						\
-  cfi_restore (x0);							\
-  cfi_restore (x30);							\
-  cfi_adjust_cfa_offset (-16);						\
-  cmp	w16, 0
+	stp	x0, x30, [sp, -16]!;					\
+	cfi_adjust_cfa_offset (16);					\
+	cfi_rel_offset (x0, 0);						\
+	cfi_rel_offset (x30, 8);					\
+	bl	__read_tp;						\
+	sub	x0, x0, PTHREAD_SIZEOF;					\
+	ldr	w16, [x0, PTHREAD_MULTIPLE_THREADS_OFFSET];		\
+	ldp	x0, x30, [sp], 16;					\
+	cfi_restore (x0);						\
+	cfi_restore (x30);						\
+	cfi_adjust_cfa_offset (-16);					\
+	cmp	w16, 0;
 #  endif
 # endif
 
-- 
2.43.5