Merge from eCos master repository on 2000-08-21-22:40:54-BST

host/ChangeLog

@@ -1,3 +1,11 @@
+2000-08-18  Bart Veer  <[email protected]>
+
+	* configure.in:
+	Allow cross-compilation
+
+	* Makefile.in, configure:
+	Regenerate
+
 2000-03-13  John Dallway  <[email protected]>
 
 	* README:

host/Makefile.in

@@ -240,7 +240,7 @@ distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
 	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
-	    cp -pr $$/$$file $(distdir)/$$file; \
+	    cp -pr $$d/$$file $(distdir)/$$file; \
 	  else \
 	    test -f $(distdir)/$$file \
 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \

host/configure.in

@@ -56,13 +56,6 @@ AC_OBJEXT
 AC_EXEEXT
 CYG_AC_PROG_MSVC
 
-dnl The eCos host-side only supports native builds, not cross-compilation.
-dnl Cross-compilation should not be impossible, but various macros
-dnl including testing for 64-bit require the ability to run code.
-if test "${cross_compiling}" = "yes"; then
-  AC_MSG_ERROR(cross-compilation of this package is not supported)
-fi
-
 dnl Allow the usual assertion and trace related options.
 CYG_AC_ARG_INFRASTRUCTURE
 

host/infra/ChangeLog

@@ -1,3 +1,11 @@
+2000-08-18  Bart Veer  <[email protected]>
+
+	* acinclude.m4, configure.in:
+	Allow cross-compilation
+
+	* aclocal.m4, configure, Makefile.in, testsuite/Makefile.in
+	Regenerate
+
 1999-08-12  Bart Veer  <[email protected]>
 
 	* configure:

host/infra/Makefile.in

@@ -83,10 +83,20 @@ AUTOMAKE_OPTIONS = 1.3 cygnus
 SUBDIRS = testsuite
 
 noinst_LIBRARIES = libcyginfra.a
-libcyginfra_a_SOURCES = assert.cxx                            trace.cxx                             checkdata.cxx                         testcase.cxx
+libcyginfra_a_SOURCES = assert.cxx    \
+                        trace.cxx     \
+                        checkdata.cxx \
+                        testcase.cxx
 
 
-copies = cyg/infra/cyg_type.h          cyg/infra/cyg_ass.h           cyg/infra/cyg_trac.h          cyg/infra/testcase.h          cyg/hal/basetype.h            pkgconf/infra.h               pkgconf/hostinfra.h           hosttest.exp
+copies = cyg/infra/cyg_type.h \
+         cyg/infra/cyg_ass.h  \
+         cyg/infra/cyg_trac.h \
+         cyg/infra/testcase.h \
+         cyg/hal/basetype.h   \
+         pkgconf/infra.h      \
+         pkgconf/hostinfra.h  \
+         hosttest.exp
 
 
 noinst_HEADERS = $(copies)
@@ -367,7 +377,7 @@ distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
 	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
-	    cp -pr $$/$$file $(distdir)/$$file; \
+	    cp -pr $$d/$$file $(distdir)/$$file; \
 	  else \
 	    test -f $(distdir)/$$file \
 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \

host/infra/acinclude.m4

@@ -55,6 +55,12 @@ dnl
 dnl A better implementation would check whether or not AC_PROG_CC and
 dnl AC_PROG_CXX have been invoked and only test the appropriate
 dnl compiler.
+dnl
+dnl When cross-compiling, default to long long on the assumption that
+dnl gcc/g++ must be used and long long is likely to be the 64 bit data
+dnl type. This is not guaranteed, but sufficiently likely to meet
+dnl the requirements for the time being. The CHECK_SIZEOF() macro
+dnl might be another way to get the desired information.
 
 AC_DEFUN(CYG_AC_TYPE_64bit, [
     AC_REQUIRE([AC_PROG_CC])
@@ -68,13 +74,13 @@ AC_DEFUN(CYG_AC_TYPE_64bit, [
                 main() {
                     return 8 != sizeof($type);
                 }
-	    ],ctype_64bit=$type,ctype_64bit="unknown",ctype_64bit="unknown")
+	    ],ctype_64bit=$type,ctype_64bit="unknown",ctype_64bit="long long")
 	    AC_LANG_CPLUSPLUS
             AC_TRY_RUN([
                 int main(int argc, char ** argv) {
                     return 8 != sizeof($type);
                 }
-	    ],cxxtype_64bit=$type,cxxtype_64bit="unknown",cxxtype_64bit="unknown")
+	    ],cxxtype_64bit=$type,cxxtype_64bit="unknown",cxxtype_64bit="long long")
 	    AC_LANG_RESTORE
             if test "${ctype_64bit}" = "${type}" -a "${cxxtype_64bit}" = "${type}"; then
                 cyg_ac_cv_type_64bit="${type}"

host/infra/aclocal.m4

@@ -67,6 +67,12 @@ dnl
 dnl A better implementation would check whether or not AC_PROG_CC and
 dnl AC_PROG_CXX have been invoked and only test the appropriate
 dnl compiler.
+dnl
+dnl When cross-compiling, default to long long on the assumption that
+dnl gcc/g++ must be used and long long is likely to be the 64 bit data
+dnl type. This is not guaranteed, but sufficiently likely to meet
+dnl the requirements for the time being. The CHECK_SIZEOF() macro
+dnl might be another way to get the desired information.
 
 AC_DEFUN(CYG_AC_TYPE_64bit, [
     AC_REQUIRE([AC_PROG_CC])
@@ -80,13 +86,13 @@ AC_DEFUN(CYG_AC_TYPE_64bit, [
                 main() {
                     return 8 != sizeof($type);
                 }
-	    ],ctype_64bit=$type,ctype_64bit="unknown",ctype_64bit="unknown")
+	    ],ctype_64bit=$type,ctype_64bit="unknown",ctype_64bit="long long")
 	    AC_LANG_CPLUSPLUS
             AC_TRY_RUN([
                 int main(int argc, char ** argv) {
                     return 8 != sizeof($type);
                 }
-	    ],cxxtype_64bit=$type,cxxtype_64bit="unknown",cxxtype_64bit="unknown")
+	    ],cxxtype_64bit=$type,cxxtype_64bit="unknown",cxxtype_64bit="long long")
 	    AC_LANG_RESTORE
             if test "${ctype_64bit}" = "${type}" -a "${cxxtype_64bit}" = "${type}"; then
                 cyg_ac_cv_type_64bit="${type}"