Updated.cvs/libc-ud-970626

1997-06-26 21:50  Ulrich Drepper  <drepper@cygnus.com>

	* math/math.h: Move definition of macros for unordered comparison
	after inclusion of <bits/mathinline.h>.
	* sysdeps/i386/fpu/bits/mathinline.h: Don't undef macros for
	unordered comparison before definition.
	* sysdeps/m68k/fpu/bits/mathinline.h: Likewise.

	* Makerules: Move definition of load-map-file before use.
	(lib%.so): Depend on load-map-file, not lib%-map.

	* manual/lgpl.texinfo: Likewise.

1997-06-24 09:40  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* sysdeps/m68k/fpu/bits/mathinline.h: Don't define __ilogb.
	* sysdeps/m68k/fpu/s_ilogb.c: Define it here.  Handle zero, NaN
	and infinity specially.
	* sysdeps/m68k/fpu/s_ilogbf.c, sysdeps/m68k/fpu/s_ilogbl.c:
	Adapted.

	* sysdeps/m68k/fpu/bits/mathdef.h (FP_ILOGB0): Correct value.

1997-06-26 17:06  Ulrich Drepper  <drepper@cygnus.com>

	* configure.in: Don't use .long in tests since some strange
	platforms without binutils don't know this.
	Redirect output of test commands correctly.
	Patch by Klaus Espenlaub <kespenla@hydra.informatik.uni-ulm.de>.

	* hurd/hurdsig.c (_hurdsig_init): Call _hurd_self_sigstate.
	Patch by Kazumoto Kojima <kkojima@kk.info.kanagawa-u.ac.jp>.

1997-06-26 09:02  Fila Kolodny  <fila@ibi.com>

	* sysdeps/mach/hurd/abi-tag.h: New file.

	* sysdeps/mach/bits/libc-lock.h: Add typedef for __libc_key_t.
	* sysdeps/stub/bits/libc-lock.h: Likewise.

	* sysdeps/mach/hurd/accept.c (accept): Fix type of parameter addrarg.
	Add variable addr containing the desired part of the union.
	* sysdeps/mach/hurd/recvfrom.c (recvfrom): Likewise.
	* sysdeps/mach/hurd/getsockname.c (getsockname): Likewise.
	* sysdeps/mach/hurd/getpeername.c (getpeername): Likewise.
	* sysdeps/mach/hurd/connect.c (__connect): Likewise.
	* sysdeps/mach/hurd/bind.c (bind): Likewise.

	* sysdeps/mach/hurd/select.c (__select): Change MACH_MSG_SIZE_INTEGER_T
	to sizeof(MACH_MSG_TYPE_INTEGER_T).

	* io/ftw.c (ftw_startup): Use PATH_MAX only if defined.

	* sysdeps/mach/hurd/open.c (__open): Fix type of parameter file.

	* sysdeps/mach/hurd/sysd-stdio.c (__stdio_reopen): Add closefn to
	paramater list since it is used.

	* sysdeps/mach/hurd/rename.c (rename): Fix type of paramater new.

	* sysdeps/mach/hurd/sigaltstack.c (sigaltstack): Change parameter from
	ss to argss.

1997-06-24 14:02  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* Rules: Update copyright.
	* mach/Machrules: Likewise.

1997-06-26 14:28  Ulrich Drepper  <drepper@cygnus.com>

	* configure.in: Fix accidently removed AC_OUTPUT line.
	Reported by Andreas Jaeger.

	* time/strftime.c: Don't define `memcpy' macro if HAVE_MEMCPY is
	defined.  Reported by Akim Demaille <demaille@inf.enst.fr>.

	* sysdeps/generic/getdomain.c: Include handling for stub case.
	This eliminated the only case of a function in generic and stub.
	* sysdeps/stub/getdomain.c: Removed.
	Patch by Zack Weinberg <zack@rabi.phys.columbia.edu>.

1997-06-23 22:20  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* sysdeps/alpha/_mcount.S: Update and reformat copyright,
	remove trailing white spaces and send through unexpand.
	* sysdeps/alpha/bb_init_func.S: Likewise.
	* sysdeps/alpha/bzero.S: Likewise.
	* sysdeps/alpha/ffs.S: Likewise.
	* sysdeps/alpha/memset.S: Likewise.
	* sysdeps/alpha/s_fabs.S: Likewise.
	* sysdeps/alpha/strcmp.S: Likewise.
	* sysdeps/alpha/strlen.S: Likewise.
	* sysdeps/alpha/strncmp.S: Likewise.
	* sysdeps/alpha/strncpy.S: Likewise.
	* sysdeps/alpha/strrchr.S: Likewise.
	* sysdeps/alpha/stxcpy.S: Likewise.
	* sysdeps/alpha/stxncpy.S: Likewise.
	* sysdeps/alpha/elf/start.S: Likewise.
	* sysdeps/i386/strchr.S: Likewise.
	* sysdeps/m68k/bsd-_setjmp.S: Likewise.
	* sysdeps/m68k/bsd-setjmp.S: Likewise.
	* sysdeps/m68k/elf/start.S: Likewise.
	* sysdeps/mach/alpha/syscall.S: Likewise.
	* sysdeps/mach/i386/syscall.S: Likewise.
	* sysdeps/mips/elf/start.S: Likewise.
	* sysdeps/sparc/alloca.S: Likewise.
	* sysdeps/standalone/i386/start.S: Likewise.
	* sysdeps/standalone/i386/force_cpu386/strtsupp.S: Likewise.
	* sysdeps/standalone/i960/start.S: Likewise.
	* sysdeps/standalone/m68k/m68020/start.S: Likewise.
	* sysdeps/unix/_exit.S: Likewise.
	* sysdeps/unix/fork.S: Likewise.
	* sysdeps/unix/getegid.S: Likewise.
	* sysdeps/unix/geteuid.S: Likewise.
	* sysdeps/unix/getppid.S: Likewise.
	* sysdeps/unix/syscall.S: Likewise.
	* sysdeps/unix/arm/brk.S: Likewise.
	* sysdeps/unix/arm/fork.S: Likewise.
	* sysdeps/unix/bsd/hp/m68k/brk.S: Likewise.
	* sysdeps/unix/bsd/hp/m68k/vfork.S: Likewise.
	* sysdeps/unix/bsd/hp/m68k/wait3.S: Likewise.
	* sysdeps/unix/bsd/i386/vfork.S: Likewise.
	* sysdeps/unix/bsd/i386/wait3.S: Likewise.
	* sysdeps/unix/bsd/m68k/pipe.S: Likewise.
	* sysdeps/unix/bsd/m68k/syscall.S: Likewise.
	* sysdeps/unix/bsd/m68k/sysdep.S: Likewise.
	* sysdeps/unix/bsd/m68k/wait.S: Likewise.
	* sysdeps/unix/bsd/osf/alpha/brk.S: Likewise.
	* sysdeps/unix/bsd/osf/alpha/fork.S: Likewise.
	* sysdeps/unix/bsd/osf/alpha/killpg.S: Likewise.
	* sysdeps/unix/bsd/osf/alpha/pipe.S: Likewise.
	* sysdeps/unix/bsd/osf/alpha/recv.S: Likewise.
	* sysdeps/unix/bsd/osf/alpha/send.S: Likewise.
	* sysdeps/unix/bsd/osf/alpha/sigblock.S: Likewise.
	* sysdeps/unix/bsd/osf/alpha/sigpause.S: Likewise.
	* sysdeps/unix/bsd/osf/alpha/sigsetmask.S: Likewise.
	* sysdeps/unix/bsd/osf/alpha/sigvec.S: Likewise.
	* sysdeps/unix/bsd/osf/alpha/start.S: Likewise.
	* sysdeps/unix/bsd/osf/alpha/vhangup.S: Likewise.
	* sysdeps/unix/bsd/sequent/i386/getgroups.S: Likewise.
	* sysdeps/unix/bsd/sequent/i386/sigvec.S: Likewise.
	* sysdeps/unix/bsd/sequent/i386/syscall.S: Likewise.
	* sysdeps/unix/bsd/sun/sigreturn.S: Likewise.
	* sysdeps/unix/bsd/sun/m68k/brk.S: Likewise.
	* sysdeps/unix/bsd/sun/m68k/sethostid.S: Likewise.
	* sysdeps/unix/bsd/sun/m68k/syscall.S: Likewise.
	* sysdeps/unix/bsd/sun/m68k/vfork.S: Likewise.
	* sysdeps/unix/bsd/sun/sparc/sethostid.S: Likewise.
	* sysdeps/unix/bsd/ultrix4/wait3.S: Likewise.
	* sysdeps/unix/bsd/ultrix4/mips/__handler.S: Likewise.
	* sysdeps/unix/bsd/ultrix4/mips/start.S: Likewise.
	* sysdeps/unix/bsd/ultrix4/mips/vfork.S: Likewise.
	* sysdeps/unix/bsd/vax/brk.S: Likewise.
	* sysdeps/unix/bsd/vax/pipe.S: Likewise.
	* sysdeps/unix/bsd/vax/sysdep.S: Likewise.
	* sysdeps/unix/bsd/vax/vfork.S: Likewise.
	* sysdeps/unix/bsd/vax/wait.S: Likewise.
	* sysdeps/unix/bsd/vax/wait3.S: Likewise.
	* sysdeps/unix/i386/brk.S: Likewise.
	* sysdeps/unix/i386/fork.S: Likewise.
	* sysdeps/unix/i386/pipe.S: Likewise.
	* sysdeps/unix/i386/sigreturn.S: Likewise.
	* sysdeps/unix/i386/syscall.S: Likewise.
	* sysdeps/unix/i386/vfork.S: Likewise.
	* sysdeps/unix/i386/wait.S: Likewise.
	* sysdeps/unix/mips/brk.S: Likewise.
	* sysdeps/unix/mips/fork.S: Likewise.
	* sysdeps/unix/mips/pipe.S: Likewise.
	* sysdeps/unix/mips/sigreturn.S: Likewise.
	* sysdeps/unix/mips/sysdep.S: Likewise.
	* sysdeps/unix/mips/wait.S: Likewise.
	* sysdeps/unix/sparc/brk.S: Likewise.
	* sysdeps/unix/sparc/fork.S: Likewise.
	* sysdeps/unix/sparc/pipe.S: Likewise.
	* sysdeps/unix/sparc/sysdep.S: Likewise.
	* sysdeps/unix/sparc/vfork.S: Likewise.
	* sysdeps/unix/sysv/i386/signal.S: Likewise.
	* sysdeps/unix/sysv/i386/time.S: Likewise.
	* sysdeps/unix/sysv/irix4/__handler.S: Likewise.
	* sysdeps/unix/sysv/irix4/sigreturn.S: Likewise.
	* sysdeps/unix/sysv/irix4/uname.S: Likewise.
	* sysdeps/unix/sysv/irix4/wait.S: Likewise.
	* sysdeps/unix/sysv/linux/alpha/pipe.S: Likewise.
	* sysdeps/unix/sysv/linux/i386/mmap.S: Likewise.
	* sysdeps/unix/sysv/linux/m68k/mmap.S: Likewise.
	* sysdeps/unix/sysv/linux/m68k/sigreturn.S: Likewise.
	* sysdeps/unix/sysv/linux/m68k/socket.S: Likewise.
	* sysdeps/unix/sysv/linux/sparc/fork.S: Likewise.
	* sysdeps/unix/sysv/sco3.2.4/sigaction.S: Likewise.
	* sysdeps/unix/sysv/sco3.2.4/sysconf.S: Likewise.
	* sysdeps/unix/sysv/sco3.2.4/uname.S: Likewise.
	* sysdeps/unix/sysv/sco3.2.4/waitpid.S: Likewise.
	* sysdeps/unix/sysv/sysv4/i386/sys-sig.S: Likewise.
	* sysdeps/unix/sysv/sysv4/solaris2/fsync.S: Likewise.
	* sysdeps/unix/sysv/sysv4/solaris2/sparc/sysdep.S: Likewise.
	* sysdeps/vax/bsd-_setjmp.S: Likewise.
	* sysdeps/vax/bsd-setjmp.S: Likewise.

4 files changed, 340 insertions, 347 deletions

diff --git a/sysdeps/standalone/i386/force_cpu386/strtsupp.S b/sysdeps/standalone/i386/force_cpu386/strtsupp.S
index 6b78a8c343..4016c81c90 100644
--- a/sysdeps/standalone/i386/force_cpu386/strtsupp.S
+++ b/sysdeps/standalone/i386/force_cpu386/strtsupp.S
@@ -1,27 +1,26 @@
-/* Copyright (C) 1994 Free Software Foundation, Inc.
+/* Copyright (C) 1994, 1997 Free Software Foundation, Inc.
    Contributed by Joel Sherrill (jsherril@redstone-emh2.army.mil),
      On-Line Applications Research Corporation.
- 
-This file is part of the GNU C Library.
- 
-The GNU C Library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
- 
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
- 
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
 /*  This file assists the board independent startup code by
  *  loading the proper segment register values.  The values
- *  loaded are dependent on the FORCEBUG.  
+ *  loaded are dependent on the FORCEBUG.
  *
  *  NOTE:  No stack has been established when this routine
  *         is invoked.  It returns by jumping back to the start code.
@@ -29,20 +28,20 @@ Cambridge, MA 02139, USA.  */
  */
 
 /*
- *  FORCEBUG loads us into a virtual address space which 
- *  really starts at PHYSICAL_ADDRESS_BASE.  
- *  
+ *  FORCEBUG loads us into a virtual address space which
+ *  really starts at PHYSICAL_ADDRESS_BASE.
+ *
  */
 
 .set PHYSICAL_ADDRESS_BASE,    0x00002000
 
 /*
- *  At reset time, FORCEBUG normally has the segment selectors preloaded.   
+ *  At reset time, FORCEBUG normally has the segment selectors preloaded.
  *  If a human resets the instruction pointer, this will not have occurred.
- *  However, no guarantee can be made of the other registers if cs:ip was 
- *  modified to restart the program.  Because of this, the BSP reloads all 
- *  segment registers (except cs) with the values they have following 
- *  a reset.  
+ *  However, no guarantee can be made of the other registers if cs:ip was
+ *  modified to restart the program.  Because of this, the BSP reloads all
+ *  segment registers (except cs) with the values they have following
+ *  a reset.
  */
 
 
@@ -50,40 +49,39 @@ Cambridge, MA 02139, USA.  */
 .set RESET_DS, 0x40        # initial value of data segment register
 .set RESET_ES, 0x40        # initial value of extra segment register
 .set RESET_FS, 0x40        # initial value of "f" segment register
-.set RESET_GS, 0x30        # initial value of "g" segment register 
+.set RESET_GS, 0x30        # initial value of "g" segment register
 
 
 #define LOAD_SEGMENTS(_value,_segreg) \
-        movw      $_value##,%ax ;  \
-        movw      %ax,##_segreg
+	movw      $_value##,%ax ;  \
+	movw      %ax,##_segreg
+
 
-    
-        .global  _load_segments
+	.global  _load_segments
 
-        .global   _establish_stack
+	.global   _establish_stack
 
 _load_segments:
 
-        LOAD_SEGMENTS( RESET_SS, %ss )
-        LOAD_SEGMENTS( RESET_DS, %ds )
-        LOAD_SEGMENTS( RESET_ES, %es )
-        LOAD_SEGMENTS( RESET_FS, %fs )
-        LOAD_SEGMENTS( RESET_GS, %gs )
+	LOAD_SEGMENTS( RESET_SS, %ss )
+	LOAD_SEGMENTS( RESET_DS, %ds )
+	LOAD_SEGMENTS( RESET_ES, %es )
+	LOAD_SEGMENTS( RESET_FS, %fs )
+	LOAD_SEGMENTS( RESET_GS, %gs )
 
-        jmp     _establish_stack        # return to the bsp entry code
+	jmp     _establish_stack        # return to the bsp entry code
 
-        .global  _return_to_monitor
+	.global  _return_to_monitor
 _return_to_monitor:
 
-        movb    $0,%al
-        int     $0x20                   # restart FORCEbug
-        jmp     start                   # FORCEbug does not reset PC
+	movb    $0,%al
+	int     $0x20                   # restart FORCEbug
+	jmp     start                   # FORCEbug does not reset PC
 
-        .data
+	.data
 
-        .global _Do_Load_IDT
+	.global _Do_Load_IDT
 _Do_Load_IDT:   .byte 1
 
-        .global _Do_Load_GDT
+	.global _Do_Load_GDT
 _Do_Load_GDT:   .byte 0
-
diff --git a/sysdeps/standalone/i386/start.S b/sysdeps/standalone/i386/start.S
index 8331a331c1..41e0bfb135 100644
--- a/sysdeps/standalone/i386/start.S
+++ b/sysdeps/standalone/i386/start.S
@@ -1,23 +1,22 @@
-/* Copyright (C) 1994 Free Software Foundation, Inc.
+/* Copyright (C) 1994, 1997 Free Software Foundation, Inc.
    Contributed by Joel Sherrill (jsherril@redstone-emh2.army.mil),
      On-Line Applications Research Corporation.
- 
-This file is part of the GNU C Library.
- 
-The GNU C Library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
- 
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
- 
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
 /*  entry.s
  *
@@ -28,28 +27,28 @@ Cambridge, MA 02139, USA.  */
  *
  */
 
-        .data
-        .global  _Do_Load_IDT
-        .global  _Do_Load_GDT
+	.data
+	.global  _Do_Load_IDT
+	.global  _Do_Load_GDT
 
-        .text
+	.text
 	      .global  start                  # GNU default entry point
-        .global  _establish_stack
+	.global  _establish_stack
 
-        .global   _bsp_start
-        .global   _load_segments
-        .global   __exit
+	.global   _bsp_start
+	.global   _load_segments
+	.global   __exit
 
 start:
-        nop
-        cli                             # DISABLE INTERRUPTS!!!
+	nop
+	cli                             # DISABLE INTERRUPTS!!!
 #
 #  Load the segment registers
 #
 #  NOTE: Upon return, gs will contain the segment descriptor for
 #        a segment which maps directly to all of physical memory.
 #
-        jmp     _load_segments          # load board dependent segments
+	jmp     _load_segments          # load board dependent segments
 
 #
 #  Set up the stack
@@ -57,102 +56,102 @@ start:
 
 _establish_stack:
 
-        movl    $stack_end,%esp         # set stack pointer
-        movl    $stack_end,%ebp         # set base pointer
+	movl    $stack_end,%esp         # set stack pointer
+	movl    $stack_end,%ebp         # set base pointer
 
 #
 #  Zero out the BSS segment
 #
 zero_bss:
-        cld                             # make direction flag count up
-        movl    $_end,%ecx              # find end of .bss
-        movl    $_bss_start,%edi        # edi = beginning of .bss
-        subl    %edi,%ecx               # ecx = size of .bss in bytes
-        shrl    $2,%ecx                 # size of .bss in longs
-        xorl    %eax,%eax               # value to clear out memory
-        repne                           # while ecx != 0
-        stosl                           #   clear a long in the bss
+	cld                             # make direction flag count up
+	movl    $_end,%ecx              # find end of .bss
+	movl    $_bss_start,%edi        # edi = beginning of .bss
+	subl    %edi,%ecx               # ecx = size of .bss in bytes
+	shrl    $2,%ecx                 # size of .bss in longs
+	xorl    %eax,%eax               # value to clear out memory
+	repne                           # while ecx != 0
+	stosl                           #   clear a long in the bss
 
 #
 #  Set the C heap information for malloc
 #
-        movl    $heap_size,___C_heap_size    # set ___C_heap_size
-        movl    $heap_memory,___C_heap_start # set ___C_heap_start
+	movl    $heap_size,___C_heap_size    # set ___C_heap_size
+	movl    $heap_memory,___C_heap_start # set ___C_heap_start
 
 #
 #  Copy the Global Descriptor Table to our space
 #
 
-        sgdt    _Original_GDTR          # save original GDT
-        movzwl  _Original_GDTR_limit,%ecx # size of GDT in bytes; limit 
-                                          #   is 8192 entries * 8 bytes per
+	sgdt    _Original_GDTR          # save original GDT
+	movzwl  _Original_GDTR_limit,%ecx # size of GDT in bytes; limit
+					  #   is 8192 entries * 8 bytes per
 
-        # make ds:esi point to the original GDT
+	# make ds:esi point to the original GDT
 
-        movl    _Original_GDTR_base,%esi
-        push    %ds                     # save ds
-        movw    %gs,%ax
-        movw    %ax,%ds 
+	movl    _Original_GDTR_base,%esi
+	push    %ds                     # save ds
+	movw    %gs,%ax
+	movw    %ax,%ds
 
-        # make es:edi point to the new (our copy) GDT
-        movl    $_Global_descriptor_table,%edi
+	# make es:edi point to the new (our copy) GDT
+	movl    $_Global_descriptor_table,%edi
 
-        rep
-        movsb                            # copy the GDT (ds:esi -> es:edi)
+	rep
+	movsb                            # copy the GDT (ds:esi -> es:edi)
 
-        pop     %ds                      # restore ds
-      
-        # Build and load new contents of GDTR
-        movw    _Original_GDTR_limit,%ecx # set new limit
-        movw    %cx,_New_GDTR_limit
+	pop     %ds                      # restore ds
 
-        push    $_Global_descriptor_table
-        push    %es
-        call    _Logical_to_physical
-        addl    $6,%esp
-        movl    %eax,_New_GDTR_base      # set new base
+	# Build and load new contents of GDTR
+	movw    _Original_GDTR_limit,%ecx # set new limit
+	movw    %cx,_New_GDTR_limit
 
-        cmpb    $0,_Do_Load_GDT          # Should the new GDT be loaded?
-        je      no_gdt_load              # NO, then branch
-        lgdt    _New_GDTR                # load the new GDT
+	push    $_Global_descriptor_table
+	push    %es
+	call    _Logical_to_physical
+	addl    $6,%esp
+	movl    %eax,_New_GDTR_base      # set new base
+
+	cmpb    $0,_Do_Load_GDT          # Should the new GDT be loaded?
+	je      no_gdt_load              # NO, then branch
+	lgdt    _New_GDTR                # load the new GDT
 no_gdt_load:
 
 #
 #  Copy the Interrupt Descriptor Table to our space
 #
 
-        sidt    _Original_IDTR          # save original IDT
-        movzwl  _Original_IDTR_limit,%ecx # size of IDT in bytes; limit
-                                          #   is 256 entries * 8 bytes per
- 
+	sidt    _Original_IDTR          # save original IDT
+	movzwl  _Original_IDTR_limit,%ecx # size of IDT in bytes; limit
+					  #   is 256 entries * 8 bytes per
+
 
-        # make ds:esi point to the original IDT
-        movl    _Original_IDTR_base,%esi
+	# make ds:esi point to the original IDT
+	movl    _Original_IDTR_base,%esi
 
-        push    %ds                     # save ds
-        movw    %gs,%ax
-        movw    %ax,%ds 
+	push    %ds                     # save ds
+	movw    %gs,%ax
+	movw    %ax,%ds
 
-        # make es:edi point to the new (our copy) IDT
-        movl    $_Interrupt_descriptor_table,%edi
+	# make es:edi point to the new (our copy) IDT
+	movl    $_Interrupt_descriptor_table,%edi
 
-        rep
-        movsb                            # copy the IDT (ds:esi -> es:edi)
-        pop     %ds                      # restore ds
+	rep
+	movsb                            # copy the IDT (ds:esi -> es:edi)
+	pop     %ds                      # restore ds
 
-        # Build and load new contents of IDTR
-        movw    _Original_IDTR_limit,%ecx # set new limit
-        movw    %cx,_New_IDTR_limit
+	# Build and load new contents of IDTR
+	movw    _Original_IDTR_limit,%ecx # set new limit
+	movw    %cx,_New_IDTR_limit
 
-        push    $_Interrupt_descriptor_table
-        push    %es
-        call    _Logical_to_physical
-        addl    $6,%esp
-        movl    %eax,_New_IDTR_base      # set new base
+	push    $_Interrupt_descriptor_table
+	push    %es
+	call    _Logical_to_physical
+	addl    $6,%esp
+	movl    %eax,_New_IDTR_base      # set new base
 
-        cmpb    $0,_Do_Load_IDT          # Should the new IDT be loaded?
-        je      no_idt_load              # NO, then branch
-        lidt    _New_IDTR                # load the new IDT
+	cmpb    $0,_Do_Load_IDT          # Should the new IDT be loaded?
+	je      no_idt_load              # NO, then branch
+	lidt    _New_IDTR                # load the new IDT
 no_idt_load:
 
 #
@@ -163,44 +162,44 @@ no_idt_load:
 #  exception.
 #
 
-        fninit                           # MUST USE NO-WAIT FORM
+	fninit                           # MUST USE NO-WAIT FORM
 
-        call    __Board_Initialize       # initialize the board
+	call    __Board_Initialize       # initialize the board
 
-        pushl   $0                       # envp = NULL 
-        pushl   $0                       # argv = NULL 
-        pushl   $0                       # argc = NULL 
-        call    ___libc_init             # initialize the library and
-                                         #   call main
-        addl    $12,%esp
- 
-        pushl   $0                       # argc = NULL 
-        call    __exit                   # call the Board specific exit
-        addl     $4,%esp
+	pushl   $0                       # envp = NULL
+	pushl   $0                       # argv = NULL
+	pushl   $0                       # argc = NULL
+	call    ___libc_init             # initialize the library and
+					 #   call main
+	addl    $12,%esp
+
+	pushl   $0                       # argc = NULL
+	call    __exit                   # call the Board specific exit
+	addl     $4,%esp
 
 #
 #  Clean up
 #
 
 
-        .global  _Bsp_cleanup
+	.global  _Bsp_cleanup
 
-        .global   _return_to_monitor
+	.global   _return_to_monitor
 
 _Bsp_cleanup:
-        cmpb    $0,_Do_Load_IDT          # Was the new IDT loaded?
-        je      no_idt_restore           # NO, then branch
-        lidt    _Original_IDTR           # restore the new IDT
+	cmpb    $0,_Do_Load_IDT          # Was the new IDT loaded?
+	je      no_idt_restore           # NO, then branch
+	lidt    _Original_IDTR           # restore the new IDT
 no_idt_restore:
 
-        cmpb    $0,_Do_Load_GDT          # Was the new GDT loaded?
-        je      no_gdt_restore           # NO, then branch
-        lgdt    _Original_GDTR           # restore the new GDT
+	cmpb    $0,_Do_Load_GDT          # Was the new GDT loaded?
+	je      no_gdt_restore           # NO, then branch
+	lgdt    _Original_GDTR           # restore the new GDT
 no_gdt_restore:
-        jmp     _return_to_monitor
+	jmp     _return_to_monitor
 
 #
-#  void *Logical_to_physical( 
+#  void *Logical_to_physical(
 #     rtems_unsigned16  segment,
 #     void             *address
 #  );
@@ -208,28 +207,28 @@ no_gdt_restore:
 #  Returns thirty-two bit physical address for segment:address.
 #
 
-        .global  _Logical_to_physical
+	.global  _Logical_to_physical
 
 .set SEGMENT_ARG, 4
 .set ADDRESS_ARG, 8
 
 _Logical_to_physical:
 
-        xorl    %eax,%eax                # clear eax
-        movzwl  SEGMENT_ARG(%esp),%ecx   # ecx = segment value
-        movl    $_Global_descriptor_table,%edx # edx = address of our GDT
-        addl    %ecx,%edx                # edx = address of desired entry
-        movb    7(%edx),%ah              # ah = base 31:24
-        movb    4(%edx),%al              # al = base 23:16
-        shll    $16,%eax                 # move ax into correct bits
-        movw    2(%edx),%ax              # ax = base 0:15
-        movl    ADDRESS_ARG(%esp),%ecx   # ecx = address to convert
-        addl    %eax,%ecx                # ecx = physical address equivalent
-        movl    %ecx,%eax                # eax = ecx
-        ret
-       
+	xorl    %eax,%eax                # clear eax
+	movzwl  SEGMENT_ARG(%esp),%ecx   # ecx = segment value
+	movl    $_Global_descriptor_table,%edx # edx = address of our GDT
+	addl    %ecx,%edx                # edx = address of desired entry
+	movb    7(%edx),%ah              # ah = base 31:24
+	movb    4(%edx),%al              # al = base 23:16
+	shll    $16,%eax                 # move ax into correct bits
+	movw    2(%edx),%ax              # ax = base 0:15
+	movl    ADDRESS_ARG(%esp),%ecx   # ecx = address to convert
+	addl    %eax,%ecx                # ecx = physical address equivalent
+	movl    %ecx,%eax                # eax = ecx
+	ret
+
 #
-#  void *Physical_to_logical( 
+#  void *Physical_to_logical(
 #     rtems_unsigned16  segment,
 #     void             *address
 #  );
@@ -237,41 +236,41 @@ _Logical_to_physical:
 #  Returns thirty-two bit physical address for segment:address.
 #
 
-        .global  _Physical_to_logical
+	.global  _Physical_to_logical
 
 #.set SEGMENT_ARG, 4
 #.set ADDRESS_ARG, 8   -- use sets from above
 
 _Physical_to_logical:
 
-        xorl    %eax,%eax                # clear eax
-        movzwl  SEGMENT_ARG(%esp),%ecx   # ecx = segment value
-        movl    $_Global_descriptor_table,%edx # edx = address of our GDT
-        addl    %ecx,%edx                # edx = address of desired entry
-        movb    7(%edx),%ah              # ah = base 31:24
-        movb    4(%edx),%al              # al = base 23:16
-        shll    $16,%eax                 # move ax into correct bits
-        movw    2(%edx),%ax              # ax = base 0:15
-        movl    ADDRESS_ARG(%esp),%ecx   # ecx = address to convert
-        subl    %eax,%ecx                # ecx = logical address equivalent
-        movl    %ecx,%eax                # eax = ecx
-        ret
-       
+	xorl    %eax,%eax                # clear eax
+	movzwl  SEGMENT_ARG(%esp),%ecx   # ecx = segment value
+	movl    $_Global_descriptor_table,%edx # edx = address of our GDT
+	addl    %ecx,%edx                # edx = address of desired entry
+	movb    7(%edx),%ah              # ah = base 31:24
+	movb    4(%edx),%al              # al = base 23:16
+	shll    $16,%eax                 # move ax into correct bits
+	movw    2(%edx),%ax              # ax = base 0:15
+	movl    ADDRESS_ARG(%esp),%ecx   # ecx = address to convert
+	subl    %eax,%ecx                # ecx = logical address equivalent
+	movl    %ecx,%eax                # eax = ecx
+	ret
+
 
 /*
  *  Data Declarations.  Start with a macro which helps declare space.
  */
 
-        .bss
+	.bss
 
 #define DECLARE_SPACE(_name,_space,_align) \
-          .globl   _name ; \
-          .align   _align ; \
+	  .globl   _name ; \
+	  .align   _align ; \
 _name##:  .space _space
 
 #define DECLARE_LABEL(_name) \
-          .globl   _name ; \
-_name##:  
+	  .globl   _name ; \
+_name##:
 
 #define DECLARE_PTR(_name) DECLARE_SPACE(_name,4,2)
 #define DECLARE_U32(_name) DECLARE_SPACE(_name,4,2)
@@ -287,7 +286,7 @@ DECLARE_PTR(environ)
 DECLARE_LABEL(_errno)
 DECLARE_U32(errno)
 
-/* 
+/*
  *  Miscellaneous Variables used to restore the CPU state.
  *
  *  Start with a macro to declare the space for the contents of
@@ -295,8 +294,8 @@ DECLARE_U32(errno)
  */
 
 #define DECLARE_DTR_SPACE(_name) \
-          .global   _name ; \
-          .align    4 ; \
+	  .global   _name ; \
+	  .align    4 ; \
 _name##:  ; \
 _name##_limit:  .space 2  ; \
 _name##_base:   .space 4
@@ -316,8 +315,7 @@ DECLARE_SPACE(_Physical_base_of_cs,4,4)
  *  Stack Size and Space
  */
 
-        .set stack_size, 0x20000
+	.set stack_size, 0x20000
 
 DECLARE_SPACE(stack_memory,stack_size,4)
 DECLARE_LABEL(stack_end)
-
diff --git a/sysdeps/standalone/i960/start.S b/sysdeps/standalone/i960/start.S
index c14449d3ff..d86fb1440f 100644
--- a/sysdeps/standalone/i960/start.S
+++ b/sysdeps/standalone/i960/start.S
@@ -1,23 +1,22 @@
-/* Copyright (C) 1994 Free Software Foundation, Inc.
+/* Copyright (C) 1994, 1997 Free Software Foundation, Inc.
    Contributed by Joel Sherrill (jsherril@redstone-emh2.army.mil),
      On-Line Applications Research Corporation.
- 
-This file is part of the GNU C Library.
- 
-The GNU C Library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
- 
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
- 
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
 /*  entry.s
  *
@@ -28,66 +27,66 @@ Cambridge, MA 02139, USA.  */
  *
  */
 
-         .text
-         .globl  start                  # GNU960 default entry point
+	 .text
+	 .globl  start                  # GNU960 default entry point
 
 start:
-        mov     3, r12
-        modpc   r12, r12, r12         # enable tracing/trace faults
-        mov     g5, g5                # NOP
-        mov     0, g14                # initialize constant for C
-
-        /*
-         * zero out uninitialized data area
-         */
+	mov     3, r12
+	modpc   r12, r12, r12         # enable tracing/trace faults
+	mov     g5, g5                # NOP
+	mov     0, g14                # initialize constant for C
+
+	/*
+	 * zero out uninitialized data area
+	 */
 zerobss:
-        lda     _end, r4        /* find end of .bss */
-        lda     _bss_start, r5  /* find beginning of .bss */
-        ldconst 0, r6
+	lda     _end, r4        /* find end of .bss */
+	lda     _bss_start, r5  /* find beginning of .bss */
+	ldconst 0, r6
 
 loop:   st      r6, (r5)        /* to zero out uninitialized */
-        addo    4, r5, r5       /* data area                 */
-        cmpobl  r5, r4, loop    /* loop until _end reached   */
+	addo    4, r5, r5       /* data area                 */
+	cmpobl  r5, r4, loop    /* loop until _end reached   */
 
 
-        lda     heap_memory, r12      /* tell C lib where heap is */
-        st      r12,___C_heap_start
-        lda     heap_size, r12        /* tell C lib how big heap is */
-        st      r12,___C_heap_size
-        lda     stack_memory,r12      /* set up stack pointer: */
-        mov     r12, sp
-        mov     0, g14           /* initialize constant for C */
+	lda     heap_memory, r12      /* tell C lib where heap is */
+	st      r12,___C_heap_start
+	lda     heap_size, r12        /* tell C lib how big heap is */
+	st      r12,___C_heap_size
+	lda     stack_memory,r12      /* set up stack pointer: */
+	mov     r12, sp
+	mov     0, g14           /* initialize constant for C */
 
-        call    init_frames
-        ret                      /* return to monitor */
+	call    init_frames
+	ret                      /* return to monitor */
 
 init_frames:
-        ldconst 0x3b001000, g0
-        ldconst 0x00009107, g1
-        modac   g1, g0, g0       /* set AC controls */
-
-        /*
-         * Call application mainline.
-         *      Someday, real values of argc and argv will be set up.
-         *      For now, they are set to 0.
-         */
-
-        callx   __Board_Initialize    /* Initialize the board */
-
-        ldconst 0,g0
-        ldconst 0,g1
-        ldconst 0,g2
-        callx   ___libc_init          /* initialize the library and */
-                                      /*   call main */
-        /*
-         * if we return from main, we have "fallen" off the end
-         * of the program, therefore status is 0
-         * so move 0 to g0 (exit parameter)
-         */
-
-        mov     0, g0
-        callx   __exit
-        ret
+	ldconst 0x3b001000, g0
+	ldconst 0x00009107, g1
+	modac   g1, g0, g0       /* set AC controls */
+
+	/*
+	 * Call application mainline.
+	 *      Someday, real values of argc and argv will be set up.
+	 *      For now, they are set to 0.
+	 */
+
+	callx   __Board_Initialize    /* Initialize the board */
+
+	ldconst 0,g0
+	ldconst 0,g1
+	ldconst 0,g2
+	callx   ___libc_init          /* initialize the library and */
+				      /*   call main */
+	/*
+	 * if we return from main, we have "fallen" off the end
+	 * of the program, therefore status is 0
+	 * so move 0 to g0 (exit parameter)
+	 */
+
+	mov     0, g0
+	callx   __exit
+	ret
 
 
 /*
@@ -95,13 +94,13 @@ init_frames:
  */
 
 #define DECLARE_SPACE(_name,_space,_align) \
-          .globl   _name ; \
-          .align   _align ; \
+	  .globl   _name ; \
+	  .align   _align ; \
 .comm     _name##,_space
 
 #define DECLARE_LABEL(_name) \
-          .globl   _name ; \
-_name##:  
+	  .globl   _name ; \
+_name##:
 
 #define DECLARE_PTR(_name) DECLARE_SPACE(_name,4,2)
 #define DECLARE_U32(_name) DECLARE_SPACE(_name,4,2)
@@ -121,7 +120,7 @@ DECLARE_U32(errno)
  *  Stack Size and Space
  */
 
-        .set stack_size, 0x20000
+	.set stack_size, 0x20000
 
 DECLARE_SPACE(stack_memory,stack_size,4)
 DECLARE_LABEL(stack_end)
@@ -130,8 +129,7 @@ DECLARE_LABEL(stack_end)
  *  Heap Size and Space
  */
 
-        .set heap_size, 0x20000
+	.set heap_size, 0x20000
 
 DECLARE_SPACE(heap_memory,heap_size,4)
 DECLARE_LABEL(heap_end)
-
diff --git a/sysdeps/standalone/m68k/m68020/start.S b/sysdeps/standalone/m68k/m68020/start.S
index 9d7d779e04..fb6fd3eb1a 100644
--- a/sysdeps/standalone/m68k/m68020/start.S
+++ b/sysdeps/standalone/m68k/m68020/start.S
@@ -1,23 +1,22 @@
-/* Copyright (C) 1994, 1996 Free Software Foundation, Inc.
+/* Copyright (C) 1994, 1996, 1997 Free Software Foundation, Inc.
    Contributed by Joel Sherrill (jsherril@redstone-emh2.army.mil),
      On-Line Applications Research Corporation.
+   This file is part of the GNU C Library.
 
-This file is part of the GNU C Library.
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
 
-The GNU C Library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
 /*  entry.s
  *
@@ -27,7 +26,7 @@ Cambridge, MA 02139, USA.  */
  *  all initialization.
  */
 
-        .text
+	.text
 	      .globl   start                        | Default entry point
 	      .globl   _start                       | Default entry point
 	      .globl   M68Kvec                      | Vector Table
@@ -37,90 +36,90 @@ start:
 _start:
 M68Kvec:                               | standard location for vectors
 _M68Kvec:                               | standard location for vectors
-        nop                             | for linkers with problem
-                                        |   using location zero as entry
-        jmp      around
-        .space   4088                   | to avoid initial intr stack
-                                        |   from 135BUG on MVME13? as entry
-                                        |   and start code at 0x4000
+	nop                             | for linkers with problem
+					|   using location zero as entry
+	jmp      around
+	.space   4088                   | to avoid initial intr stack
+					|   from 135BUG on MVME13? as entry
+					|   and start code at 0x4000
 around:
-        move.w  %sr,initial_sr          | save initial values
-        movec   %isp,%a0
-        movel   %a0,initial_isp
-        movec   %usp,%a0
-        movel   %a0,initial_usp
-        movec   %msp,%a0
-        movel   %a0,initial_msp
-        oriw    #0x0700,%sr             | INTERRUPTS OFF!!!
+	move.w  %sr,initial_sr          | save initial values
+	movec   %isp,%a0
+	movel   %a0,initial_isp
+	movec   %usp,%a0
+	movel   %a0,initial_usp
+	movec   %msp,%a0
+	movel   %a0,initial_msp
+	oriw    #0x0700,%sr             | INTERRUPTS OFF!!!
 
 
 
-        |
-        | zero out uninitialized data area
-        |
+	|
+	| zero out uninitialized data area
+	|
 zerobss:
-        moveal  #end,%a0                | find end of .bss
-        moveal  #_bss_start,%a1         | find beginning of .bss
-        movel   #0,%d0
+	moveal  #end,%a0                | find end of .bss
+	moveal  #_bss_start,%a1         | find beginning of .bss
+	movel   #0,%d0
 
 loop:   movel   #0,%a1@+                | to zero out uninitialized
-        cmpal   %a0,%a1
-        jlt     loop                    | loop until _end reached
-
-        movel   #heap_size,__C_heap_size | set ___C_heap_size
-        movel   #heap_memory,__C_heap_start | set ___C_heap_start
-        moveal  #interrupt_stack_end,%a0 | set interrupt stack pointer
-        movec   %a0,%isp
-        moveal  #stack_end,%a0          | set master stack pointer
-        movec   %a0,%msp
-        moveal  #stack_end,%a6          | set base pointer
-        movw    #0x3000,%sr             | SUPV MODE,INTERRUPTS ON!!!
+	cmpal   %a0,%a1
+	jlt     loop                    | loop until _end reached
+
+	movel   #heap_size,__C_heap_size | set ___C_heap_size
+	movel   #heap_memory,__C_heap_start | set ___C_heap_start
+	moveal  #interrupt_stack_end,%a0 | set interrupt stack pointer
+	movec   %a0,%isp
+	moveal  #stack_end,%a0          | set master stack pointer
+	movec   %a0,%msp
+	moveal  #stack_end,%a6          | set base pointer
+	movw    #0x3000,%sr             | SUPV MODE,INTERRUPTS ON!!!
 
 #ifdef NEED_UNDERSCORES
-        jsr     __Board_Initialize      | initialize the board
+	jsr     __Board_Initialize      | initialize the board
 #else
-        jsr     _Board_Initialize       | initialize the board
+	jsr     _Board_Initialize       | initialize the board
 #endif
 
-        move.l  #0,%sp@-                | envp = NULL
-        move.l  #0,%sp@-                | argv = NULL
-        move.l  #0,%sp@-                | argc = NULL
+	move.l  #0,%sp@-                | envp = NULL
+	move.l  #0,%sp@-                | argv = NULL
+	move.l  #0,%sp@-                | argc = NULL
 #ifdef NEED_UNDERSCORES
-        jsr     ___libc_init            | initialize the library and
-                                        |   call main
+	jsr     ___libc_init            | initialize the library and
+					|   call main
 #else
-        jsr     __libc_init             | initialize the library and
-                                        |   call main
+	jsr     __libc_init             | initialize the library and
+					|   call main
 #endif
-        add.l   #12,%sp
+	add.l   #12,%sp
 
-        move.l  #0,%sp@-                | argc = NULL
-        jsr     __exit                  | call the Board specific exit
-        addq.l  #4,%sp
+	move.l  #0,%sp@-                | argc = NULL
+	jsr     __exit                  | call the Board specific exit
+	addq.l  #4,%sp
 
-        move.l  initial_isp,%a0         | if __exit returns then we can
-        movec   %a0,%isp                |   restore the initial values
-        move.l  initial_usp,%a0
-        movec   %a0,%usp
-        move.l  initial_msp,%a0
-        movec   %a0,%msp
-        move.w  initial_sr,%sr
-        rts
+	move.l  initial_isp,%a0         | if __exit returns then we can
+	movec   %a0,%isp                |   restore the initial values
+	move.l  initial_usp,%a0
+	movec   %a0,%usp
+	move.l  initial_msp,%a0
+	movec   %a0,%msp
+	move.w  initial_sr,%sr
+	rts
 
 
-        .bss
+	.bss
 
 /*
  *  So initial stack registers and status register can be saved.
  */
 
 #define DECLARE_SPACE(_name,_space,_align) \
-          .globl   _name ; \
-          .align   _align ; \
+	  .globl   _name ; \
+	  .align   _align ; \
 _name##:  .space _space
 
 #define DECLARE_LABEL(_name) \
-          .globl   _name ; \
+	  .globl   _name ; \
 _name##:
 
 #define DECLARE_PTR(_name) DECLARE_SPACE(_name,4,2)
@@ -147,7 +146,7 @@ DECLARE_U32(errno)
  *  Stack Size and Space
  */
 
-        .set stack_size, 0x20000
+	.set stack_size, 0x20000
 
 DECLARE_SPACE(stack_memory,stack_size,4)
 DECLARE_LABEL(stack_end)