diff options
| author | tschwinge <tschwinge@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-05-29 19:28:57 +0000 |
|---|---|---|
| committer | tschwinge <tschwinge@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-05-29 19:28:57 +0000 |
| commit | 12c17795aa79c9b23f9565d7ca3b42ca6530f6c4 (patch) | |
| tree | f723e93b2e50be366acaffeb6abd8ac0d9060ceb /fixincludes | |
| parent | 869cd0e8d3ee0569313c5462734efd77ad58f04e (diff) | |
| download | gcc-12c17795aa79c9b23f9565d7ca3b42ca6530f6c4.tar.gz | |
fixincludes/
* configure.ac: Use GCC_AC_FUNC_MMAP_BLACKLIST instead of
gcc_AC_FUNC_MMAP_BLACKLIST.
* Makefile.in (ACLOCAL_AMFLAGS): Don't include ../gcc.
* aclocal.m4: Regenerate.
* configure: Regenerate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@187984 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'fixincludes')
| -rw-r--r-- | fixincludes/ChangeLog | 8 | ||||
| -rw-r--r-- | fixincludes/Makefile.in | 2 | ||||
| -rw-r--r-- | fixincludes/aclocal.m4 | 2 | ||||
| -rwxr-xr-x | fixincludes/configure | 6 | ||||
| -rw-r--r-- | fixincludes/configure.ac | 2 |
5 files changed, 14 insertions, 6 deletions
diff --git a/fixincludes/ChangeLog b/fixincludes/ChangeLog index 690fd4f7307..ea201c3080c 100644 --- a/fixincludes/ChangeLog +++ b/fixincludes/ChangeLog @@ -1,3 +1,11 @@ +2012-05-29 Thomas Schwinge <thomas@codesourcery.com> + + * configure.ac: Use GCC_AC_FUNC_MMAP_BLACKLIST instead of + gcc_AC_FUNC_MMAP_BLACKLIST. + * Makefile.in (ACLOCAL_AMFLAGS): Don't include ../gcc. + * aclocal.m4: Regenerate. + * configure: Regenerate. + 2012-04-24 Tristan Gingold <gingold@adacore.com> * fixincl.c (fix_with_system): Add missing specifier. diff --git a/fixincludes/Makefile.in b/fixincludes/Makefile.in index b9857b9579f..92b365cc0f9 100644 --- a/fixincludes/Makefile.in +++ b/fixincludes/Makefile.in @@ -66,7 +66,7 @@ mkinstalldirs=$(SHELL) $(srcdir)/../mkinstalldirs AUTOCONF = autoconf AUTOHEADER = autoheader ACLOCAL = aclocal -ACLOCAL_AMFLAGS = -I ../gcc -I .. -I ../config +ACLOCAL_AMFLAGS = -I .. -I ../config default : all diff --git a/fixincludes/aclocal.m4 b/fixincludes/aclocal.m4 index b23541c34bf..7237922aa9d 100644 --- a/fixincludes/aclocal.m4 +++ b/fixincludes/aclocal.m4 @@ -12,6 +12,6 @@ # PARTICULAR PURPOSE. m4_include([../config/acx.m4]) +m4_include([../config/mmap.m4]) m4_include([../config/override.m4]) m4_include([../config/warnings.m4]) -m4_include([../gcc/acinclude.m4]) diff --git a/fixincludes/configure b/fixincludes/configure index ea889b80f0f..4836cd88653 100755 --- a/fixincludes/configure +++ b/fixincludes/configure @@ -5222,7 +5222,7 @@ else # read() to the same fd. The only system known to have a problem here # is VMS, where text files have record structure. case "$host_os" in - vms* | ultrix*) + *vms* | ultrix*) gcc_cv_func_mmap_file=no ;; *) gcc_cv_func_mmap_file=yes;; @@ -5246,7 +5246,7 @@ else # Systems known to be in this category are Windows (all variants), # VMS, and Darwin. case "$host_os" in - vms* | cygwin* | pe | mingw* | darwin* | ultrix* | hpux10* | hpux11.00) + *vms* | cygwin* | pe | mingw* | darwin* | ultrix* | hpux10* | hpux11.00) gcc_cv_func_mmap_dev_zero=no ;; *) gcc_cv_func_mmap_dev_zero=yes;; @@ -5303,7 +5303,7 @@ else # above for use of /dev/zero. # Systems known to be in this category are Windows, VMS, and SCO Unix. case "$host_os" in - vms* | cygwin* | pe | mingw* | sco* | udk* ) + *vms* | cygwin* | pe | mingw* | sco* | udk* ) gcc_cv_func_mmap_anon=no ;; *) gcc_cv_func_mmap_anon=yes;; diff --git a/fixincludes/configure.ac b/fixincludes/configure.ac index f1fb2ff4e56..f8f352fb715 100644 --- a/fixincludes/configure.ac +++ b/fixincludes/configure.ac @@ -96,7 +96,7 @@ AC_CHECK_DECLS(m4_split(m4_normalize(fixincludes_UNLOCKED_FUNCS))) AC_C_CONST # Checks for library functions. -gcc_AC_FUNC_MMAP_BLACKLIST +GCC_AC_FUNC_MMAP_BLACKLIST AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) AC_ARG_ENABLE(maintainer-mode, |