Merge sysdeps/arm/eabi into sysdeps/arm.
This commit is contained in:
Joseph Myers
parent
25593dcaf4
commit
1f60a18d81
109
ChangeLog.arm
109
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.
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
# We can do everything that 6T2 can
|
||||
arm/eabi/armv6t2
|
||||
arm/armv6t2
|
||||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in New Issue