Merge sysdeps/arm/eabi into sysdeps/arm.

diff --git a/ChangeLog.arm b/ChangeLog.arm
index 43a595dc7170e23a3c02972cb7f9347840acc3b6..d6489271b162bfa3ec13945389f8886d8b194cc3 100644 (file)
--- a/ChangeLog.arm
+++ b/ChangeLog.arm
@@ -1,5 +1,114 @@
 2012-04-21  Joseph Myers  <joseph@codesourcery.com>
 
+       [BZ #13556]
+       * sysdeps/arm/preconfigure: Don't include /eabi in $machine.
+       * sysdeps/arm/Makefile [subdir = elf] (sysdep_routines): Add
+       setting from eabi/Makefile.
+       [subdir = elf] (sysdep-rtld-routines): Likewise.
+       [subdir = elf] (shared-only-routines): Likewise.
+       [subdir = csu] (gen-as-const-headers): Likewise.
+       [subdir = csu] (aeabi_constants): Likewise.
+       [subdir = csu] (aeabi_routines): Likewise.
+       [subdir = csu] (sysdep_routines): Likewise.
+       [subdir = csu] (static-only-routines): Likewise.
+       [subdir = gmon] (sysdep_routines): Likewise.
+       [subdir = debug] (CFLAGS-backtrace.c): Likewise.
+       [subdir = math] ($(objpfx)libm.so): Add dependency from
+       eabi/Makefile.
+       * sysdeps/arm/eabi/Makefile: Remove.
+       * sysdeps/arm/eabi/Versions: Move to ...
+       * sysdeps/arm/Versions: ... here.
+       * sysdeps/arm/eabi/__longjmp.S: Move to ...
+       * sysdeps/arm/__longjmp.S: ... here.
+       * sysdeps/arm/eabi/abi-note.S: Move to ...
+       * sysdeps/arm/abi-note.S: ... here.
+       * sysdeps/arm/eabi/aeabi_assert.c: Move to ...
+       * sysdeps/arm/aeabi_assert.c: ... here.
+       * sysdeps/arm/eabi/aeabi_atexit.c: Move to ...
+       * sysdeps/arm/aeabi_atexit.c: ... here.
+       * sysdeps/arm/eabi/aeabi_errno_addr.c: Move to ...
+       * sysdeps/arm/aeabi_errno_addr.c: ... here.
+       * sysdeps/arm/eabi/aeabi_lcsts.c: Move to ...
+       * sysdeps/arm/aeabi_lcsts.c: ... here.
+       * sysdeps/arm/eabi/aeabi_localeconv.c: Move to ...
+       * sysdeps/arm/aeabi_localeconv.c: ... here.
+       * sysdeps/arm/eabi/aeabi_math.c: Move to ...
+       * sysdeps/arm/aeabi_math.c: ... here.
+       * sysdeps/arm/eabi/aeabi_mb_cur_max.c: Move to ...
+       * sysdeps/arm/aeabi_mb_cur_max.c: ... here.
+       * sysdeps/arm/eabi/aeabi_memclr.c: Move to ...
+       * sysdeps/arm/aeabi_memclr.c: ... here.
+       * sysdeps/arm/eabi/aeabi_memcpy.c: Move to ...
+       * sysdeps/arm/aeabi_memcpy.c: ... here.
+       * sysdeps/arm/eabi/aeabi_memmove.c: Move to ...
+       * sysdeps/arm/aeabi_memmove.c: ... here.
+       * sysdeps/arm/eabi/aeabi_memset.c: Move to ...
+       * sysdeps/arm/aeabi_memset.c: ... here.
+       * sysdeps/arm/eabi/aeabi_sighandlers.S: Move to ...
+       * sysdeps/arm/aeabi_sighandlers.S: ... here.
+       * sysdeps/arm/eabi/aeabi_unwind_cpp_pr1.c: Move to ...
+       * sysdeps/arm/aeabi_unwind_cpp_pr1.c: ... here.
+       * sysdeps/arm/eabi/arm-mcount.S: Move to ...
+       * sysdeps/arm/arm-mcount.S: ... here.
+       * sysdeps/arm/eabi/backtrace.c: Move to ...
+       * sysdeps/arm/backtrace.c: ... here.
+       * sysdeps/arm/eabi/fclrexcpt.c: Move to ...
+       * sysdeps/arm/fclrexcpt.c: ... here.
+       * sysdeps/arm/eabi/fedisblxcpt.c: Move to ...
+       * sysdeps/arm/fedisblxcpt.c: ... here.
+       * sysdeps/arm/eabi/feenablxcpt.c: Move to ...
+       * sysdeps/arm/feenablxcpt.c: ... here.
+       * sysdeps/arm/eabi/fegetenv.c: Move to ...
+       * sysdeps/arm/fegetenv.c: ... here.
+       * sysdeps/arm/eabi/fegetexcept.c: Move to ...
+       * sysdeps/arm/fegetexcept.c: ... here.
+       * sysdeps/arm/eabi/fegetround.c: Move to ...
+       * sysdeps/arm/fegetround.c: ... here.
+       * sysdeps/arm/eabi/feholdexcpt.c: Move to ...
+       * sysdeps/arm/feholdexcpt.c: ... here.
+       * sysdeps/arm/eabi/fesetenv.c: Move to ...
+       * sysdeps/arm/fesetenv.c: ... here.
+       * sysdeps/arm/eabi/fesetround.c: Move to ...
+       * sysdeps/arm/fesetround.c: ... here.
+       * sysdeps/arm/eabi/feupdateenv.c: Move to ...
+       * sysdeps/arm/feupdateenv.c: ... here.
+       * sysdeps/arm/eabi/fgetexcptflg.c: Move to ...
+       * sysdeps/arm/fgetexcptflg.c: ... here.
+       * sysdeps/arm/eabi/find_exidx.c: Move to ...
+       * sysdeps/arm/find_exidx.c: ... here.
+       * sysdeps/arm/eabi/fpu_control.h: Move to ...
+       * sysdeps/arm/fpu_control.h: ... here.
+       * sysdeps/arm/eabi/fraiseexcpt.c: Move to ...
+       * sysdeps/arm/fraiseexcpt.c: ... here.
+       * sysdeps/arm/eabi/fsetexcptflg.c: Move to ...
+       * sysdeps/arm/fsetexcptflg.c: ... here.
+       * sysdeps/arm/eabi/ftestexcept.c: Move to ...
+       * sysdeps/arm/ftestexcept.c: ... here.
+       * sysdeps/arm/eabi/jmpbuf-offsets.h: Move to ...
+       * sysdeps/arm/jmpbuf-offsets.h: ... here.
+       * sysdeps/arm/eabi/machine-gmon.h: Move to ...
+       * sysdeps/arm/machine-gmon.h: ... here.
+       * sysdeps/arm/eabi/rtld-global-offsets.sym: Move to ...
+       * sysdeps/arm/rtld-global-offsets.sym: ... here.
+       * sysdeps/arm/eabi/setfpucw.c: Move to ...
+       * sysdeps/arm/setfpucw.c: ... here.
+       * sysdeps/arm/eabi/setjmp.S: Move to ...
+       * sysdeps/arm/setjmp.S: ... here.
+       * sysdeps/arm/eabi/armv6t2/memchr.S: Move to ...
+       * sysdeps/arm/armv6t2/memchr.S: ... here.
+       * sysdeps/arm/eabi/armv7/Implies: Move to ...
+       * sysdeps/arm/armv7/Implies: ... here.  Remove /eabi from implied
+       directory.
+       * sysdeps/arm/eabi/bits/fenv.h: Move to ...
+       * sysdeps/arm/bits/fenv.h: ... here.
+       * sysdeps/arm/eabi/bits/huge_val.h: Move to ...
+       * sysdeps/arm/bits/huge_val.h: ... here.
+       * sysdeps/arm/eabi/bits/setjmp.h: Move to ...
+       * sysdeps/arm/bits/setjmp.h: ... here.
+       * sysdeps/unix/sysv/linux/arm/getcontext.S: Update directory name
+       in comment.
+       * sysdeps/unix/sysv/linux/arm/setcontext.S: Likewise.
+
        [BZ #13556]
        * sysdeps/unix/sysv/linux/arm/socket.S: Remove.
        * sysdeps/unix/sysv/linux/arm/syscalls.list (syscall): Remove.

diff --git a/sysdeps/arm/Makefile b/sysdeps/arm/Makefile
index 1a88430a2c2df7fd7197cc43da5f46ed6e96549b..5fd5136328a0a137ce12db214df2dde5ed4e3fd6 100644 (file)
--- a/sysdeps/arm/Makefile
+++ b/sysdeps/arm/Makefile
@@ -1,14 +1,35 @@
 ifeq ($(subdir),elf)
 sysdep-dl-routines += tlsdesc dl-tlsdesc
-sysdep_routines += tlsdesc dl-tlsdesc
-sysdep-rtld-routines += tlsdesc dl-tlsdesc
+sysdep_routines += aeabi_unwind_cpp_pr1 find_exidx tlsdesc dl-tlsdesc
+sysdep-rtld-routines += aeabi_unwind_cpp_pr1 tlsdesc dl-tlsdesc
+shared-only-routines += aeabi_unwind_cpp_pr1
 endif
 
 ifeq ($(subdir),csu)
-gen-as-const-headers += tlsdesc.sym
+# get offset to rtld_global._dl_hwcap
+gen-as-const-headers += rtld-global-offsets.sym tlsdesc.sym
+aeabi_constants = aeabi_lcsts aeabi_sighandlers aeabi_math
+aeabi_routines = aeabi_assert aeabi_localeconv aeabi_errno_addr \
+       aeabi_mb_cur_max aeabi_atexit aeabi_memclr aeabi_memcpy \
+       aeabi_memmove aeabi_memset
+
+sysdep_routines += $(aeabi_constants) $(aeabi_routines)
+static-only-routines += $(aeabi_constants)
 endif
 
 # to pull in __aeabi_read_tp, needed for tls
 ifeq ($(subdir),malloc)
 $(objpfx)libmemusage.so: $(common-objpfx)libc_nonshared.a
 endif
+
+ifeq ($(subdir),gmon)
+sysdep_routines += arm-mcount
+endif
+
+ifeq ($(subdir),debug)
+CFLAGS-backtrace.c += -funwind-tables
+endif
+
+ifeq ($(subdir),math)
+$(objpfx)libm.so: $(elfobjdir)/ld.so
+endif

diff --git a/sysdeps/arm/eabi/Versions b/sysdeps/arm/Versions
similarity index 100%
rename from sysdeps/arm/eabi/Versions
rename to sysdeps/arm/Versions

diff --git a/sysdeps/arm/eabi/__longjmp.S b/sysdeps/arm/__longjmp.S
similarity index 100%
rename from sysdeps/arm/eabi/__longjmp.S
rename to sysdeps/arm/__longjmp.S

diff --git a/sysdeps/arm/eabi/abi-note.S b/sysdeps/arm/abi-note.S
similarity index 100%
rename from sysdeps/arm/eabi/abi-note.S
rename to sysdeps/arm/abi-note.S

diff --git a/sysdeps/arm/eabi/aeabi_assert.c b/sysdeps/arm/aeabi_assert.c
similarity index 100%
rename from sysdeps/arm/eabi/aeabi_assert.c
rename to sysdeps/arm/aeabi_assert.c

diff --git a/sysdeps/arm/eabi/aeabi_atexit.c b/sysdeps/arm/aeabi_atexit.c
similarity index 100%
rename from sysdeps/arm/eabi/aeabi_atexit.c
rename to sysdeps/arm/aeabi_atexit.c

diff --git a/sysdeps/arm/eabi/aeabi_errno_addr.c b/sysdeps/arm/aeabi_errno_addr.c
similarity index 100%
rename from sysdeps/arm/eabi/aeabi_errno_addr.c
rename to sysdeps/arm/aeabi_errno_addr.c

diff --git a/sysdeps/arm/eabi/aeabi_lcsts.c b/sysdeps/arm/aeabi_lcsts.c
similarity index 100%
rename from sysdeps/arm/eabi/aeabi_lcsts.c
rename to sysdeps/arm/aeabi_lcsts.c

diff --git a/sysdeps/arm/eabi/aeabi_localeconv.c b/sysdeps/arm/aeabi_localeconv.c
similarity index 100%
rename from sysdeps/arm/eabi/aeabi_localeconv.c
rename to sysdeps/arm/aeabi_localeconv.c

diff --git a/sysdeps/arm/eabi/aeabi_math.c b/sysdeps/arm/aeabi_math.c
similarity index 100%
rename from sysdeps/arm/eabi/aeabi_math.c
rename to sysdeps/arm/aeabi_math.c

diff --git a/sysdeps/arm/eabi/aeabi_mb_cur_max.c b/sysdeps/arm/aeabi_mb_cur_max.c
similarity index 100%
rename from sysdeps/arm/eabi/aeabi_mb_cur_max.c
rename to sysdeps/arm/aeabi_mb_cur_max.c

diff --git a/sysdeps/arm/eabi/aeabi_memclr.c b/sysdeps/arm/aeabi_memclr.c
similarity index 100%
rename from sysdeps/arm/eabi/aeabi_memclr.c
rename to sysdeps/arm/aeabi_memclr.c

diff --git a/sysdeps/arm/eabi/aeabi_memcpy.c b/sysdeps/arm/aeabi_memcpy.c
similarity index 100%
rename from sysdeps/arm/eabi/aeabi_memcpy.c
rename to sysdeps/arm/aeabi_memcpy.c

diff --git a/sysdeps/arm/eabi/aeabi_memmove.c b/sysdeps/arm/aeabi_memmove.c
similarity index 100%
rename from sysdeps/arm/eabi/aeabi_memmove.c
rename to sysdeps/arm/aeabi_memmove.c

diff --git a/sysdeps/arm/eabi/aeabi_memset.c b/sysdeps/arm/aeabi_memset.c
similarity index 100%
rename from sysdeps/arm/eabi/aeabi_memset.c
rename to sysdeps/arm/aeabi_memset.c

diff --git a/sysdeps/arm/eabi/aeabi_sighandlers.S b/sysdeps/arm/aeabi_sighandlers.S
similarity index 100%
rename from sysdeps/arm/eabi/aeabi_sighandlers.S
rename to sysdeps/arm/aeabi_sighandlers.S

diff --git a/sysdeps/arm/eabi/aeabi_unwind_cpp_pr1.c b/sysdeps/arm/aeabi_unwind_cpp_pr1.c
similarity index 100%
rename from sysdeps/arm/eabi/aeabi_unwind_cpp_pr1.c
rename to sysdeps/arm/aeabi_unwind_cpp_pr1.c

diff --git a/sysdeps/arm/eabi/arm-mcount.S b/sysdeps/arm/arm-mcount.S
similarity index 100%
rename from sysdeps/arm/eabi/arm-mcount.S
rename to sysdeps/arm/arm-mcount.S

diff --git a/sysdeps/arm/eabi/armv6t2/memchr.S b/sysdeps/arm/armv6t2/memchr.S
similarity index 100%
rename from sysdeps/arm/eabi/armv6t2/memchr.S
rename to sysdeps/arm/armv6t2/memchr.S

diff --git a/sysdeps/arm/eabi/armv7/Implies b/sysdeps/arm/armv7/Implies
similarity index 67%
rename from sysdeps/arm/eabi/armv7/Implies
rename to sysdeps/arm/armv7/Implies
index 8a784407f78befbcc054bd1f0a326a6a66c24233..c6cd0eb877310a6cbea77bffacae6a3ad9e802a7 100644 (file)
--- a/sysdeps/arm/eabi/armv7/Implies
+++ b/sysdeps/arm/armv7/Implies
@@ -1,2 +1,2 @@
 # We can do everything that 6T2 can
-arm/eabi/armv6t2
+arm/armv6t2

diff --git a/sysdeps/arm/eabi/backtrace.c b/sysdeps/arm/backtrace.c
similarity index 100%
rename from sysdeps/arm/eabi/backtrace.c
rename to sysdeps/arm/backtrace.c

diff --git a/sysdeps/arm/eabi/bits/fenv.h b/sysdeps/arm/bits/fenv.h
similarity index 100%
rename from sysdeps/arm/eabi/bits/fenv.h
rename to sysdeps/arm/bits/fenv.h

diff --git a/sysdeps/arm/eabi/bits/huge_val.h b/sysdeps/arm/bits/huge_val.h
similarity index 100%
rename from sysdeps/arm/eabi/bits/huge_val.h
rename to sysdeps/arm/bits/huge_val.h

diff --git a/sysdeps/arm/eabi/bits/setjmp.h b/sysdeps/arm/bits/setjmp.h
similarity index 100%
rename from sysdeps/arm/eabi/bits/setjmp.h
rename to sysdeps/arm/bits/setjmp.h

diff --git a/sysdeps/arm/eabi/Makefile b/sysdeps/arm/eabi/Makefile
deleted file mode 100644 (file)
index 025465a..0000000
--- a/sysdeps/arm/eabi/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-ifeq ($(subdir),csu)
-aeabi_constants = aeabi_lcsts aeabi_sighandlers aeabi_math
-aeabi_routines = aeabi_assert aeabi_localeconv aeabi_errno_addr \
-       aeabi_mb_cur_max aeabi_atexit aeabi_memclr aeabi_memcpy \
-       aeabi_memmove aeabi_memset
-
-sysdep_routines += $(aeabi_constants) $(aeabi_routines)
-static-only-routines += $(aeabi_constants)
-
-# get offset to rtld_global._dl_hwcap
-gen-as-const-headers += rtld-global-offsets.sym
-endif
-
-ifeq ($(subdir),gmon)
-sysdep_routines += arm-mcount
-endif
-
-ifeq ($(subdir),debug)
-CFLAGS-backtrace.c += -funwind-tables
-endif
-
-ifeq ($(subdir),elf)
-sysdep_routines += aeabi_unwind_cpp_pr1 find_exidx
-shared-only-routines += aeabi_unwind_cpp_pr1
-sysdep-rtld-routines += aeabi_unwind_cpp_pr1
-endif
-
-ifeq ($(subdir),math)
-$(objpfx)libm.so: $(elfobjdir)/ld.so
-endif

diff --git a/sysdeps/arm/eabi/fclrexcpt.c b/sysdeps/arm/fclrexcpt.c
similarity index 100%
rename from sysdeps/arm/eabi/fclrexcpt.c
rename to sysdeps/arm/fclrexcpt.c

diff --git a/sysdeps/arm/eabi/fedisblxcpt.c b/sysdeps/arm/fedisblxcpt.c
similarity index 100%
rename from sysdeps/arm/eabi/fedisblxcpt.c
rename to sysdeps/arm/fedisblxcpt.c

diff --git a/sysdeps/arm/eabi/feenablxcpt.c b/sysdeps/arm/feenablxcpt.c
similarity index 100%
rename from sysdeps/arm/eabi/feenablxcpt.c
rename to sysdeps/arm/feenablxcpt.c

diff --git a/sysdeps/arm/eabi/fegetenv.c b/sysdeps/arm/fegetenv.c
similarity index 100%
rename from sysdeps/arm/eabi/fegetenv.c
rename to sysdeps/arm/fegetenv.c

diff --git a/sysdeps/arm/eabi/fegetexcept.c b/sysdeps/arm/fegetexcept.c
similarity index 100%
rename from sysdeps/arm/eabi/fegetexcept.c
rename to sysdeps/arm/fegetexcept.c

diff --git a/sysdeps/arm/eabi/fegetround.c b/sysdeps/arm/fegetround.c
similarity index 100%
rename from sysdeps/arm/eabi/fegetround.c
rename to sysdeps/arm/fegetround.c

diff --git a/sysdeps/arm/eabi/feholdexcpt.c b/sysdeps/arm/feholdexcpt.c
similarity index 100%
rename from sysdeps/arm/eabi/feholdexcpt.c
rename to sysdeps/arm/feholdexcpt.c

diff --git a/sysdeps/arm/eabi/fesetenv.c b/sysdeps/arm/fesetenv.c
similarity index 100%
rename from sysdeps/arm/eabi/fesetenv.c
rename to sysdeps/arm/fesetenv.c

diff --git a/sysdeps/arm/eabi/fesetround.c b/sysdeps/arm/fesetround.c
similarity index 100%
rename from sysdeps/arm/eabi/fesetround.c
rename to sysdeps/arm/fesetround.c

diff --git a/sysdeps/arm/eabi/feupdateenv.c b/sysdeps/arm/feupdateenv.c
similarity index 100%
rename from sysdeps/arm/eabi/feupdateenv.c
rename to sysdeps/arm/feupdateenv.c

diff --git a/sysdeps/arm/eabi/fgetexcptflg.c b/sysdeps/arm/fgetexcptflg.c
similarity index 100%
rename from sysdeps/arm/eabi/fgetexcptflg.c
rename to sysdeps/arm/fgetexcptflg.c

diff --git a/sysdeps/arm/eabi/find_exidx.c b/sysdeps/arm/find_exidx.c
similarity index 100%
rename from sysdeps/arm/eabi/find_exidx.c
rename to sysdeps/arm/find_exidx.c

diff --git a/sysdeps/arm/eabi/fpu_control.h b/sysdeps/arm/fpu_control.h
similarity index 100%
rename from sysdeps/arm/eabi/fpu_control.h
rename to sysdeps/arm/fpu_control.h

diff --git a/sysdeps/arm/eabi/fraiseexcpt.c b/sysdeps/arm/fraiseexcpt.c
similarity index 100%
rename from sysdeps/arm/eabi/fraiseexcpt.c
rename to sysdeps/arm/fraiseexcpt.c

diff --git a/sysdeps/arm/eabi/fsetexcptflg.c b/sysdeps/arm/fsetexcptflg.c
similarity index 100%
rename from sysdeps/arm/eabi/fsetexcptflg.c
rename to sysdeps/arm/fsetexcptflg.c

diff --git a/sysdeps/arm/eabi/ftestexcept.c b/sysdeps/arm/ftestexcept.c
similarity index 100%
rename from sysdeps/arm/eabi/ftestexcept.c
rename to sysdeps/arm/ftestexcept.c

diff --git a/sysdeps/arm/eabi/jmpbuf-offsets.h b/sysdeps/arm/jmpbuf-offsets.h
similarity index 100%
rename from sysdeps/arm/eabi/jmpbuf-offsets.h
rename to sysdeps/arm/jmpbuf-offsets.h

diff --git a/sysdeps/arm/eabi/machine-gmon.h b/sysdeps/arm/machine-gmon.h
similarity index 100%
rename from sysdeps/arm/eabi/machine-gmon.h
rename to sysdeps/arm/machine-gmon.h

diff --git a/sysdeps/arm/preconfigure b/sysdeps/arm/preconfigure
index a4967004f494b1042ae4fcd2568c7fa0d8f6ad60..d98c167a95e87513931fdd4c2e01926034e819ef 100644 (file)
--- a/sysdeps/arm/preconfigure
+++ b/sysdeps/arm/preconfigure
@@ -7,7 +7,7 @@ arm*)
                # Unfortunately it doesn't define any flags for implementations
                # that you might pass to -mcpu or -mtune
                # Note if you add patterns here you must ensure that
-               # an appropriate directory exists in sysdeps/arm/eabi
+               # an appropriate directory exists in sysdeps/arm
                archcppflag=`echo "" |
                $CC $CFLAGS $CPPFLAGS -E -dM - |
                  grep __ARM_ARCH |
@@ -35,7 +35,7 @@ arm*)
                  ;;
                esac
 
-               machine=arm/eabi/$machine
+               machine=arm/$machine
                if [ "${CFLAGS+set}" != "set" ]; then
                  CFLAGS="-g -O2"
                fi

diff --git a/sysdeps/arm/eabi/rtld-global-offsets.sym b/sysdeps/arm/rtld-global-offsets.sym
similarity index 100%
rename from sysdeps/arm/eabi/rtld-global-offsets.sym
rename to sysdeps/arm/rtld-global-offsets.sym

diff --git a/sysdeps/arm/eabi/setfpucw.c b/sysdeps/arm/setfpucw.c
similarity index 100%
rename from sysdeps/arm/eabi/setfpucw.c
rename to sysdeps/arm/setfpucw.c

diff --git a/sysdeps/arm/eabi/setjmp.S b/sysdeps/arm/setjmp.S
similarity index 100%
rename from sysdeps/arm/eabi/setjmp.S
rename to sysdeps/arm/setjmp.S

diff --git a/sysdeps/unix/sysv/linux/arm/getcontext.S b/sysdeps/unix/sysv/linux/arm/getcontext.S
index 435eb12c8f3bba95ccb47b07c90d12d8abb09557..116d6e8f357518696ed4220f45c161d2bd5b20b8 100644 (file)
--- a/sysdeps/unix/sysv/linux/arm/getcontext.S
+++ b/sysdeps/unix/sysv/linux/arm/getcontext.S
@@ -48,7 +48,7 @@ ENTRY(__getcontext)
        add     r2, r4, #UCONTEXT_SIGMASK
        bl      PLTJMP(__sigprocmask)
        
-       /* Store FP regs.  Much of the FP code is copied from arm/eabi/setjmp.S.  */
+       /* Store FP regs.  Much of the FP code is copied from arm/setjmp.S.  */
 
 #ifdef PIC
         ldr     r2, 1f

diff --git a/sysdeps/unix/sysv/linux/arm/setcontext.S b/sysdeps/unix/sysv/linux/arm/setcontext.S
index 78003f52dc3c316b955a1f4bae2a5cb96562e321..b472947731d438196f56db4cb176ef7963d710ba 100644 (file)
--- a/sysdeps/unix/sysv/linux/arm/setcontext.S
+++ b/sysdeps/unix/sysv/linux/arm/setcontext.S
@@ -29,7 +29,7 @@ ENTRY(__setcontext)
        mov     r4, r0
        add     r0, r0, #UCONTEXT_REGSPACE
 
-        /* Restore the VFP registers.  Copied from arm/eabi/__longjmp.S.  */
+        /* Restore the VFP registers.  Copied from arm/__longjmp.S.  */
 #ifdef PIC
         ldr     r2, 1f
         ldr     r1, Lrtld_global_ro