From 25fa7e5ad63d97d00deef1c9eddb346d1134ba72 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Tue, 14 Jun 2011 13:40:48 +0000 Subject: [PATCH] libgloss: * configure.in: Don't handle strongarm, ep9312 and xscale target names. * configure: Regenerate. * libnosys/configure.in: Don't handle strongarm and thumb target names. * libnosys/configure: Regenerate. newlib: * configure.host: Don't handle ep9312, strongarm, xscale and thumb target names. * libc/machine/configure.in: Don't handle xscale target names. * libc/machine/configure: Regenerate. --- libgloss/ChangeLog | 9 ++++ libgloss/configure | 2 +- libgloss/configure.in | 2 +- libgloss/libnosys/configure | 6 --- libgloss/libnosys/configure.in | 6 --- newlib/ChangeLog | 7 ++++ newlib/configure.host | 71 -------------------------------- newlib/libc/machine/configure | 19 +++------ newlib/libc/machine/configure.in | 1 - 9 files changed, 24 insertions(+), 99 deletions(-) diff --git a/libgloss/ChangeLog b/libgloss/ChangeLog index 629fb8826..fa25a5c8d 100644 --- a/libgloss/ChangeLog +++ b/libgloss/ChangeLog @@ -1,3 +1,12 @@ +2011-06-14 Joseph Myers + + * configure.in: Don't handle strongarm, ep9312 and xscale target + names. + * configure: Regenerate. + * libnosys/configure.in: Don't handle strongarm and thumb target + names. + * libnosys/configure: Regenerate. + 2011-05-27 Nick Clifton * v8500/sbrk.c (_sbrk): Tidy code. diff --git a/libgloss/configure b/libgloss/configure index 55a30ae30..e897d3a51 100755 --- a/libgloss/configure +++ b/libgloss/configure @@ -2557,7 +2557,7 @@ case "${target}" in subdirs="$subdirs rx" ;; - strongarm-*-elf | strongarm-*-coff | arm*-*-elf | arm*-*-coff | ep9312-*-elf | ep9312-*-coff | xscale-*-elf | xscale-*-coff | *arm-*-*) + arm*-*-elf | arm*-*-coff | arm-*-*) subdirs="$subdirs arm" ;; diff --git a/libgloss/configure.in b/libgloss/configure.in index 8bbe0cacd..a1eb47c4f 100644 --- a/libgloss/configure.in +++ b/libgloss/configure.in @@ -124,7 +124,7 @@ case "${target}" in rx*-*-elf) AC_CONFIG_SUBDIRS([rx]) ;; - strongarm-*-elf | strongarm-*-coff | arm*-*-elf | arm*-*-coff | ep9312-*-elf | ep9312-*-coff | xscale-*-elf | xscale-*-coff | *arm-*-*) + arm*-*-elf | arm*-*-coff | arm-*-*) AC_CONFIG_SUBDIRS([arm]) ;; spu-*-elf) diff --git a/libgloss/libnosys/configure b/libgloss/libnosys/configure index 776971bfc..7d8603dbc 100755 --- a/libgloss/libnosys/configure +++ b/libgloss/libnosys/configure @@ -2050,8 +2050,6 @@ case "${target}" in ;; arm-*-*) ;; - strongarm-*-*) - ;; bfin-*-*) ;; cris-*-* | crisv32-*-*) @@ -2078,10 +2076,6 @@ case "${target}" in ;; sparc64-*-*) ;; - thumb-*-pe) - ;; - thumb-*-*) - ;; v850*-*-*) ;; w65-*-*) diff --git a/libgloss/libnosys/configure.in b/libgloss/libnosys/configure.in index 218c9957c..3658ebf42 100644 --- a/libgloss/libnosys/configure.in +++ b/libgloss/libnosys/configure.in @@ -49,8 +49,6 @@ case "${target}" in ;; arm-*-*) ;; - strongarm-*-*) - ;; bfin-*-*) ;; cris-*-* | crisv32-*-*) @@ -77,10 +75,6 @@ case "${target}" in ;; sparc64-*-*) ;; - thumb-*-pe) - ;; - thumb-*-*) - ;; v850*-*-*) ;; w65-*-*) diff --git a/newlib/ChangeLog b/newlib/ChangeLog index 350c93345..ae6dcc8ff 100644 --- a/newlib/ChangeLog +++ b/newlib/ChangeLog @@ -1,3 +1,10 @@ +2011-06-14 Joseph Myers + + * configure.host: Don't handle ep9312, strongarm, xscale and thumb + target names. + * libc/machine/configure.in: Don't handle xscale target names. + * libc/machine/configure: Regenerate. + 2011-06-14 Craig Howland * libc/time/tzset_r.c (tzset_r): Correct behavior for changing from diff --git a/newlib/configure.host b/newlib/configure.host index a71d6303f..9661f69e7 100644 --- a/newlib/configure.host +++ b/newlib/configure.host @@ -122,9 +122,6 @@ case "${host_cpu}" in d30v*) machine_dir=d30v ;; - ep9312) - machine_dir=arm - ;; fido) machine_dir=m68k newlib_cflags="${newlib_cflags} -DCOMPACT_CTYPE" @@ -242,15 +239,6 @@ case "${host_cpu}" in # FIXME: Might wish to make MALLOC_ALIGNMENT more generic. newlib_cflags="${newlib_cflags} -DMALLOC_ALIGNMENT=8" ;; - strongarm) - machine_dir=arm - ;; - xscale) - machine_dir=xscale - ;; - thumb) - machine_dir=arm - ;; tic4x|c4x) machine_dir=tic4x ;; @@ -393,12 +381,6 @@ case "${host}" in d30v*) sys_dir= ;; - ep9312-*-*) - sys_dir=arm - if [ "x${newlib_may_supply_syscalls}" = "xno" ] ; then - have_crt0="no" - fi - ;; frv*) sys_dir= ;; @@ -495,18 +477,6 @@ case "${host}" in default_newlib_io_long_long="yes" default_newlib_atexit_dynamic_alloc="no" ;; - strongarm-*-*) - sys_dir=arm - if [ "x${newlib_may_supply_syscalls}" = "xno" ] ; then - have_crt0="no" - fi - ;; - thumb-*-*) - sys_dir=arm - if [ "x${newlib_may_supply_syscalls}" = "xno" ] ; then - have_crt0="no" - fi - ;; tic6x*) newlib_cflags="${newlib_cflags} -DMISSING_SYSCALL_NAMES" have_crt0="no" @@ -529,12 +499,6 @@ case "${host}" in w65-*-*) sys_dir=w65 ;; - xscale-*-*) - sys_dir=arm - if [ "x${newlib_may_supply_syscalls}" = "xno" ] ; then - have_crt0="no" - fi - ;; z8k-*-coff) sys_dir=z8ksim ;; @@ -596,7 +560,6 @@ case "${host}" in # to create the program's environment. # If --disable-newlib-supplied-syscalls is specified, then the end-user # may specify the protocol via gcc spec files supplied by libgloss. -# See also thumb below. if [ "x${newlib_may_supply_syscalls}" = "xyes" ] ; then # newlib_cflags="${newlib_cflags} -DARM_RDP_MONITOR" newlib_cflags="${newlib_cflags} -DARM_RDI_MONITOR" @@ -631,12 +594,6 @@ case "${host}" in newlib_cflags="${newlib_cflags} -DABORT_MESSAGE -DSMALL_MEMORY -DMISSING_SYSCALL_NAMES" syscall_dir= ;; - ep9312-*-*) - syscall_dir=syscalls - if [ "x${newlib_may_supply_syscalls}" = "xyes" ] ; then - newlib_cflags="${newlib_cflags} -DARM_RDI_MONITOR" - fi - ;; fido-*-elf) newlib_cflags="${newlib_cflags} -DHAVE_RENAME -DHAVE_SYSTEM -DMISSING_SYSCALL_NAMES" syscall_dir= @@ -760,27 +717,6 @@ case "${host}" in newlib_cflags="${newlib_cflags} -DTARGET_PTR_SIZE=64" ;; esac ;; - strongarm-*-*) - syscall_dir=syscalls - ;; - thumb-*-pe) - syscall_dir=syscalls -# Don't use the debugging protocols just yet. - ;; - thumb-*-*) - syscall_dir=syscalls -# If newlib is supplying syscalls, select which debug protocol is being used. -# ARM_RDP_MONITOR selects the Demon monitor. -# ARM_RDI_MONITOR selects the Angel monitor. -# If neither are defined, then hard coded defaults will be used -# to create the program's environment. -# If --disable-newlib-supplied-syscalls is specified, then the end-user -# may specify the protocol via gcc spec files supplied by libgloss. - if [ "x${newlib_may_supply_syscalls}" = "xyes" ] ; then -# newlib_cflags="${newlib_cflags} -DARM_RDP_MONITOR" - newlib_cflags="${newlib_cflags} -DARM_RDI_MONITOR" - fi - ;; tic6x*) syscall_dir= newlib_cflags="${newlib_cflags} -DCLOCK_PROVIDED" @@ -798,13 +734,6 @@ case "${host}" in xc16x-*) syscall_dir=syscalls ;; - xscale-*-*) - syscall_dir=syscalls - newlib_cflags="${newlib_cflags} -DHAVE_SYSTEM -DHAVE_RENAME" - if [ "x${newlib_may_supply_syscalls}" = "xyes" ] ; then - newlib_cflags="${newlib_cflags} -DARM_RDI_MONITOR" - fi - ;; xstormy16-*-*) syscall_dir=syscalls ;; diff --git a/newlib/libc/machine/configure b/newlib/libc/machine/configure index 3a4ece3a0..9d38f8618 100755 --- a/newlib/libc/machine/configure +++ b/newlib/libc/machine/configure @@ -651,6 +651,7 @@ ELIX_LEVEL_1_TRUE ELIX_LEVEL_0_FALSE ELIX_LEVEL_0_TRUE LDFLAGS +NO_INCLUDE_LIST NEWLIB_CFLAGS CCASFLAGS CCAS @@ -816,7 +817,6 @@ v850 w65 x86_64 xc16x -xscale xstormy16 z8k' @@ -3694,6 +3694,9 @@ newlib_cflags="${newlib_cflags} -fno-builtin" NEWLIB_CFLAGS=${newlib_cflags} +NO_INCLUDE_LIST=${noinclude} + + LDFLAGS=${ldflags} @@ -9660,10 +9663,6 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_shlibpath_var=no ;; - freebsd1*) - ld_shlibs=no - ;; - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor # support. Future versions do this automatically, but an explicit c++rt0.o # does not break anything, and helps significantly (at the cost of a little @@ -10582,10 +10581,6 @@ dgux*) shlibpath_var=LD_LIBRARY_PATH ;; -freebsd1*) - dynamic_linker=no - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -11445,7 +11440,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11448 "configure" +#line 11443 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11551,7 +11546,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11554 "configure" +#line 11549 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11877,8 +11872,6 @@ subdirs="$subdirs a29k" x86_64) subdirs="$subdirs x86_64" ;; xc16x) subdirs="$subdirs xc16x" - ;; - xscale) subdirs="$subdirs xscale" ;; xstormy16) subdirs="$subdirs xstormy16" ;; diff --git a/newlib/libc/machine/configure.in b/newlib/libc/machine/configure.in index 7cd9036de..249265602 100644 --- a/newlib/libc/machine/configure.in +++ b/newlib/libc/machine/configure.in @@ -65,7 +65,6 @@ if test -n "${machine_dir}"; then w65) AC_CONFIG_SUBDIRS(w65) ;; x86_64) AC_CONFIG_SUBDIRS(x86_64) ;; xc16x) AC_CONFIG_SUBDIRS(xc16x) ;; - xscale) AC_CONFIG_SUBDIRS(xscale) ;; xstormy16) AC_CONFIG_SUBDIRS(xstormy16) ;; z8k) AC_CONFIG_SUBDIRS(z8k) ;; esac; -- 2.43.5