This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Merge in xm_defines from head to branch?
- To: gcc-patches at gcc dot gnu dot org
- Subject: Merge in xm_defines from head to branch?
- From: Craig Rodrigues <rodrigc at mediaone dot net>
- Date: Sun, 4 Nov 2001 18:03:28 -0500
- Cc: zack at codesourcery dot com
Hi,
Can we merge this from head to branch:
2001-03-11 Zack Weinberg <zackw@stanford.edu>
* configure.in: AC_SUBST xm_defines.
* configure: Regenerate.
* Makefile.in: Set DEFINES=$(xm_defines) when building
tconfig.h.
This would eliminate compiler errors in files such as:
unwind-dw2.c, because they need the macro POSIX defined,
in order to include <string.h>, which is needed for
getting the function prototype for memcpy(), strlen(), etc.
Index: configure.in
===================================================================
RCS file: /cvs/gcc/gcc/gcc/configure.in,v
retrieving revision 1.483.2.27
diff -u -r1.483.2.27 configure.in
--- configure.in 2001/07/25 01:46:30 1.483.2.27
+++ configure.in 2001/11/04 22:52:40
@@ -2026,6 +2026,7 @@
AC_SUBST(tm_p_file_list)
AC_SUBST(tm_p_file)
AC_SUBST(xm_file)
+AC_SUBST(xm_defines)
AC_SUBST(will_use_collect2)
AC_SUBST(c_target_objs)
AC_SUBST(cxx_target_objs)
Index: Makefile.in
===================================================================
RCS file: /cvs/gcc/gcc/gcc/Makefile.in,v
retrieving revision 1.602.2.36
diff -u -r1.602.2.36 Makefile.in
--- Makefile.in 2001/10/04 22:59:02 1.602.2.36
+++ Makefile.in 2001/11/04 23:02:24
@@ -287,6 +287,7 @@
host_xm_file=@host_xm_file@
host_xm_defines=@host_xm_defines@
xm_file=@xm_file@
+xm_defines=@xm_defines@
lang_specs_files=@lang_specs_files@
lang_options_files=@lang_options_files@
lang_tree_files=@lang_tree_files@
@@ -913,7 +914,8 @@
$(SHELL) $(srcdir)/mkconfig.sh hconfig.h
cs-tconfig.h: Makefile $(CONFIG_H) except.h
- HEADERS="$(xm_file)" DEFINES="" TARGET_CPU_DEFAULT="" \
+ HEADERS="$(xm_file)" DEFINES="$(xm_defines)" \
+ TARGET_CPU_DEFAULT="" \
$(SHELL) $(srcdir)/mkconfig.sh tconfig.h
# ??? Need extra help to get this definition copied to where libgcc can
# see it. It shouldn't matter which compiler we use to get there.
--
Craig Rodrigues
http://www.gis.net/~craigr
rodrigc@mediaone.net