Fix _newlib_version.h logic to support building gcc with newlib.

diff --git a/newlib/Makefile.am b/newlib/Makefile.am
index 9b30cd33eb359cbc8b6c0f7997aed3d090e5273f..200bc61bdc590958656d11c75763046c3ea6d652 100644 (file)
--- a/newlib/Makefile.am
+++ b/newlib/Makefile.am
@@ -214,8 +214,7 @@ stmp-targ-include: config.status
        -rm -rf targ-include stmp-targ-include
        $(MAKE) targ-include/sys \
                targ-include/machine \
-               targ-include/bits \
-               targ-include/newlib.h
+               targ-include/bits
        -for i in $(srcdir)/libc/machine/$(machine_dir)/machine/*.h; do \
            if [ -f $$i ]; then \
              cp $$i targ-include/machine/`basename $$i`; \
@@ -271,6 +270,7 @@ stmp-targ-include: config.status
              cp $$i targ-include/machine/`basename $$i`; \
            else true; fi ; \
          done
+       $(MAKE) targ-include/newlib.h
        touch $@
 
 CLEANFILES = stmp-targ-include

diff --git a/newlib/Makefile.in b/newlib/Makefile.in
index c235995acc7a8e66c44932070beeafadcfca8bbe..c4cc431c98ab12d96f85e4fd62bb61998145790f 100644 (file)
--- a/newlib/Makefile.in
+++ b/newlib/Makefile.in
@@ -973,8 +973,7 @@ stmp-targ-include: config.status
        -rm -rf targ-include stmp-targ-include
        $(MAKE) targ-include/sys \
                targ-include/machine \
-               targ-include/bits \
-               targ-include/newlib.h
+               targ-include/bits
        -for i in $(srcdir)/libc/machine/$(machine_dir)/machine/*.h; do \
            if [ -f $$i ]; then \
              cp $$i targ-include/machine/`basename $$i`; \
@@ -1030,6 +1029,7 @@ stmp-targ-include: config.status
              cp $$i targ-include/machine/`basename $$i`; \
            else true; fi ; \
          done
+       $(MAKE) targ-include/newlib.h
        touch $@
 
 install-data-local:    install-toollibLIBRARIES

diff --git a/newlib/aclocal.m4 b/newlib/aclocal.m4
index 27fd2b2725a08fcaabf22442e63aada06d5be6b8..6d40f4c258ba8d23bd10cec783ceeb4c0b6e8a83 100644 (file)
--- a/newlib/aclocal.m4
+++ b/newlib/aclocal.m4
@@ -1009,4 +1009,9 @@ AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
+m4_include([../libtool.m4])
+m4_include([../ltoptions.m4])
+m4_include([../ltsugar.m4])
+m4_include([../ltversion.m4])
+m4_include([../lt~obsolete.m4])
 m4_include([acinclude.m4])

diff --git a/newlib/libc/include/_newlib_version.h b/newlib/libc/include/_newlib_version.h
new file mode 100644 (file)
index 0000000..d4fffb1
--- /dev/null
+++ b/newlib/libc/include/_newlib_version.h
@@ -0,0 +1,2 @@
+/* dummy file for external tools to use.  Real file is created by
+   newlib configuration. */