| Index: gcc/configure
 | 
| diff --git a/gcc/configure b/gcc/configure
 | 
| index 21530e9d1605dd8d44706f33117abd80be133236..b008dc317ec6f56b48d5f743014a9f1e39249ef2 100755
 | 
| --- a/gcc/configure
 | 
| +++ b/gcc/configure
 | 
| @@ -14511,13 +14511,13 @@ if test "${lt_cv_nm_interface+set}" = set; then
 | 
|  else
 | 
|    lt_cv_nm_interface="BSD nm"
 | 
|    echo "int some_variable = 0;" > conftest.$ac_ext
 | 
| -  (eval echo "\"\$as_me:14512: $ac_compile\"" >&5)
 | 
| +  (eval echo "\"\$as_me:14514: $ac_compile\"" >&5)
 | 
|    (eval "$ac_compile" 2>conftest.err)
 | 
|    cat conftest.err >&5
 | 
| -  (eval echo "\"\$as_me:14515: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
 | 
| +  (eval echo "\"\$as_me:14517: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
 | 
|    (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
 | 
|    cat conftest.err >&5
 | 
| -  (eval echo "\"\$as_me:14518: output\"" >&5)
 | 
| +  (eval echo "\"\$as_me:14520: output\"" >&5)
 | 
|    cat conftest.out >&5
 | 
|    if $GREP 'External.*some_variable' conftest.out > /dev/null; then
 | 
|      lt_cv_nm_interface="MS dumpbin"
 | 
| @@ -14933,7 +14933,7 @@ freebsd* | dragonfly*)
 | 
|    fi
 | 
|    ;;
 | 
|  
 | 
| -gnu*)
 | 
| +gnu* | nacl*)
 | 
|    lt_cv_deplibs_check_method=pass_all
 | 
|    ;;
 | 
|  
 | 
| @@ -15674,7 +15674,7 @@ ia64-*-hpux*)
 | 
|    ;;
 | 
|  *-*-irix6*)
 | 
|    # Find out which ABI we are using.
 | 
| -  echo '#line 15675 "configure"' > conftest.$ac_ext
 | 
| +  echo '#line 15677 "configure"' > conftest.$ac_ext
 | 
|    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 | 
|    (eval $ac_compile) 2>&5
 | 
|    ac_status=$?
 | 
| @@ -16973,11 +16973,11 @@ else
 | 
|     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
 | 
|     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
 | 
|     -e 's:$: $lt_compiler_flag:'`
 | 
| -   (eval echo "\"\$as_me:16974: $lt_compile\"" >&5)
 | 
| +   (eval echo "\"\$as_me:16976: $lt_compile\"" >&5)
 | 
|     (eval "$lt_compile" 2>conftest.err)
 | 
|     ac_status=$?
 | 
|     cat conftest.err >&5
 | 
| -   echo "$as_me:16978: \$? = $ac_status" >&5
 | 
| +   echo "$as_me:16980: \$? = $ac_status" >&5
 | 
|     if (exit $ac_status) && test -s "$ac_outfile"; then
 | 
|       # The compiler can only warn and ignore the option if not recognized
 | 
|       # So say no if there are warnings other than the usual output.
 | 
| @@ -17312,11 +17312,11 @@ else
 | 
|     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
 | 
|     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
 | 
|     -e 's:$: $lt_compiler_flag:'`
 | 
| -   (eval echo "\"\$as_me:17313: $lt_compile\"" >&5)
 | 
| +   (eval echo "\"\$as_me:17315: $lt_compile\"" >&5)
 | 
|     (eval "$lt_compile" 2>conftest.err)
 | 
|     ac_status=$?
 | 
|     cat conftest.err >&5
 | 
| -   echo "$as_me:17317: \$? = $ac_status" >&5
 | 
| +   echo "$as_me:17319: \$? = $ac_status" >&5
 | 
|     if (exit $ac_status) && test -s "$ac_outfile"; then
 | 
|       # The compiler can only warn and ignore the option if not recognized
 | 
|       # So say no if there are warnings other than the usual output.
 | 
| @@ -17417,11 +17417,11 @@ else
 | 
|     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
 | 
|     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
 | 
|     -e 's:$: $lt_compiler_flag:'`
 | 
| -   (eval echo "\"\$as_me:17418: $lt_compile\"" >&5)
 | 
| +   (eval echo "\"\$as_me:17420: $lt_compile\"" >&5)
 | 
|     (eval "$lt_compile" 2>out/conftest.err)
 | 
|     ac_status=$?
 | 
|     cat out/conftest.err >&5
 | 
| -   echo "$as_me:17422: \$? = $ac_status" >&5
 | 
| +   echo "$as_me:17424: \$? = $ac_status" >&5
 | 
|     if (exit $ac_status) && test -s out/conftest2.$ac_objext
 | 
|     then
 | 
|       # The compiler can only warn and ignore the option if not recognized
 | 
| @@ -17472,11 +17472,11 @@ else
 | 
|     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
 | 
|     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
 | 
|     -e 's:$: $lt_compiler_flag:'`
 | 
| -   (eval echo "\"\$as_me:17473: $lt_compile\"" >&5)
 | 
| +   (eval echo "\"\$as_me:17475: $lt_compile\"" >&5)
 | 
|     (eval "$lt_compile" 2>out/conftest.err)
 | 
|     ac_status=$?
 | 
|     cat out/conftest.err >&5
 | 
| -   echo "$as_me:17477: \$? = $ac_status" >&5
 | 
| +   echo "$as_me:17479: \$? = $ac_status" >&5
 | 
|     if (exit $ac_status) && test -s out/conftest2.$ac_objext
 | 
|     then
 | 
|       # The compiler can only warn and ignore the option if not recognized
 | 
| @@ -19251,6 +19251,21 @@ linux*oldld* | linux*aout* | linux*coff*)
 | 
|    dynamic_linker=no
 | 
|    ;;
 | 
|  
 | 
| +nacl*)
 | 
| +  version_type=linux
 | 
| +  need_lib_prefix=no
 | 
| +  need_version=no
 | 
| +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 | 
| +  soname_spec='${libname}${release}${shared_ext}$major'
 | 
| +  shlibpath_var=LD_LIBRARY_PATH
 | 
| +  shlibpath_overrides_runpath=no
 | 
| +
 | 
| +  # This implies no fast_install, which is unacceptable.
 | 
| +  # Some rework will be needed to allow for fast_install
 | 
| +  # before this can be enabled.
 | 
| +  hardcode_into_libs=yes
 | 
| +  ;;
 | 
| +
 | 
|  # This must be Linux ELF.
 | 
|  linux* | k*bsd*-gnu | kopensolaris*-gnu)
 | 
|    version_type=linux
 | 
| @@ -20284,7 +20299,7 @@ else
 | 
|    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
 | 
|    lt_status=$lt_dlunknown
 | 
|    cat > conftest.$ac_ext <<_LT_EOF
 | 
| -#line 20285 "configure"
 | 
| +#line 20302 "configure"
 | 
|  #include "confdefs.h"
 | 
|  
 | 
|  #if HAVE_DLFCN_H
 | 
| @@ -20380,7 +20395,7 @@ else
 | 
|    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
 | 
|    lt_status=$lt_dlunknown
 | 
|    cat > conftest.$ac_ext <<_LT_EOF
 | 
| -#line 20381 "configure"
 | 
| +#line 20398 "configure"
 | 
|  #include "confdefs.h"
 | 
|  
 | 
|  #if HAVE_DLFCN_H
 | 
| @@ -22077,7 +22092,7 @@ foo:	.long	25
 | 
|  	tls_first_major=2
 | 
|  	tls_first_minor=17
 | 
|  	;;
 | 
| -  i[34567]86-*-*)
 | 
| +  i[34567]86*-*-*)
 | 
|      conftest_s='
 | 
|  	.section ".tdata","awT",@progbits
 | 
|  foo:	.long	25
 | 
| @@ -22775,7 +22790,7 @@ _ACEOF
 | 
|  fi
 | 
|      ;;
 | 
|  
 | 
| -  i[34567]86-*-* | x86_64-*-*)
 | 
| +  i[34567]86*-*-* | x86_64-*-*)
 | 
|      case $target_os in
 | 
|        cygwin* | pe | mingw32*)
 | 
|  	# Used for DWARF 2 in PE
 | 
| 
 |