This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

libmudflap: Handle multilibs


This patch adds multi-lib support to libmudflap.

Tested on Linux/AMD64 with bootstrap of C++,C,Fortran.

Ok to commit?

Andreas

2004-05-29  Andreas Jaeger  <aj@suse.de>

	* configure.in: Handle multilibs.
        * Makefile.in: Regenerated.
        * aclocal.m4: Regenerated.
        * configure: Regenerated.
        * testsuite/Makefile.in: Regenerated.

============================================================
Index: libmudflap/configure.in
--- libmudflap/configure.in	13 May 2004 06:41:03 -0000	1.2
+++ libmudflap/configure.in	29 May 2004 20:28:16 -0000
@@ -11,17 +11,29 @@ AC_SUBST(PACKAGE)
 libtool_VERSION=1:0:0
 AC_SUBST(libtool_VERSION)
 
-dnl AM_ENABLE_MULTILIB
 AM_MAINTAINER_MODE
 AC_EXEEXT
 
+AM_ENABLE_MULTILIB(, ..)
+
 target_alias=${target_alias-$target}
 AC_SUBST(target_alias)
 
 AM_CONFIG_HEADER(config.h)
 
 AC_LANG_C
+# The same as in boehm-gc and libstdc++. Have to borrow it from there.
+# We must force CC to /not/ be precious variables; otherwise
+# the wrong, non-multilib-adjusted value will be used in multilibs.
+# As a side effect, we have to subst CFLAGS ourselves.
+
+m4_rename([_AC_ARG_VAR_PRECIOUS],[real_PRECIOUS])
+m4_define([_AC_ARG_VAR_PRECIOUS],[])
 AC_PROG_CC
+m4_rename([real_PRECIOUS],[_AC_ARG_VAR_PRECIOUS])
+
+AC_SUBST(CFLAGS)
+
 if test "x$GCC" != "xyes"; then
   AC_MSG_ERROR([libmudflap must be built with GCC])
 fi
@@ -133,5 +145,10 @@ EOF
 fi
 AC_DEFINE_UNQUOTED(PTHREAD_CREATE_VERSION, $pthread_create_version, [pthread_create symbol version])   
 
+if test ${multilib} = yes; then
+  multilib_arg="--enable-multilib"
+else
+  multilib_arg=
+fi
 
 AC_OUTPUT([Makefile testsuite/Makefile mf-runtime.h])

-- 
 Andreas Jaeger, aj@suse.de, http://www.suse.de/~aj
  SUSE Linux AG, Maxfeldstr. 5, 90409 Nürnberg, Germany
   GPG fingerprint = 93A3 365E CE47 B889 DF7F  FED1 389A 563C C272 A126

Attachment: pgp00000.pgp
Description: PGP signature


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]