2004-06-09 Toralf Lund <toralf@procaptura.com>
* libc/sys/arm/setjmp.S, libc/sys/arm/access.c: Move files from libc/sys/arm to libc/machine/arm. * libc/machine/arm/Makefile.am, libc/machine/arm/Makefile.in: Add library build support for files moved from libc/sys/arm. * libc/sys/arm/Makefile.am, libc/sys/arm/Makefile.in: Remove references to access and setjmp. * configure.host: Add checks for newlib_may_supply_syscalls to determine whether or not to use sys/arm directory and use special compiler flags: ARM_RDI_MONITOR and ARM_RDP_MONITOR.
This commit is contained in:
parent
cc24f9b669
commit
a170abec08
|
@ -1,3 +1,15 @@
|
|||
2004-06-09 Toralf Lund <toralf@procaptura.com>
|
||||
|
||||
* libc/sys/arm/setjmp.S, libc/sys/arm/access.c: Move
|
||||
files from libc/sys/arm to libc/machine/arm.
|
||||
* libc/machine/arm/Makefile.am, libc/machine/arm/Makefile.in: Add
|
||||
library build support for files moved from libc/sys/arm.
|
||||
* libc/sys/arm/Makefile.am, libc/sys/arm/Makefile.in: Remove
|
||||
references to access and setjmp.
|
||||
* configure.host: Add checks for newlib_may_supply_syscalls to
|
||||
determine whether or not to use sys/arm directory and use
|
||||
special compiler flags: ARM_RDI_MONITOR and ARM_RDP_MONITOR.
|
||||
|
||||
2004-06-02 Jeff Johnston <jjohnstn@redhat.com>
|
||||
|
||||
* libc/stdio/vfscanf.c (__svfscanf_r): For CT_INT conversions,
|
||||
|
|
|
@ -302,7 +302,9 @@ case "${host}" in
|
|||
sys_dir=arc
|
||||
;;
|
||||
arm-*-*)
|
||||
sys_dir=arm
|
||||
if [ "x${newlib_may_supply_syscalls}" = "xyes" ] ; then
|
||||
sys_dir=arm
|
||||
fi
|
||||
;;
|
||||
d10v*)
|
||||
sys_dir=d10v
|
||||
|
@ -311,8 +313,13 @@ case "${host}" in
|
|||
sys_dir=
|
||||
;;
|
||||
ep9312-*-*)
|
||||
sys_dir=arm
|
||||
if [ "x${newlib_may_supply_syscalls}" = "xyes" ] ; then
|
||||
sys_dir=arm
|
||||
fi
|
||||
;;
|
||||
frv*)
|
||||
sys_dir=
|
||||
;;
|
||||
h8300-*-hms*)
|
||||
sys_dir=h8300hms
|
||||
;;
|
||||
|
@ -387,13 +394,14 @@ case "${host}" in
|
|||
unix_dir=unix
|
||||
;;
|
||||
strongarm-*-*)
|
||||
sys_dir=arm
|
||||
;;
|
||||
xscale-*-*)
|
||||
sys_dir=arm
|
||||
if [ "x${newlib_may_supply_syscalls}" = "xyes" ] ; then
|
||||
sys_dir=arm
|
||||
fi
|
||||
;;
|
||||
thumb-*-*)
|
||||
sys_dir=arm
|
||||
if [ "x${newlib_may_supply_syscalls}" = "xyes" ] ; then
|
||||
sys_dir=arm
|
||||
fi
|
||||
;;
|
||||
tic80*)
|
||||
sys_dir=tic80
|
||||
|
@ -413,12 +421,14 @@ case "${host}" in
|
|||
v850ea-*-*)
|
||||
sys_dir=sysnecv850
|
||||
;;
|
||||
frv*)
|
||||
sys_dir=
|
||||
;;
|
||||
w65-*-*)
|
||||
sys_dir=w65
|
||||
;;
|
||||
xscale-*-*)
|
||||
if [ "x${newlib_may_supply_syscalls}" = "xyes" ] ; then
|
||||
sys_dir=arm
|
||||
fi
|
||||
;;
|
||||
z8k-*-coff)
|
||||
sys_dir=z8ksim
|
||||
;;
|
||||
|
@ -465,19 +475,22 @@ case "${host}" in
|
|||
arm-*-pe)
|
||||
syscall_dir=syscalls
|
||||
newlib_cflags="${newlib_cflags} -DABORT_PROVIDED -DHAVE_GETTIMEOFDAY"
|
||||
# Don't use the debugging protocols just yet.
|
||||
;;
|
||||
arm-*-*)
|
||||
syscall_dir=syscalls
|
||||
newlib_cflags="${newlib_cflags} -DABORT_PROVIDED -DHAVE_GETTIMEOFDAY"
|
||||
# Select which debug protocol is being used.
|
||||
# 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.
|
||||
# See also thumb below.
|
||||
# newlib_cflags="${newlib_cflags} -DARM_RDP_MONITOR"
|
||||
newlib_cflags="${newlib_cflags} -DARM_RDI_MONITOR"
|
||||
if [ "x${newlib_may_supply_syscalls}" = "xyes" ] ; then
|
||||
# newlib_cflags="${newlib_cflags} -DARM_RDP_MONITOR"
|
||||
newlib_cflags="${newlib_cflags} -DARM_RDI_MONITOR"
|
||||
fi
|
||||
;;
|
||||
avr*)
|
||||
newlib_cflags="${newlib_cflags} -DNO_EXEC -DSMALL_MEMORY -DMISSING_SYSCALL_NAMES"
|
||||
|
@ -493,7 +506,9 @@ case "${host}" in
|
|||
ep9312-*-*)
|
||||
syscall_dir=syscalls
|
||||
newlib_cflags="${newlib_cflags} -DABORT_PROVIDED -DHAVE_GETTIMEOFDAY"
|
||||
newlib_cflags="${newlib_cflags} -DARM_RDI_MONITOR"
|
||||
if [ "x${newlib_may_supply_syscalls}" = "xyes" ] ; then
|
||||
newlib_cflags="${newlib_cflags} -DARM_RDI_MONITOR"
|
||||
fi
|
||||
;;
|
||||
fr30-*-*)
|
||||
syscall_dir=syscalls
|
||||
|
@ -593,13 +608,6 @@ case "${host}" in
|
|||
strongarm-*-*)
|
||||
syscall_dir=syscalls
|
||||
newlib_cflags="${newlib_cflags} -DABORT_PROVIDED -DHAVE_GETTIMEOFDAY"
|
||||
newlib_cflags="${newlib_cflags} -DARM_RDI_MONITOR"
|
||||
;;
|
||||
xscale-*-*)
|
||||
syscall_dir=syscalls
|
||||
newlib_cflags="${newlib_cflags} -DABORT_PROVIDED -DHAVE_GETTIMEOFDAY"
|
||||
newlib_cflags="${newlib_cflags} -DARM_RDI_MONITOR"
|
||||
newlib_cflags="${newlib_cflags} -DHAVE_SYSTEM -DHAVE_RENAME"
|
||||
;;
|
||||
thumb-*-pe)
|
||||
syscall_dir=syscalls
|
||||
|
@ -609,14 +617,17 @@ case "${host}" in
|
|||
thumb-*-*)
|
||||
syscall_dir=syscalls
|
||||
newlib_cflags="${newlib_cflags} -DABORT_PROVIDED -DHAVE_GETTIMEOFDAY"
|
||||
# Select which debug protocol is being used.
|
||||
# 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.
|
||||
# See also arm and strongarm above.
|
||||
# newlib_cflags="${newlib_cflags} -DARM_RDP_MONITOR"
|
||||
newlib_cflags="${newlib_cflags} -DARM_RDI_MONITOR"
|
||||
# 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
|
||||
;;
|
||||
tic80*)
|
||||
syscall_dir=syscalls
|
||||
|
@ -634,6 +645,14 @@ case "${host}" in
|
|||
syscall_dir=syscalls
|
||||
newlib_cflags="${newlib_cflags} -DSMALL_DTOA -DSMALL_MEMORY"
|
||||
;;
|
||||
xscale-*-*)
|
||||
syscall_dir=syscalls
|
||||
newlib_cflags="${newlib_cflags} -DABORT_PROVIDED -DHAVE_GETTIMEOFDAY"
|
||||
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-*-*)
|
||||
newlib_cflags="${newlib_cflags} -DHAVE_GETTIMEOFDAY"
|
||||
syscall_dir=syscalls
|
||||
|
|
|
@ -6,7 +6,7 @@ INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
|
|||
|
||||
noinst_LIBRARIES = lib.a
|
||||
|
||||
lib_a_SOURCES =
|
||||
lib_a_SOURCES = setjmp.S access.c
|
||||
|
||||
ACLOCAL_AMFLAGS = -I ../../..
|
||||
CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
|
||||
|
|
|
@ -89,7 +89,7 @@ INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
|
|||
|
||||
noinst_LIBRARIES = lib.a
|
||||
|
||||
lib_a_SOURCES =
|
||||
lib_a_SOURCES = setjmp.S access.c
|
||||
|
||||
ACLOCAL_AMFLAGS = -I ../../..
|
||||
CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
|
||||
|
@ -103,7 +103,11 @@ DEFS = @DEFS@ -I. -I$(srcdir)
|
|||
CPPFLAGS = @CPPFLAGS@
|
||||
LIBS = @LIBS@
|
||||
lib_a_LIBADD =
|
||||
lib_a_OBJECTS =
|
||||
lib_a_OBJECTS = setjmp.o access.o
|
||||
CFLAGS = @CFLAGS@
|
||||
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
||||
CCLD = $(CC)
|
||||
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
|
||||
DIST_COMMON = Makefile.am Makefile.in aclocal.m4 configure configure.in
|
||||
|
||||
|
||||
|
@ -166,9 +170,35 @@ lib.a: $(lib_a_OBJECTS) $(lib_a_DEPENDENCIES)
|
|||
-rm -f lib.a
|
||||
$(AR) cru lib.a $(lib_a_OBJECTS) $(lib_a_LIBADD)
|
||||
$(RANLIB) lib.a
|
||||
tags: TAGS
|
||||
TAGS:
|
||||
|
||||
tags: TAGS
|
||||
|
||||
ID: $(HEADERS) $(SOURCES) $(LISP)
|
||||
list='$(SOURCES) $(HEADERS)'; \
|
||||
unique=`for i in $$list; do echo $$i; done | \
|
||||
awk ' { files[$$0] = 1; } \
|
||||
END { for (i in files) print i; }'`; \
|
||||
here=`pwd` && cd $(srcdir) \
|
||||
&& mkid -f$$here/ID $$unique $(LISP)
|
||||
|
||||
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP)
|
||||
tags=; \
|
||||
here=`pwd`; \
|
||||
list='$(SOURCES) $(HEADERS)'; \
|
||||
unique=`for i in $$list; do echo $$i; done | \
|
||||
awk ' { files[$$0] = 1; } \
|
||||
END { for (i in files) print i; }'`; \
|
||||
test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
|
||||
|| (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
|
||||
|
||||
mostlyclean-tags:
|
||||
|
||||
clean-tags:
|
||||
|
||||
distclean-tags:
|
||||
-rm -f TAGS ID
|
||||
|
||||
maintainer-clean-tags:
|
||||
|
||||
distdir = $(PACKAGE)-$(VERSION)
|
||||
top_distdir = $(distdir)
|
||||
|
@ -256,24 +286,24 @@ distclean-generic:
|
|||
|
||||
maintainer-clean-generic:
|
||||
mostlyclean-am: mostlyclean-noinstLIBRARIES mostlyclean-compile \
|
||||
mostlyclean-generic
|
||||
mostlyclean-tags mostlyclean-generic
|
||||
|
||||
mostlyclean: mostlyclean-am
|
||||
|
||||
clean-am: clean-noinstLIBRARIES clean-compile clean-generic \
|
||||
clean-am: clean-noinstLIBRARIES clean-compile clean-tags clean-generic \
|
||||
mostlyclean-am
|
||||
|
||||
clean: clean-am
|
||||
|
||||
distclean-am: distclean-noinstLIBRARIES distclean-compile \
|
||||
distclean-generic clean-am
|
||||
distclean-tags distclean-generic clean-am
|
||||
|
||||
distclean: distclean-am
|
||||
-rm -f config.status
|
||||
|
||||
maintainer-clean-am: maintainer-clean-noinstLIBRARIES \
|
||||
maintainer-clean-compile maintainer-clean-generic \
|
||||
distclean-am
|
||||
maintainer-clean-compile maintainer-clean-tags \
|
||||
maintainer-clean-generic distclean-am
|
||||
@echo "This command is intended for maintainers to use;"
|
||||
@echo "it deletes files that may require special tools to rebuild."
|
||||
|
||||
|
@ -283,7 +313,8 @@ maintainer-clean: maintainer-clean-am
|
|||
.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
|
||||
clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
|
||||
mostlyclean-compile distclean-compile clean-compile \
|
||||
maintainer-clean-compile tags distdir info-am info dvi-am dvi check \
|
||||
maintainer-clean-compile tags mostlyclean-tags distclean-tags \
|
||||
clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
|
||||
check-am installcheck-am installcheck install-info-am install-info \
|
||||
install-exec-am install-exec install-data-am install-data install-am \
|
||||
install uninstall-am uninstall all-redirect all-am all installdirs \
|
||||
|
|
|
@ -12,7 +12,7 @@ else
|
|||
extra_objs =
|
||||
endif
|
||||
|
||||
lib_a_SOURCES = access.c libcfunc.c trap.S setjmp.S
|
||||
lib_a_SOURCES = libcfunc.c trap.S
|
||||
lib_a_LIBADD = $(extra_objs)
|
||||
lib_a_DEPENDENCIES = $(extra_objs)
|
||||
|
||||
|
|
|
@ -91,7 +91,7 @@ noinst_LIBRARIES = lib.a
|
|||
@MAY_SUPPLY_SYSCALLS_TRUE@extra_objs = syscalls.o
|
||||
@MAY_SUPPLY_SYSCALLS_FALSE@extra_objs =
|
||||
|
||||
lib_a_SOURCES = access.c libcfunc.c trap.S setjmp.S
|
||||
lib_a_SOURCES = libcfunc.c trap.S
|
||||
lib_a_LIBADD = $(extra_objs)
|
||||
lib_a_DEPENDENCIES = $(extra_objs)
|
||||
|
||||
|
@ -106,7 +106,7 @@ LIBRARIES = $(noinst_LIBRARIES)
|
|||
DEFS = @DEFS@ -I. -I$(srcdir)
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
LIBS = @LIBS@
|
||||
lib_a_OBJECTS = access.o libcfunc.o trap.o setjmp.o
|
||||
lib_a_OBJECTS = libcfunc.o trap.o
|
||||
CFLAGS = @CFLAGS@
|
||||
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
||||
CCLD = $(CC)
|
||||
|
|
Loading…
Reference in New Issue