diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/ChangeLog | 44 | ||||
| -rw-r--r-- | config/cloog.m4 | 177 | ||||
| -rw-r--r-- | config/isl.m4 | 151 | ||||
| -rw-r--r-- | config/mt-sde | 6 |
4 files changed, 217 insertions, 161 deletions
diff --git a/config/ChangeLog b/config/ChangeLog index 42fcfce99..7db0c6b04 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,9 +1,53 @@ +2012-09-19 Steve Ellcey <sellcey@mips.com> + + * mt-sde: Change -mcode-xonly to -mcode-readable=pcrel. + +2012-09-03 Richard Guenther <rguenther@suse.de> + + PR bootstrap/54138 + * config/cloog.m4: Adjust for toplevel reorg. + * config/isl.m4: Adjust. + +2012-08-26 Art Haas <ahaas@impactweather.com> + + * cloog.m4 (CLOOG_INIT_FLAGS): Use = instead of == in test. + +2012-07-04 Tristan Gingold <gingold@adacore.com> + + * isl.m4 (ISL_CHECK_VERSION): Set to yes if cross-compiling. + Fix comments. + +2012-07-03 Richard Guenther <rguenther@suse.de> + + * cloog.m4: Remove debugging print. + +2012-07-03 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> + + * isl.m4 (ISL_CHECK_VERSION): Add -lisl to LIBS, not LDFLAGS. + +2012-07-02 Richard Guenther <rguenther@suse.de> + + * isl.m4 (_ISL_CHECK_CT_PROG): Omit main function header/footer. + Fix version test. + +2012-07-02 Richard Guenther <rguenther@suse.de> + Michael Matz <matz@suse.de> + Tobias Grosser <tobias@grosser.es> + Sebastian Pop <sebpop@gmail.com> + + * cloog.m4: Set up to work against ISL only. + * isl.m4: New file. + 2012-05-29 Joseph Myers <joseph@codesourcery.com> * mt-sde: Fix typos. * stdint.m4: Fix typos. * tcl.m4: Fix typos. +2012-05-03 Olivier Hainque <hainque@adacore.com> + + * mh-ppc-aix (LDFLAGS): Quote $(CC). + 2012-04-03 Tristan Gingold <gingold@adacore.com> * mmap.m4: Use *vms* instead of vms*. diff --git a/config/cloog.m4 b/config/cloog.m4 index e95b98d31..a92ef2ea7 100644 --- a/config/cloog.m4 +++ b/config/cloog.m4 @@ -22,12 +22,6 @@ # Initialize clooglibs/clooginc according to the user input. AC_DEFUN([CLOOG_INIT_FLAGS], [ - AC_ARG_WITH(cloog, - [AS_HELP_STRING( - [--with-cloog=PATH], - [Specify prefix directory for the installed CLooG-PPL package. - Equivalent to --with-cloog-include=PATH/include - plus --with-cloog-lib=PATH/lib])]) AC_ARG_WITH([cloog-include], [AS_HELP_STRING( [--with-cloog-include=PATH], @@ -37,17 +31,6 @@ AC_DEFUN([CLOOG_INIT_FLAGS], [--with-cloog-lib=PATH], [Specify the directory for the installed CLooG library])]) - AC_ARG_ENABLE(cloog-backend, - [AS_HELP_STRING( - [--enable-cloog-backend[[=BACKEND]]], - [set the CLooG BACKEND used to either isl, ppl or ppl-legacy (default)])], - [ if test "x${enableval}" = "xisl"; then - cloog_backend=isl - elif test "x${enableval}" = "xppl"; then - cloog_backend=ppl - else - cloog_backend=ppl-legacy - fi], cloog_backend=ppl-legacy) AC_ARG_ENABLE(cloog-version-check, [AS_HELP_STRING( [--disable-cloog-version-check], @@ -74,10 +57,16 @@ AC_DEFUN([CLOOG_INIT_FLAGS], if test "x${with_cloog_lib}" != x; then clooglibs="-L$with_cloog_lib" fi + dnl If no --with-cloog flag was specified and there is in-tree ClooG + dnl source, set up flags to use that. + if test "x${clooginc}" = x && test "x${clooglibs}" = x \ + && test -d ${srcdir}/cloog; then + clooglibs='-L$$r/$(HOST_SUBDIR)/cloog/'"$lt_cv_objdir"' ' + clooginc='-I$$r/$(HOST_SUBDIR)/cloog/include -I$$s/cloog/include -I'${srcdir}'/cloog/include ' + fi - dnl Flags needed for CLOOG - AC_SUBST(clooglibs) - AC_SUBST(clooginc) + clooginc="-DCLOOG_INT_GMP ${clooginc}" + clooglibs="${clooglibs} -lcloog-isl ${isllibs} -lisl" ] ) @@ -100,163 +89,37 @@ AC_DEFUN([CLOOG_REQUESTED], ] ) -# _CLOOG_ORG_PROG_ISL () -# ------------------ -# Helper for detecting CLooG.org's ISL backend. -m4_define([_CLOOG_ORG_PROG_ISL],[AC_LANG_PROGRAM( - [#include "cloog/cloog.h" ], - [cloog_version ()])]) - -# _CLOOG_ORG_PROG_PPL () -# ------------------ -# Helper for detecting CLooG.org's PPL backend. -m4_define([_CLOOG_ORG_PROG_PPL],[AC_LANG_PROGRAM( - [#include "cloog/cloog.h" - #include "cloog/ppl/cloog.h"], - [cloog_version ()])]) - -# _CLOOG_PPL_LEGACY_PROG () -# ------------------------- -# Helper for detecting CLooG-Legacy (CLooG-PPL). -m4_define([_CLOOG_PPL_LEGACY_PROG], [AC_LANG_PROGRAM( - [#include "cloog/cloog.h"], - [#ifndef CLOOG_PPL_BACKEND - choke me - #endif ])]) - -# CLOOG_FIND_FLAGS () -# ------------------ -# Detect the used CLooG-backend and set clooginc/clooglibs/cloog_org. -# Only look for the CLooG backend type specified in --enable-cloog-backend -AC_DEFUN([CLOOG_FIND_FLAGS], -[ - AC_REQUIRE([CLOOG_INIT_FLAGS]) - - _cloog_saved_CFLAGS=$CFLAGS - _cloog_saved_CPPFLAGS=$CPPFLAGS - _cloog_saved_LDFLAGS=$LDFLAGS - _cloog_saved_LIBS=$LIBS - - _cloogorginc="-DCLOOG_INT_GMP -DCLOOG_ORG" - - dnl clooglibs & clooginc may have been initialized by CLOOG_INIT_FLAGS. - CFLAGS="${CFLAGS} ${clooginc} ${gmpinc}" - CPPFLAGS="${CPPFLAGS} ${_cloogorginc}" - LDFLAGS="${LDFLAGS} ${clooglibs}" - - case $cloog_backend in - "ppl-legacy") - CFLAGS="${CFLAGS} ${pplinc}" - LDFLAGS="${LDFLAGS} ${ppllibs}" - AC_CACHE_CHECK([for installed CLooG PPL Legacy], [gcc_cv_cloog_type], - [LIBS="-lcloog ${_cloog_saved_LIBS}" - AC_LINK_IFELSE([_CLOOG_PPL_LEGACY_PROG], [gcc_cv_cloog_type="PPL Legacy"], - [gcc_cv_cloog_type=no])]) - ;; - "isl") - AC_CACHE_CHECK([for installed CLooG ISL], [gcc_cv_cloog_type], - [LIBS="-lcloog-isl ${_cloog_saved_LIBS}" - AC_LINK_IFELSE([_CLOOG_ORG_PROG_ISL], [gcc_cv_cloog_type="ISL"], - [gcc_cv_cloog_type=no])]) - ;; - "ppl") - CFLAGS="${CFLAGS} ${pplinc}" - LDFLAGS="${LDFLAGS} ${ppllibs}" - AC_CACHE_CHECK([for installed CLooG PPL], [gcc_cv_cloog_type], - [LIBS="-lcloog-ppl ${_cloog_saved_LIBS}" - AC_LINK_IFELSE([_CLOOG_ORG_PROG_PPL], [gcc_cv_cloog_type="PPL"], - [gcc_cv_cloog_type=no])]) - ;; - *) - gcc_cv_cloog_type="" - esac - - case $gcc_cv_cloog_type in - "PPL Legacy") - clooginc="${clooginc}" - clooglibs="${clooglibs} -lcloog" - cloog_org=no - ;; - "ISL") - clooginc="${clooginc} ${_cloogorginc}" - clooglibs="${clooglibs} -lcloog-isl -lisl" - cloog_org=yes - ;; - "PPL") - clooginc="${clooginc} ${_cloogorginc}" - clooglibs="${clooglibs} -lcloog-ppl" - cloog_org=yes - ;; - *) - clooglibs= - clooginc= - cloog_org= - ;; - esac - - LIBS=$_cloog_saved_LIBS - CFLAGS=$_cloog_saved_CFLAGS - CPPFLAGS=$_cloog_saved_CPPFLAGS - LDFLAGS=$_cloog_saved_LDFLAGS -] -) - # _CLOOG_CHECK_CT_PROG(MAJOR, MINOR, REVISION) # -------------------------------------------- # Helper for verifying CLooG's compile time version. m4_define([_CLOOG_CHECK_CT_PROG],[AC_LANG_PROGRAM( - [#include "cloog/cloog.h"], + [#include "cloog/version.h"], [#if CLOOG_VERSION_MAJOR != $1 \ || CLOOG_VERSION_MINOR != $2 \ || CLOOG_VERSION_REVISION < $3 choke me #endif])]) -# _CLOOG_CHECK_RT_PROG () -# ----------------------- -# Helper for verifying that CLooG's compile time version -# matches the run time version. -m4_define([_CLOOG_CHECK_RT_PROG],[AC_LANG_PROGRAM( - [#include "cloog/cloog.h"], - [if ((cloog_version_major () != CLOOG_VERSION_MAJOR) - && (cloog_version_minor () != CLOOG_VERSION_MINOR) - && (cloog_version_revision () != CLOOG_VERSION_REVISION)) - { - return 1; - }])]) - # CLOOG_CHECK_VERSION CLOOG_CHECK_VERSION (MAJOR, MINOR, REVISION) # ---------------------------------------------------------------- # Test the found CLooG to be exact of version MAJOR.MINOR and at least # REVISION. -# If we're using the old CLooG-PPL (Legacy), the old version check will -# be executed (Ignores the provided version information). AC_DEFUN([CLOOG_CHECK_VERSION], [ - AC_REQUIRE([CLOOG_FIND_FLAGS]) + AC_REQUIRE([CLOOG_INIT_FLAGS]) if test "${ENABLE_CLOOG_CHECK}" = yes ; then _cloog_saved_CFLAGS=$CFLAGS _cloog_saved_LDFLAGS=$LDFLAGS - CFLAGS="${_cloog_saved_CFLAGS} ${clooginc} ${pplinc} ${gmpinc}" - LDFLAGS="${_cloog_saved_LDFLAGS} ${clooglibs} ${ppllibs}" + CFLAGS="${_cloog_saved_CFLAGS} ${clooginc} ${islinc} ${gmpinc}" + LDFLAGS="${_cloog_saved_LDFLAGS} ${clooglibs} ${isllibs} ${gmplib}" - if test "${cloog_org}" = yes ; then - AC_CACHE_CHECK([for version $1.$2.$3 of CLooG], - [gcc_cv_cloog_ct_0_14_0], - [AC_COMPILE_IFELSE([_CLOOG_CHECK_CT_PROG($1,$2,$3)], - [gcc_cv_cloog_ct_0_14_0=yes], - [gcc_cv_cloog_ct_0_14_0=no])]) - elif test "${cloog_org}" = no ; then - AC_CACHE_CHECK([for version 0.15.5 (or later revision) of CLooG], - [gcc_cv_cloog_ct_0_15_5], - [AC_COMPILE_IFELSE([_CLOOG_CHECK_CT_PROG(0,15,5)], - [AC_COMPILE_IFELSE([_CLOOG_CHECK_CT_PROG(0,15,9)], - [gcc_cv_cloog_ct_0_15_5=yes], - [gcc_cv_cloog_ct_0_15_5="buggy but acceptable"])], - [gcc_cv_cloog_ct_0_15_5=no])]) - fi + AC_CACHE_CHECK([for version $1.$2.$3 of CLooG], + [gcc_cv_cloog], + [AC_COMPILE_IFELSE([_CLOOG_CHECK_CT_PROG($1,$2,$3)], + [gcc_cv_cloog=yes], + [gcc_cv_cloog=no])]) CFLAGS=$_cloog_saved_CFLAGS LDFLAGS=$_cloog_saved_LDFLAGS @@ -272,9 +135,7 @@ AC_DEFUN([CLOOG_IF_FAILED], [ CLOOG_REQUESTED([graphite_requested=yes], [graphite_requested=no]) - if test "${gcc_cv_cloog_ct_0_14_0}" = no \ - || test "${gcc_cv_cloog_rt_0_14_0}" = no \ - || test "${gcc_cv_cloog_ct_0_15_5}" = no; then + if test "${gcc_cv_cloog}" = no ; then clooglibs= clooginc= fi diff --git a/config/isl.m4 b/config/isl.m4 new file mode 100644 index 000000000..ba3fa1b7f --- /dev/null +++ b/config/isl.m4 @@ -0,0 +1,151 @@ +# This file is part of GCC. +# +# GCC is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License as published by the Free +# Software Foundation; either version 3, or (at your option) any later +# version. +# +# GCC is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# for more details. +# +# You should have received a copy of the GNU General Public License +# along with GCC; see the file COPYING3. If not see +# <http://www.gnu.org/licenses/>. +# +# Contributed by Richard Guenther <rguenther@suse.de> +# Based on cloog.m4 + +# ISL_INIT_FLAGS () +# ------------------------- +# Provide configure switches for ISL support. +# Initialize isllibs/islinc according to the user input. +AC_DEFUN([ISL_INIT_FLAGS], +[ + AC_ARG_WITH([isl-include], + [AS_HELP_STRING( + [--with-isl-include=PATH], + [Specify directory for installed ISL include files])]) + AC_ARG_WITH([isl-lib], + [AS_HELP_STRING( + [--with-isl-lib=PATH], + [Specify the directory for the installed ISL library])]) + + AC_ARG_ENABLE(isl-version-check, + [AS_HELP_STRING( + [--disable-isl-version-check], + [disable check for ISL version])], + ENABLE_ISL_CHECK=$enableval, + ENABLE_ISL_CHECK=yes) + + # Initialize isllibs and islinc. + case $with_isl in + no) + isllibs= + islinc= + ;; + "" | yes) + ;; + *) + isllibs="-L$with_isl/lib" + islinc="-I$with_isl/include" + ;; + esac + if test "x${with_isl_include}" != x ; then + islinc="-I$with_isl_include" + fi + if test "x${with_isl_lib}" != x; then + isllibs="-L$with_isl_lib" + fi + dnl If no --with-isl flag was specified and there is in-tree ISL + dnl source, set up flags to use that and skip any version tests + dnl as we cannot run them before building ISL. + if test "x${islinc}" = x && test "x${isllibs}" = x \ + && test -d ${srcdir}/isl; then + isllibs='-L$$r/$(HOST_SUBDIR)/isl/'"$lt_cv_objdir"' ' + islinc='-I$$r/$(HOST_SUBDIR)/isl/include -I$$s/isl/include' + ENABLE_ISL_CHECK=no + fi +] +) + +# ISL_REQUESTED (ACTION-IF-REQUESTED, ACTION-IF-NOT) +# ---------------------------------------------------- +# Provide actions for failed ISL detection. +AC_DEFUN([ISL_REQUESTED], +[ + AC_REQUIRE([ISL_INIT_FLAGS]) + + if test "x${with_isl}" = xno; then + $2 + elif test "x${with_isl}" != x \ + || test "x${with_isl_include}" != x \ + || test "x${with_isl_lib}" != x ; then + $1 + else + $2 + fi +] +) + +# _ISL_CHECK_CT_PROG(MAJOR, MINOR) +# -------------------------------------------- +# Helper for verifying ISL compile time version. +m4_define([_ISL_CHECK_CT_PROG],[AC_LANG_PROGRAM( + [#include <isl/version.h> + #include <string.h>], + [if (strncmp (isl_version (), "isl-$1.$2", strlen ("isl-$1.$2")) != 0) + return 1; + ])]) + +# ISL_CHECK_VERSION ISL_CHECK_VERSION (MAJOR, MINOR) +# ---------------------------------------------------------------- +# Test the found ISL to be exact of version MAJOR.MINOR and at least +# REVISION. +AC_DEFUN([ISL_CHECK_VERSION], +[ + if test "${ENABLE_ISL_CHECK}" = yes ; then + _isl_saved_CFLAGS=$CFLAGS + _isl_saved_LDFLAGS=$LDFLAGS + _isl_saved_LIBS=$LIBS + + CFLAGS="${_isl_saved_CFLAGS} ${islinc} ${gmpinc}" + LDFLAGS="${_isl_saved_LDFLAGS} ${isllibs}" + LIBS="${_isl_saved_LIBS} -lisl" + echo $CFLAGS + + AC_CACHE_CHECK([for version $1.$2 of ISL], + [gcc_cv_isl], + [AC_RUN_IFELSE([_ISL_CHECK_CT_PROG($1,$2)], + [gcc_cv_isl=yes], + [gcc_cv_isl=no], + [gcc_cv_isl=yes])]) + + CFLAGS=$_isl_saved_CFLAGS + LDFLAGS=$_isl_saved_LDFLAGS + LIBS=$_isl_saved_LIBS + fi +] +) + +# ISL_IF_FAILED (ACTION-IF-FAILED) +# ---------------------------------- +# Executes ACTION-IF-FAILED, if GRAPHITE was requested and +# the checks failed. +AC_DEFUN([ISL_IF_FAILED], +[ + ISL_REQUESTED([graphite_requested=yes], [graphite_requested=no]) + + if test "${gcc_cv_isl}" = no ; then + isllibs= + islinc= + fi + + if test "${graphite_requested}" = yes \ + && test "x${isllibs}" = x \ + && test "x${islinc}" = x ; then + $1 + fi +] +) diff --git a/config/mt-sde b/config/mt-sde index d6992e415..a3fc1e1d7 100644 --- a/config/mt-sde +++ b/config/mt-sde @@ -1,10 +1,10 @@ # We default to building libraries optimised for size. We use # -minterlink-mips16 so that the non-MIPS16 libraries can still be -# linked against partly-MIPS16 code. The -mcode-xonly option allows +# linked against partly-MIPS16 code. The -mcode-readable=pcrel option allows # MIPS16 libraries to run on Harvard-style split I/D memories, so long # as they have the D-to-I redirect for PC-relative loads. -mno-gpopt # has two purposes: it allows libraries to be used in situations where # $gp != our _gp, and it allows them to be built with -G8 while # retaining link compatibility with -G0 and -G4. -CFLAGS_FOR_TARGET += -Os -minterlink-mips16 -mcode-xonly -mno-gpopt -CXXFLAGS_FOR_TARGET += -Os -minterlink-mips16 -mcode-xonly -mno-gpopt +CFLAGS_FOR_TARGET += -Os -minterlink-mips16 -mcode-readable=pcrel -mno-gpopt +CXXFLAGS_FOR_TARGET += -Os -minterlink-mips16 -mcode-readable=pcrel -mno-gpopt |