132 lines
4.4 KiB
Plaintext
132 lines
4.4 KiB
Plaintext
$NetBSD: patch-aa,v 1.23 2014/11/19 13:49:35 wiz Exp $
|
|
|
|
--- configure.orig 2014-11-12 11:59:57.000000000 +0000
|
|
+++ configure
|
|
@@ -654,6 +654,8 @@ VAX_FALSE
|
|
VAX_TRUE
|
|
TILE_FALSE
|
|
TILE_TRUE
|
|
+VAX_FALSE
|
|
+VAX_TRUE
|
|
PA64_HPUX_FALSE
|
|
PA64_HPUX_TRUE
|
|
PA_HPUX_FALSE
|
|
@@ -17120,7 +17122,7 @@ case "$host" in
|
|
TARGET=FRV; TARGETDIR=frv
|
|
;;
|
|
|
|
- hppa*-*-linux* | parisc*-*-linux* | hppa*-*-openbsd*)
|
|
+ hppa*-*-linux* | hppa*-*-netbsd* | parisc*-*-linux* | hppa*-*-openbsd*)
|
|
TARGET=PA_LINUX; TARGETDIR=pa
|
|
;;
|
|
hppa*64-*-hpux*)
|
|
@@ -17218,10 +17220,10 @@ case "$host" in
|
|
TARGET=METAG; TARGETDIR=metag
|
|
;;
|
|
|
|
- mips-sgi-irix5.* | mips-sgi-irix6.* | mips*-*-rtems*)
|
|
+ mips*-sgi-irix5.* | mips*-sgi-irix6.* | mips*-*-rtems*)
|
|
TARGET=MIPS; TARGETDIR=mips
|
|
;;
|
|
- mips*-*linux* | mips*-*-openbsd*)
|
|
+ mips*-*linux* | mips*-*-netbsd* | mips*-*-openbsd*)
|
|
# Support 128-bit long double for NewABI.
|
|
HAVE_LONG_DOUBLE='defined(__mips64)'
|
|
TARGET=MIPS; TARGETDIR=mips
|
|
@@ -17251,7 +17253,7 @@ case "$host" in
|
|
powerpc-*-aix* | rs6000-*-aix*)
|
|
TARGET=POWERPC_AIX; TARGETDIR=powerpc
|
|
;;
|
|
- powerpc-*-freebsd* | powerpc-*-openbsd*)
|
|
+ powerpc-*-freebsd* | powerpc-*-netbsd* | powerpc-*-openbsd*)
|
|
TARGET=POWERPC_FREEBSD; TARGETDIR=powerpc
|
|
HAVE_LONG_DOUBLE_VARIANT=1
|
|
;;
|
|
@@ -17266,7 +17268,7 @@ case "$host" in
|
|
TARGET=S390; TARGETDIR=s390
|
|
;;
|
|
|
|
- sh-*-* | sh[34]*-*-*)
|
|
+ sh-*-* | shle-*-* | sh[34]*-*-*)
|
|
TARGET=SH; TARGETDIR=sh
|
|
;;
|
|
sh64-*-* | sh5*-*-*)
|
|
@@ -17285,6 +17287,10 @@ case "$host" in
|
|
TARGET=VAX; TARGETDIR=vax
|
|
;;
|
|
|
|
+ vax-*-*)
|
|
+ TARGET=VAX; TARGETDIR=vax
|
|
+ ;;
|
|
+
|
|
xtensa*-*)
|
|
TARGET=XTENSA; TARGETDIR=xtensa
|
|
;;
|
|
@@ -17610,6 +17616,14 @@ else
|
|
VAX_FALSE=
|
|
fi
|
|
|
|
+ if test x$TARGET = xVAX; then
|
|
+ VAX_TRUE=
|
|
+ VAX_FALSE='#'
|
|
+else
|
|
+ VAX_TRUE='#'
|
|
+ VAX_FALSE=
|
|
+fi
|
|
+
|
|
if test x$TARGET = xXTENSA; then
|
|
XTENSA_TRUE=
|
|
XTENSA_FALSE='#'
|
|
@@ -18530,7 +18544,7 @@ case "$target" in
|
|
$as_echo "#define FFI_EXEC_TRAMPOLINE_TABLE 1" >>confdefs.h
|
|
|
|
;;
|
|
- *-apple-darwin1* | *-*-freebsd* | *-*-kfreebsd* | *-*-openbsd* | *-pc-solaris*)
|
|
+ *-apple-darwin1* | *-*-freebsd* | *-*-kfreebsd* | *-*-netbsd* | *-*-openbsd* | *-pc-solaris*)
|
|
|
|
$as_echo "#define FFI_MMAP_EXEC_WRIT 1" >>confdefs.h
|
|
|
|
@@ -18725,11 +18739,6 @@ if test "x$GCC" = "xyes"; then
|
|
toolexecdir="${libdir}"/gcc-lib/'$(target_alias)'
|
|
toolexeclibdir="${libdir}"
|
|
fi
|
|
- multi_os_directory=`$CC $CFLAGS -print-multi-os-directory`
|
|
- case $multi_os_directory in
|
|
- .) ;; # Avoid trailing /.
|
|
- ../*) toolexeclibdir=$toolexeclibdir/$multi_os_directory ;;
|
|
- esac
|
|
|
|
else
|
|
toolexeclibdir="${libdir}"
|
|
@@ -19052,6 +19061,10 @@ if test -z "${VAX_TRUE}" && test -z "${V
|
|
as_fn_error $? "conditional \"VAX\" was never defined.
|
|
Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
|
fi
|
|
+if test -z "${VAX_TRUE}" && test -z "${VAX_FALSE}"; then
|
|
+ as_fn_error $? "conditional \"VAX\" was never defined.
|
|
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
|
+fi
|
|
if test -z "${XTENSA_TRUE}" && test -z "${XTENSA_FALSE}"; then
|
|
as_fn_error $? "conditional \"XTENSA\" was never defined.
|
|
Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
|
@@ -20749,13 +20762,13 @@ s/ [a-zA-Z0-9-]*-all [a-zA-Z0-9-]*-all-a
|
|
/-all-all/d
|
|
a\\
|
|
@ HOST="\$(HOST)\" \\\\\\
|
|
- ; test ".\$\$HOST" = "." && HOST=$x sh $ax_enable_builddir_auxdir/config.guess $x \\\\\\
|
|
- ; BUILD=$x grep "^#### \$\$HOST " Makefile | sed -e 's/.*|//' $x \\\\\\
|
|
- ; use=$x basename "\$\@" -all $x; n=$x echo \$\$BUILD | wc -w $x \\\\\\
|
|
- ; echo "MAKE \$\$HOST : \$\$n * \$\@"; if test "\$\$n" -eq "0" ; then : \\\\\\
|
|
- ; BUILD=$x grep "^####.*|" Makefile |tail -1| sed -e 's/.*|//' $x ; fi \\\\\\
|
|
+ ; test ".\$\$HOST" = "." && HOST="$x sh $ax_enable_builddir_auxdir/config.guess $x" \\\\\\
|
|
+ ; BUILD="$x grep "^#### \$\$HOST " Makefile | sed -e 's/.*|//' $x" \\\\\\
|
|
+ ; use="$x basename "\$\@" -all $x"; n="$x echo \$\$BUILD | wc -w $x" \\\\\\
|
|
+ ; echo "MAKE \$\$HOST : \$\$n * \$\@"; if test \$\$n = "0" ; then : \\\\\\
|
|
+ ; BUILD="$x grep "^####.*|" Makefile |tail -1| sed -e 's/.*|//' $x" ; fi \\\\\\
|
|
; test ".\$\$BUILD" = "." && BUILD="." \\\\\\
|
|
- ; test "\$\$use" = "\$\@" && BUILD=$x echo "\$\$BUILD" | tail -1 $x \\\\\\
|
|
+ ; test "\$\$use" = "\$\@" && BUILD="$x echo "\$\$BUILD" | tail -1 $x" \\\\\\
|
|
; for i in \$\$BUILD ; do test ".\$\$i" = "." && continue \\\\\\
|
|
; (cd "\$\$i" && test ! -f configure && \$(MAKE) \$\$use) || exit; done
|
|
/dist-all *:/a\\
|