CbC/CbC_gcc: configure.ac comparison

comparison configure.ac @ 131:84e7813d76e9

gcc-8.2

author	mir3636
date	Thu, 25 Oct 2018 07:37:49 +0900
parents	04ced10e8804
children	1830386684a0

comparison

equal deleted inserted replaced

-:04ced10e8804
+:84e7813d76e9
 target_libraries="target-libgcc \
 		target-libbacktrace \
 		target-libgloss \
 		target-newlib \
 		target-libgomp \
-		target-libcilkrts \
 		target-liboffloadmic \
 		target-libhsail-rt \
 		target-libatomic \
 		target-libitm \
 		target-libstdc++-v3 \
 		target-libsanitizer \
 		target-libvtv \
-		target-libmpx \
 		target-libssp \
 		target-libquadmath \
 		target-libgfortran \
 		target-libffi \
 		target-libobjc \
 	    AC_MSG_RESULT([yes])
 	fi
 fi
 fi
-# Disable libcilkrts on unsupported systems.
-if test -d ${srcdir}/libcilkrts; then
-if test x$enable_libcilkrts = x; then
-	AC_MSG_CHECKING([for libcilkrts support])
-	if (srcdir=${srcdir}/libcilkrts; \
-		. ${srcdir}/configure.tgt; \
-		test -n "$UNSUPPORTED")
-	then
-	    AC_MSG_RESULT([no])
-	    noconfigdirs="$noconfigdirs target-libcilkrts"
-	else
-	    AC_MSG_RESULT([yes])
-	fi
-fi
-fi
 # Disable liboffloadmic on unsupported systems.
 if test -d ${srcdir}/liboffloadmic; then
 if test x$enable_liboffloadmic != xno; then
 	AC_MSG_CHECKING([for liboffloadmic support])
 	if (srcdir=${srcdir}/liboffloadmic; \
 	    AC_MSG_RESULT([yes])
 	fi
 fi
 fi
-# Enable libmpx on supported systems by request.
-if test -d ${srcdir}/libmpx; then
-if test x$enable_libmpx = x; then
-AC_MSG_CHECKING([for libmpx support])
-if (srcdir=${srcdir}/libmpx; \
-. ${srcdir}/configure.tgt; \
-test "$LIBMPX_SUPPORTED" != "yes")
-then
-AC_MSG_RESULT([no])
-noconfigdirs="$noconfigdirs target-libmpx"
-else
-AC_MSG_RESULT([yes])
-fi
-fi
-fi
 # Disable libhsail-rt on unsupported systems.
 if test -d ${srcdir}/libhsail-rt; then
 if test x$enable_libhsail_rt = x; then
 AC_MSG_CHECKING([for libhsail-rt support])
 *-*-phoenix*)
 noconfigdirs="$noconfigdirs target-libgloss"
 ;;
 *-*-rtems*)
 noconfigdirs="$noconfigdirs target-libgloss"
-# this is not caught below because this stanza matches earlier
-case $target in
-or1k*-*-*) noconfigdirs="$noconfigdirs gdb" ;;
-esac
 ;;
 # The tpf target doesn't support gdb yet.
 *-*-tpf*)
 noconfigdirs="$noconfigdirs gdb tcl tk libgui itcl"
 ;;
 noconfigdirs="$noconfigdirs gdb"
 ;;
 mt-*-*)
 noconfigdirs="$noconfigdirs sim"
 ;;
+nfp-*-*)
+noconfigdirs="$noconfigdirs ld gas gdb gprof sim"
+noconfigdirs="$noconfigdirs $target_libraries"
+;;
 powerpc-*-aix*)
 # copied from rs6000-*-* entry
 noconfigdirs="$noconfigdirs gprof"
 ;;
 powerpc*-*-winnt* | powerpc*-*-pe*)
 mips*-*-*)
 noconfigdirs="$noconfigdirs gprof"
 ;;
 nvptx*-*-*)
 noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc"
-;;
-or1k*-*-*)
-noconfigdirs="$noconfigdirs gdb"
 ;;
 sh-*-*)
 case "${target}" in
 sh*-*-elf)
 ;;
 v810-*-*)
 noconfigdirs="$noconfigdirs bfd binutils gas gdb ld opcodes target-libgloss"
 ;;
 vax-*-*)
 noconfigdirs="$noconfigdirs target-newlib target-libgloss"
+;;
+wasm32-*-*)
+noconfigdirs="$noconfigdirs ld"
 ;;
 esac
 # If we aren't building newlib, then don't build libgloss, since libgloss
 # depends upon some newlib header files.
 AC_MSG_RESULT([using paths configured with --with-target-bdw-gc options])
 fi
 fi
 esac
-# Disable libcilkrts, libitm, libsanitizer, libvtv, liboffloadmic if we're not building C++
+# Disable libitm, libsanitizer, libvtv, liboffloadmic if we're not building C++
 case ,${enable_languages}, in
 *,c++,*)
-# Disable libcilkrts, libitm, libsanitizer if we're not building libstdc++
+# Disable libitm, libsanitizer if we're not building libstdc++
 case "${noconfigdirs}" in
 *target-libstdc++-v3*)
-noconfigdirs="$noconfigdirs target-libcilkrts target-libitm target-libsanitizer"
+noconfigdirs="$noconfigdirs target-libitm target-libsanitizer"
 ;;
 *) ;;
 esac
 ;;
 *)
-noconfigdirs="$noconfigdirs target-libcilkrts target-liboffloadmic target-libitm target-libsanitizer target-libvtv"
+noconfigdirs="$noconfigdirs target-liboffloadmic target-libitm target-libsanitizer target-libvtv"
 ;;
 esac
 # Remove the entries in $skipdirs and $noconfigdirs from $configdirs,
 # $build_configdirs and $target_configdirs.
 if echo " ${target_configdirs} " | grep " libvtv " > /dev/null 2>&1 &&
 test "$enable_vtable_verify" != no; then
 bootstrap_target_libs=${bootstrap_target_libs}target-libvtv,
 fi
-# If we are building libmpx and $BUILD_CONFIG contains bootstrap-mpx,
-# bootstrap it.
-if echo " ${target_configdirs} " | grep " libmpx " > /dev/null 2>&1; then
-case "$BUILD_CONFIG" in
-*bootstrap-mpx* )
-bootstrap_target_libs=${bootstrap_target_libs}target-libmpx,
-;;
-esac
-fi
 # Determine whether gdb needs tk/tcl or not.
 # Use 'maybe' since enable_gdbtk might be true even if tk isn't available
 # and in that case we want gdb to be built without tk.  Ugh!
 # In fact I believe gdb is the *only* package directly dependent on tk,
 # so we should be able to put the 'maybe's in unconditionally and
 # but now we're fixing up the Makefile ourselves with the additional
 # commands passed to AC_CONFIG_FILES.  Use separate variables
 # extrasub-{build,host,target} not because there is any reason to split
 # the substitutions up that way, but only to remain below the limit of
 # 99 commands in a script, for HP-UX sed.
-# Do not nest @if/@endif pairs, because configure will not warn you at all.
+# Do not nest @if/@endif or @unless/@endunless pairs, because
+# configure will not warn you at all.
 case "$enable_bootstrap:$ENABLE_GOLD: $configdirs :,$stage1_languages," in
 yes:yes:*\ gold\ *:*,c++,*) ;;
 yes:yes:*\ gold\ *:*)
 AC_MSG_ERROR([in a combined tree, bootstrapping with --enable-gold requires c++ in stage1_languages])
 rm -f ${build_subdir}/${module}/Makefile
 fi
 extrasub_build="$extrasub_build
 /^@if build-$module\$/d
 /^@endif build-$module\$/d
+/^@unless build-$module\$/,/^@endunless build-$module\$/d
 /^@if build-$module-$bootstrap_suffix\$/d
-/^@endif build-$module-$bootstrap_suffix\$/d"
+/^@endif build-$module-$bootstrap_suffix\$/d
+/^@unless build-$module-$bootstrap_suffix\$/,/^@endunless build-$module-$bootstrap_suffix\$/d"
 done
 extrasub_host=
 for module in ${configdirs} ; do
 if test -z "${no_recursion}"; then
 for file in stage*-${module}/Makefile prev-${module}/Makefile ${module}/Makefile; do
 *) host_bootstrap_suffix=$bootstrap_suffix ;;
 esac
 extrasub_host="$extrasub_host
 /^@if $module\$/d
 /^@endif $module\$/d
+/^@unless $module\$/,/^@endunless $module\$/d
 /^@if $module-$host_bootstrap_suffix\$/d
-/^@endif $module-$host_bootstrap_suffix\$/d"
+/^@endif $module-$host_bootstrap_suffix\$/d
+/^@unless $module-$host_bootstrap_suffix\$/,/^@endunless $module-$host_bootstrap_suffix\$/d"
 done
 extrasub_target=
 for module in ${target_configdirs} ; do
 if test -z "${no_recursion}" \
 && test -f ${target_subdir}/${module}/Makefile; then
 esac
 extrasub_target="$extrasub_target
 /^@if target-$module\$/d
 /^@endif target-$module\$/d
+/^@unless target-$module\$/,/^@endunless target-$module\$/d
 /^@if target-$module-$target_bootstrap_suffix\$/d
-/^@endif target-$module-$target_bootstrap_suffix\$/d"
+/^@endif target-$module-$target_bootstrap_suffix\$/d
+/^@unless target-$module-$target_bootstrap_suffix\$/,/^@endunless target-$module-$target_bootstrap_suffix\$/d"
 done
 # Do the final fixup along with target modules.
 extrasub_target="$extrasub_target
-/^@if /,/^@endif /d"
+/^@if /,/^@endif /d
+/^@unless /d
+/^@endunless /d"
 # Create the serialization dependencies.  This uses a temporary file.
 AC_ARG_ENABLE([serial-configure],
 [AS_HELP_STRING([[--enable-serial-[{host,target,build}-]configure]],

Mercurial > hg > CbC > CbC_gcc

comparison configure.ac @ 131:84e7813d76e9