diff options
Diffstat (limited to 'libmudflap')
| -rw-r--r-- | libmudflap/ChangeLog | 15 | ||||
| -rw-r--r-- | libmudflap/Makefile.am | 4 | ||||
| -rw-r--r-- | libmudflap/Makefile.in | 64 | ||||
| -rw-r--r-- | libmudflap/aclocal.m4 | 5 | ||||
| -rw-r--r-- | libmudflap/config.h.in | 2 | ||||
| -rwxr-xr-x | libmudflap/configure | 25 | ||||
| -rw-r--r-- | libmudflap/configure.ac | 6 | ||||
| -rw-r--r-- | libmudflap/mf-runtime.h | 4 | ||||
| -rw-r--r-- | libmudflap/testsuite/Makefile.in | 6 |
9 files changed, 92 insertions, 39 deletions
diff --git a/libmudflap/ChangeLog b/libmudflap/ChangeLog index eb6c5b201fa..ea2c6f660f8 100644 --- a/libmudflap/ChangeLog +++ b/libmudflap/ChangeLog @@ -1,3 +1,18 @@ +2006-06-21 Frank Ch. Eigler <fche@redhat.com> + + PR 21274 + mf-runtime.h installation based on ssp patch for PR 26473 from + Mark Mitchell <mark@codesourcery.com>. + * configure.ac (ACX_NONCANONICAL_TARGET): Use it. + * Makefile.am (target_noncanonical): Define. + (libsubincludedir): New variable. + (nobase_libsubinclude_HEADERS): Add mf-runtime.h. + (include_HEADERS): Remove. + * configure, aclocal.m4, config.h.in: Regenerated. + * Makefile.in, testsuite/Makefile.in: Likewise. + * mf-runtime.h: Add #ifndef protection for conflicting _REENTRANT + and _THREAD_SAFE redefinition values. + 2006-05-23 Carlos O'Donell <carlos@codesourcery.com> * Makefile.am: Add install-html target. Add install-html to .PHONY diff --git a/libmudflap/Makefile.am b/libmudflap/Makefile.am index 5db952414d7..8575da272be 100644 --- a/libmudflap/Makefile.am +++ b/libmudflap/Makefile.am @@ -22,7 +22,9 @@ libmudflapth = endif toolexeclib_LTLIBRARIES = libmudflap.la $(libmudflapth) -include_HEADERS = mf-runtime.h +target_noncanonical = @target_noncanonical@ +libsubincludedir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_version)/include +nobase_libsubinclude_HEADERS = mf-runtime.h libmudflap_la_SOURCES = \ diff --git a/libmudflap/Makefile.in b/libmudflap/Makefile.in index fa9c5125fe2..7eaa0ec2895 100644 --- a/libmudflap/Makefile.in +++ b/libmudflap/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -15,8 +15,6 @@ @SET_MAKE@ -SOURCES = $(libmudflap_la_SOURCES) $(libmudflapth_la_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -40,7 +38,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -DIST_COMMON = $(am__configure_deps) $(include_HEADERS) \ +DIST_COMMON = $(am__configure_deps) $(nobase_libsubinclude_HEADERS) \ $(srcdir)/../config.guess $(srcdir)/../config.sub \ $(srcdir)/../depcomp $(srcdir)/../install-sh \ $(srcdir)/../ltmain.sh $(srcdir)/../missing \ @@ -49,7 +47,8 @@ DIST_COMMON = $(am__configure_deps) $(include_HEADERS) \ $(top_srcdir)/configure ChangeLog subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ + $(top_srcdir)/../config/depstand.m4 \ $(top_srcdir)/../config/enable.m4 \ $(top_srcdir)/../config/lead-dot.m4 \ $(top_srcdir)/../config/tls.m4 $(top_srcdir)/acinclude.m4 \ @@ -68,7 +67,7 @@ am__vpath_adj = case $$p in \ esac; am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; am__installdirs = "$(DESTDIR)$(toolexeclibdir)" \ - "$(DESTDIR)$(includedir)" + "$(DESTDIR)$(libsubincludedir)" toolexeclibLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(toolexeclib_LTLIBRARIES) am_libmudflap_la_OBJECTS = mf-runtime.lo mf-heuristics.lo mf-hooks1.lo \ @@ -102,8 +101,8 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ install-recursive installcheck-recursive installdirs-recursive \ pdf-recursive ps-recursive uninstall-info-recursive \ uninstall-recursive -includeHEADERS_INSTALL = $(INSTALL_HEADER) -HEADERS = $(include_HEADERS) +nobase_libsubincludeHEADERS_INSTALL = $(install_sh_DATA) +HEADERS = $(nobase_libsubinclude_HEADERS) ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -216,6 +215,7 @@ sysconfdir = @sysconfdir@ target = @target@ target_alias = @target_alias@ target_cpu = @target_cpu@ +target_noncanonical = @target_noncanonical@ target_os = @target_os@ target_vendor = @target_vendor@ toolexecdir = @toolexecdir@ @@ -231,7 +231,8 @@ AM_CFLAGS = -Wall $(SECTION_FLAGS) @LIBMUDFLAPTH_FALSE@libmudflapth = @LIBMUDFLAPTH_TRUE@libmudflapth = libmudflapth.la toolexeclib_LTLIBRARIES = libmudflap.la $(libmudflapth) -include_HEADERS = mf-runtime.h +libsubincludedir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_version)/include +nobase_libsubinclude_HEADERS = mf-runtime.h libmudflap_la_SOURCES = \ mf-runtime.c \ mf-heuristics.c \ @@ -441,22 +442,24 @@ distclean-multi: maintainer-clean-multi: $(MULTICLEAN) $(AM_MAKEFLAGS) DO=maintainer-clean multi-clean # $(MAKE) uninstall-info-am: -install-includeHEADERS: $(include_HEADERS) +install-nobase_libsubincludeHEADERS: $(nobase_libsubinclude_HEADERS) @$(NORMAL_INSTALL) - test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)" - @list='$(include_HEADERS)'; for p in $$list; do \ + test -z "$(libsubincludedir)" || $(mkdir_p) "$(DESTDIR)$(libsubincludedir)" + @$(am__vpath_adj_setup) \ + list='$(nobase_libsubinclude_HEADERS)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \ - $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \ + $(am__vpath_adj) \ + echo " $(nobase_libsubincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libsubincludedir)/$$f'"; \ + $(nobase_libsubincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libsubincludedir)/$$f"; \ done -uninstall-includeHEADERS: +uninstall-nobase_libsubincludeHEADERS: @$(NORMAL_UNINSTALL) - @list='$(include_HEADERS)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \ - rm -f "$(DESTDIR)$(includedir)/$$f"; \ + @$(am__vpath_adj_setup) \ + list='$(nobase_libsubinclude_HEADERS)'; for p in $$list; do \ + $(am__vpath_adj) \ + echo " rm -f '$(DESTDIR)$(libsubincludedir)/$$f'"; \ + rm -f "$(DESTDIR)$(libsubincludedir)/$$f"; \ done # This directory's subdirectories are mostly independent; you can cd @@ -738,7 +741,7 @@ check: check-recursive all-am: Makefile $(LTLIBRARIES) all-multi $(HEADERS) config.h installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(toolexeclibdir)" "$(DESTDIR)$(includedir)"; do \ + for dir in "$(DESTDIR)$(toolexeclibdir)" "$(DESTDIR)$(libsubincludedir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: install-recursive @@ -787,7 +790,7 @@ info: info-recursive info-am: -install-data-am: install-includeHEADERS +install-data-am: install-nobase_libsubincludeHEADERS install-exec-am: install-multi install-toolexeclibLTLIBRARIES @@ -817,7 +820,7 @@ ps: ps-recursive ps-am: -uninstall-am: uninstall-includeHEADERS uninstall-info-am \ +uninstall-am: uninstall-info-am uninstall-nobase_libsubincludeHEADERS \ uninstall-toolexeclibLTLIBRARIES uninstall-info: uninstall-info-recursive @@ -832,16 +835,17 @@ uninstall-info: uninstall-info-recursive distclean-recursive distclean-tags distcleancheck distdir \ distuninstallcheck dvi dvi-am html html-am info info-am \ install install-am install-data install-data-am install-exec \ - install-exec-am install-includeHEADERS install-info \ - install-info-am install-man install-multi install-strip \ - install-toolexeclibLTLIBRARIES installcheck installcheck-am \ - installdirs installdirs-am maintainer-clean \ + install-exec-am install-info install-info-am install-man \ + install-multi install-nobase_libsubincludeHEADERS \ + install-strip install-toolexeclibLTLIBRARIES installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ maintainer-clean-generic maintainer-clean-multi \ maintainer-clean-recursive mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool mostlyclean-multi \ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-includeHEADERS \ - uninstall-info-am uninstall-toolexeclibLTLIBRARIES + uninstall uninstall-am uninstall-info-am \ + uninstall-nobase_libsubincludeHEADERS \ + uninstall-toolexeclibLTLIBRARIES clean-local: @@ -860,7 +864,7 @@ pth/mf-hooks3.lo: mf-hooks3.c mf-runtime.h mf-impl.h .PHONY: install-html -instal-html: +install-html: # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/libmudflap/aclocal.m4 b/libmudflap/aclocal.m4 index db8245fc80b..c8df0ce25aa 100644 --- a/libmudflap/aclocal.m4 +++ b/libmudflap/aclocal.m4 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.9.5 -*- Autoconf -*- +# generated automatically by aclocal 1.9.6 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, # 2005 Free Software Foundation, Inc. @@ -28,7 +28,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"]) # Call AM_AUTOMAKE_VERSION so it can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], - [AM_AUTOMAKE_VERSION([1.9.5])]) + [AM_AUTOMAKE_VERSION([1.9.6])]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- @@ -914,6 +914,7 @@ AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR +m4_include([../config/acx.m4]) m4_include([../config/depstand.m4]) m4_include([../config/enable.m4]) m4_include([../config/lead-dot.m4]) diff --git a/libmudflap/config.h.in b/libmudflap/config.h.in index 98c3f619462..f372741985c 100644 --- a/libmudflap/config.h.in +++ b/libmudflap/config.h.in @@ -147,7 +147,7 @@ /* Define to 1 if you have the <netinet/in.h> header file. */ #undef HAVE_NETINET_IN_H -/* define if you have <pthread.h> */ +/* Define to 1 if you have the <pthread.h> header file. */ #undef HAVE_PTHREAD_H /* Define to 1 if you have the <pwd.h> header file. */ diff --git a/libmudflap/configure b/libmudflap/configure index 9e811802127..fd5ba708d37 100755 --- a/libmudflap/configure +++ b/libmudflap/configure @@ -309,7 +309,7 @@ ac_includes_default="\ # include <unistd.h> #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT multi_basedir CC ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CFLAGS CPP CPPFLAGS EGREP LN_S RANLIB ac_ct_RANLIB LIBTOOL enable_shared enable_static MF_HAVE_STDINT_H MF_HAVE_UINTPTR_T LIBMUDFLAPTH_TRUE LIBMUDFLAPTH_FALSE build_libmudflapth toolexecdir toolexeclibdir NM ac_ct_NM SECTION_FLAGS LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT multi_basedir CC ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CFLAGS CPP CPPFLAGS EGREP LN_S RANLIB ac_ct_RANLIB LIBTOOL enable_shared enable_static MF_HAVE_STDINT_H MF_HAVE_UINTPTR_T LIBMUDFLAPTH_TRUE LIBMUDFLAPTH_FALSE build_libmudflapth toolexecdir toolexeclibdir NM ac_ct_NM SECTION_FLAGS LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -1424,6 +1424,23 @@ test -n "$target_alias" && test "$program_prefix$program_suffix$program_transform_name" = \ NONENONEs,x,x, && program_prefix=${target_alias}- + case ${build_alias} in + "") build_noncanonical=${build} ;; + *) build_noncanonical=${build_alias} ;; +esac + + case ${host_alias} in + "") host_noncanonical=${build_noncanonical} ;; + *) host_noncanonical=${host_alias} ;; +esac + + case ${target_alias} in + "") target_noncanonical=${host_noncanonical} ;; + *) target_noncanonical=${target_alias} ;; +esac + + + am__api_version="1.9" # Find a good install program. We prefer a C program (faster), @@ -5833,7 +5850,7 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic" case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 5836 "configure"' > conftest.$ac_ext + echo '#line 5853 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -6619,6 +6636,9 @@ esac +includedir=${toolexecdir}/include + + pthread_create_version='""' if test "x$enable_shared" = "xyes" && test "x$posix_threads" != "x"; then # NB: don't check for -lpthread here, because then it would be @@ -7796,6 +7816,7 @@ s,@target@,$target,;t t s,@target_cpu@,$target_cpu,;t t s,@target_vendor@,$target_vendor,;t t s,@target_os@,$target_os,;t t +s,@target_noncanonical@,$target_noncanonical,;t t s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t s,@INSTALL_DATA@,$INSTALL_DATA,;t t diff --git a/libmudflap/configure.ac b/libmudflap/configure.ac index 51ed6e3bf4a..ff356f2603c 100644 --- a/libmudflap/configure.ac +++ b/libmudflap/configure.ac @@ -1,10 +1,11 @@ # Process this file with autoconf to produce a configure script, like so: -# aclocal && autoconf && autoheader && automake +# aclocal -I .. -I ../config && autoconf && autoheader && automake AC_PREREQ(2.59) AC_INIT(libmudflap, 1.0) AC_CONFIG_SRCDIR(mf-runtime.c) AC_CANONICAL_SYSTEM +ACX_NONCANONICAL_TARGET AM_INIT_AUTOMAKE @@ -175,6 +176,9 @@ esac AC_SUBST(toolexecdir) AC_SUBST(toolexeclibdir) +includedir=${toolexecdir}/include +AC_SUBST(includedir) + pthread_create_version='""' if test "x$enable_shared" = "xyes" && test "x$posix_threads" != "x"; then # NB: don't check for -lpthread here, because then it would be diff --git a/libmudflap/mf-runtime.h b/libmudflap/mf-runtime.h index 68c7b54192f..3dd9154011e 100644 --- a/libmudflap/mf-runtime.h +++ b/libmudflap/mf-runtime.h @@ -55,9 +55,13 @@ extern unsigned char __mf_lc_shift; /* Multithreading support. */ #ifdef _MUDFLAPTH /* extern pthread_mutex_t __mf_biglock; */ +#ifndef _REENTRANT #define _REENTRANT +#endif +#ifndef _THREAD_SAFE #define _THREAD_SAFE #endif +#endif /* Codes to describe the type of access to check: __mf_check arg 3 */ diff --git a/libmudflap/testsuite/Makefile.in b/libmudflap/testsuite/Makefile.in index 02cf6ecadcf..71c715b2d89 100644 --- a/libmudflap/testsuite/Makefile.in +++ b/libmudflap/testsuite/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -40,7 +40,8 @@ subdir = testsuite DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/mfconfig.exp.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ + $(top_srcdir)/../config/depstand.m4 \ $(top_srcdir)/../config/enable.m4 \ $(top_srcdir)/../config/lead-dot.m4 \ $(top_srcdir)/../config/tls.m4 $(top_srcdir)/acinclude.m4 \ @@ -153,6 +154,7 @@ sysconfdir = @sysconfdir@ target = @target@ target_alias = @target_alias@ target_cpu = @target_cpu@ +target_noncanonical = @target_noncanonical@ target_os = @target_os@ target_vendor = @target_vendor@ toolexecdir = @toolexecdir@ |