OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

configure.ac (multiarch): Use $enableval instead of $withval. 

2012-11-24  Matthias Klose  <doko@ubuntu.com>

        * configure.ac (multiarch): Use $enableval instead of $withval.
        * configure: Regenerate.
        * config/i386/t-kfreebsd (MULTILIB_OSDIRNAMES): Filter out x32.

From-SVN: r193776
This commit is contained in:
Matthias Klose 2012-11-24 02:25:50 +00:00 committed by Matthias Klose
parent 1773438a1b
commit 5213f20cfb
4 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/ChangeLog
View File

@ -1,3 +1,9 @@
2012-11-24 Matthias Klose <doko@ubuntu.com>
* configure.ac (multiarch): Use $enableval instead of $withval.
* configure: Regenerate.
* config/i386/t-kfreebsd (MULTILIB_OSDIRNAMES): Filter out x32.
2012-11-23 Tobias Burnus <burnus@net-b.de>
* doc/invoke.texi (-fsanitize=address): Remove obsolete

2
gcc/config/i386/t-kfreebsd
View File

@ -2,4 +2,4 @@ MULTIARCH_DIRNAME = $(call if_multiarch,i386-kfreebsd-gnu)
# MULTILIB_OSDIRNAMES are set in t-linux64.
KFREEBSD_OS = $(filter kfreebsd%, $(word 3, $(subst -, ,$(target))))
MULTILIB_OSDIRNAMES := $(subst linux,$(KFREEBSD_OS),$(MULTILIB_OSDIRNAMES))
MULTILIB_OSDIRNAMES := $(filter-out mx32=% $(subst linux,$(KFREEBSD_OS),$(MULTILIB_OSDIRNAMES)))

6
gcc/configure vendored
View File

@ -7024,9 +7024,9 @@ fi
# Determine whether or not multiarch is enabled.
# Check whether --enable-multiarch was given.
if test "${enable_multiarch+set}" = set; then :
enableval=$enable_multiarch; case "${withval}" in
yes|no|auto) enable_multiarch=$withval;;
*) as_fn_error "bad value ${withval} given for --enable-multiarch option" "$LINENO" 5 ;;
enableval=$enable_multiarch; case "${enableval}" in
yes|no|auto) enable_multiarch=$enableval;;
*) as_fn_error "bad value ${enableval} given for --enable-multiarch option" "$LINENO" 5 ;;
esac
else
enable_multiarch=auto

6
gcc/configure.ac
View File

@ -617,9 +617,9 @@ AC_SUBST(enable_multilib)
AC_ARG_ENABLE(multiarch,
[AS_HELP_STRING([--enable-multiarch],
[enable support for multiarch paths])],
[case "${withval}" in
yes|no|auto) enable_multiarch=$withval;;
*) AC_MSG_ERROR(bad value ${withval} given for --enable-multiarch option) ;;
[case "${enableval}" in
yes|no|auto) enable_multiarch=$enableval;;
*) AC_MSG_ERROR(bad value ${enableval} given for --enable-multiarch option) ;;
esac], [enable_multiarch=auto])
if test x${enable_multiarch} = xauto; then
if test x${with_native_system_header_dir} != x; then