Import latest cross-compilation patch in gitvadim/cross

12 files changed, 238 insertions, 1548 deletions

diff --git a/Cross/Makefile-cross-SH b/Cross/Makefile-cross-SH
deleted file mode 100755
index c6ecf419d4..0000000000
--- a/Cross/Makefile-cross-SH
+++ /dev/null
@@ -1,1406 +0,0 @@
-#! /bin/sh
-
-# This file is used to create generic Makefile for cross-compile
-# (borrowed from Makefile.SH)
-# (now only small changes are done to establish cross-compilation)
-# miniperl removed from here, as this is built on HOST
-
-Makefile=Makefile-cross-$CROSS_NAME
-
-. Cross/config-${CROSS_NAME}.sh
-
-# H.Merijn Brand [17 Feb 2004]
-# This comment is just to ensure that Configure will find variables that
-# are removed/replaced in patches on blead, but are still needed in the
-# 5.8.x, 5.6.x and 5.005.x maintainance tracks.
-# metaconfig -m will scan all .SH files on this level (not deeper), and
-# not in x2p and other subfolders. This file is as good as any .SH
-# patch   references
-# #22227 $baserev
-# #22302 $yacc $byacc
-
-# H.Merijn Brand [30 Oct 2004]
-# Mentioned for the same reason for future reference
-# #23434 $d_strlcat $d_strlcpy
-
-: This forces SH files to create target in same directory as SH file.
-: This is so that make depend always knows where to find SH derivatives.
-case "$0" in
-*/*) cd `expr X$0 : 'X\(.*\)/'` ;;
-esac
-
-case "$d_dosuid" in
-*define*) suidperl='suidperl' ;;
-*) suidperl='';;
-esac
-
-linklibperl='$(LIBPERL)'
-shrpldflags='$(LDDLFLAGS)'
-ldlibpth=''
-DPERL_EXTERNAL_GLOB='-DPERL_EXTERNAL_GLOB'
-case "$useshrplib" in
-true)
-	# Prefix all runs of 'miniperl' and 'perl' with
-	# $ldlibpth so that ./perl finds *this* shared libperl.
-	case "$LD_LIBRARY_PATH" in
-	'')
-		ldlibpth="LD_LIBRARY_PATH=`pwd`";;
-	*)
-		ldlibpth="LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}";;
-	esac
-
-	pldlflags="$cccdlflags"
-	static_target='static_pic'
-	case "${osname}${osvers}" in
-	next4*)
-		ld=libtool
-		lddlflags="-dynamic -undefined warning -framework System \
-		-compatibility_version 1 -current_version $patchlevel \
-		-prebind -seg1addr 0x27000000 -install_name \$(shrpdir)/\$@"
-		;;
-	rhapsody*|darwin*)
-		shrpldflags="${ldflags} -dynamiclib \
-                            -compatibility_version \
-				${api_revision}.${api_version}.${api_subversion} \
-			     -current_version \
-				${revision}.${patchlevel}.${subversion} \
-			     -install_name \$(shrpdir)/\$@"
-		;;
-	cygwin*)
-		linklibperl="-lperl"
-		;;
-	sunos*)
-		linklibperl="-lperl"
-		;;
-	netbsd*|freebsd[234]*|openbsd*|dragonfly*)
-		linklibperl="-L. -lperl"
-		;;
-	interix*)
-		linklibperl="-L. -lperl"
-		shrpldflags="$shrpldflags -Wl,--image-base,0x57000000"
-		;;
-	linux*)
-		shrpldflags="$shrpldflags $ldflags $perllibs $cryptlib"
-		;;
-	aix*)
-		shrpldflags="-H512 -T512 -bhalt:4 -bM:SRE -bE:perl.exp"
-		case "$osvers" in
-		3*)	shrpldflags="$shrpldflags -e _nostart"
-			;;
-		*)	shrpldflags="$shrpldflags -b noentry"
-			;;
-		esac
-	        shrpldflags="$shrpldflags $ldflags $perllibs $cryptlib"
-		linklibperl="-L $archlibexp/CORE -L `pwd | sed 's/\/UU$//'` -lperl"
-		;;
-	hpux*)
-		linklibperl="-L `pwd | sed 's/\/UU$//'` -Wl,+s -Wl,+b$archlibexp/CORE -lperl"
-		;;
-	os390*)
-            shrpldflags='-W l,XPLINK,dll'
-	    linklibperl='libperl.x'
-	    DPERL_EXTERNAL_GLOB=''
-	    ;;
-	esac
-	case "$ldlibpthname" in
-	'') ;;
-	*)
-	    case "$osname" in
-	    os2)
-	        ldlibpth=''
-	        ;;
-	    *)
-		eval "ldlibpth=\"$ldlibpthname=`pwd`:\$$ldlibpthname\""
-		;;
-	    esac
-	    # Strip off any trailing :'s
-	    ldlibpth=`echo $ldlibpth | sed 's/:*$//'`
-	    ;;
-        esac
-
-	case "$ldlibpth" in
-	# Protect any spaces
-	*" "*) ldlibpth=`echo $ldlibpth|sed 's/ /\\\\ /g'` ;;
-	esac
-
-	case "$osname" in
-	linux)
-	    # If there is a pre-existing $libperl from a previous
-	    # installation, Linux needs to use LD_PRELOAD to
-	    # override the LD_LIBRARY_PATH setting.  See the
-	    # INSTALL file, under "Building a shared perl library".
-	    # If there is no pre-existing $libperl, we don't need
-	    # to do anything further.
-	    if test -f $archlib/CORE/$libperl; then
-		rm -f preload
-		cat <<'EOT' > preload
-#! /bin/sh
-lib=$1
-shift
-test -r $lib && export LD_PRELOAD="$lib $LD_PRELOAD"
-exec "$@"
-EOT
-		chmod 755 preload
-		ldlibpth="$ldlibpth `pwd`/preload `pwd`/$libperl"
-	    fi
-	    ;;
-	os390)	test -f /bin/env && ldlibpth="/bin/env $ldlibpth"
-		;;
-	esac
-
-	;;
-
-*)	pldlflags=''
-	static_target='static'
-	;;
-esac
-
-: Prepare dependency lists for Makefile.
-dynamic_list=' '
-extra_dep=''
-for f in $dynamic_ext; do
-    : the dependency named here will never exist
-      base=`echo "$f" | sed 's/.*\///'`
-    this_target="lib/auto/$f/$base.$dlext"  
-    dynamic_list="$dynamic_list $this_target"
-
-    : Parallel makes reveal that we have some interdependencies
-    case $f in
-	Math/BigInt/FastCalc) extra_dep="$extra_dep
-$this_target: lib/auto/List/Util/Util.$dlext" ;;
-	Unicode/Normalize) extra_dep="$extra_dep
-$this_target: uni.data" ;;
-    esac
-done
-
-static_list=' '
-for f in $static_ext; do
-	base=`echo "$f" | sed 's/.*\///'`
-	static_list="$static_list lib/auto/$f/$base\$(LIB_EXT)"
-done
-
-nonxs_list=' '
-for f in $nonxs_ext; do
-    base=`echo "$f" | sed 's/.*\///'`
-    nonxs_list="$nonxs_list ext/$f/pm_to_blib"
-done
-
-echo "Extracting $Makefile (with variable substitutions)"
-$spitshell >$Makefile <<!GROK!THIS!
-# $Makefile.SH
-# This file is derived from $Makefile.SH.  Any changes made here will
-# be lost the next time you run Configure.
-#  $Makefile is used to generate $firstmakefile.  The only difference
-#  is that $firstmakefile has the dependencies filled in at the end.
-
-CC = $cc
-LD = $ld
-
-LDFLAGS = $ldflags
-CLDFLAGS = $ldflags
-
-mallocsrc = $mallocsrc
-mallocobj = $mallocobj
-madlysrc = $madlysrc
-madlyobj = $madlyobj
-LNS = $lns
-# NOTE: some systems don't grok "cp -f". XXX Configure test needed?
-CPS = $cp
-RMS = rm -f
-ranlib = $ranlib
-
-# The following are mentioned only to make metaconfig include the
-# appropriate questions in Configure.  If you want to change these,
-# edit config.sh instead, or specify --man1dir=/wherever on
-# installman commandline.
-bin = $installbin
-scriptdir = $scriptdir
-shrpdir = $archlibexp/CORE
-privlib = $installprivlib
-man1dir = $man1dir
-man1ext = $man1ext
-man3dir = $man3dir
-man3ext = $man3ext
-
-# The following are used to build and install shared libraries for
-# dynamic loading.
-LDDLFLAGS = $lddlflags
-SHRPLDFLAGS = $shrpldflags
-CCDLFLAGS = $ccdlflags
-DLSUFFIX = .$dlext
-PLDLFLAGS = $pldlflags
-LIBPERL = $libperl
-LLIBPERL= $linklibperl
-SHRPENV = $shrpenv
-
-# Static targets are ordinarily built without CCCDLFLAGS.  However,
-# if building a shared libperl.so that might later be linked into
-# another application, then it might be appropriate to also build static
-# extensions (usually just DynaLoader) with relocatable code (e.g. -fPIC
-# for GNU cc).  This is handled by ext/util/make_ext.
-STATIC = $static_target
-
-# The following is used to include the current directory in
-# the dynamic loader path you are building a shared libperl.
-LDLIBPTH = $ldlibpth
-
-dynamic_ext = $dynamic_list
-static_ext = $static_list
-nonxs_ext = $nonxs_list
-ext = \$(dynamic_ext) \$(static_ext) \$(nonxs_ext)
-DYNALOADER = DynaLoader\$(OBJ_EXT)
-
-libs = $perllibs $cryptlib
-
-public = perl\$(EXE_EXT) $suidperl utilities translators
-
-shellflags = $shellflags
-
-# This is set to  MAKE=$make if your $make command doesn't
-# do it for you.
-$make_set_make
-
-# Mention $gmake here so it gets probed for by Configure.
-
-# These variables may need to be manually set for non-Unix systems.
-AR = $full_ar
-EXE_EXT = $_exe
-LIB_EXT = $_a
-OBJ_EXT = $_o
-PATH_SEP = $p_
-
-# If you're going to use valgrind and it can't be invoked as plain valgrind
-# then you'll need to change this, or override it on the make command line.
-VALGRIND=valgrind
-
-FIRSTMAKEFILE = $firstmakefile
-
-# Any special object files needed by this architecture, e.g. os2/os2.obj
-ARCHOBJS = $archobjs
-
-.SUFFIXES: .c \$(OBJ_EXT) .i .s
-
-# grrr
-SHELL = $sh
-
-# how to tr(anslate) newlines
-TRNL = '$trnl'
-
-OPTIMIZE = $optimize
-
-EXTRAS = $extras
-
-INSTALLPREFIXEXP = $prefix
-
-!GROK!THIS!
-# not used by Makefile but by installperl;
-# mentioned here so that metaconfig picks these up
-# $installusrbinperl
-# $versiononly
-
-case "${osname}:${osvers}" in
-darwin:*)
-$spitshell >>$Makefile <<EOF
-
-# Your locales are broken (osname $osname, osvers $osvers)
-# and to avoid the numerous
-# perl: warning: Setting locale failed.
-# warnings during the build process we reset the locale variables.
-
-LC_ALL=C
-LANG=C
-LANGUAGE=C
-EOF
-	;;
-esac
-
-$spitshell >>$Makefile <<!GROK!THIS!
-CROSS_NAME = ${CROSS_NAME}
-CROSS_LIB = xlib/${CROSS_NAME}
-
-CCCMD    = \`sh \$(shellflags) cflags-cross-${CROSS_NAME} "optimize='\$(OPTIMIZE)'" \$@\`
-
-CCCMDSRC = \`sh \$(shellflags) cflags-cross-${CROSS_NAME} "optimize='\$(OPTIMIZE)'" \$<\`
-
-!GROK!THIS!
-
-## In the following dollars and backticks do not need the extra backslash.
-$spitshell >>$Makefile <<'!NO!SUBS!'
-
-CONFIGPM = xlib/$(CROSS_NAME)/Config.pm
-
-private = preplibrary $(CONFIGPM) $(CROSS_LIB)/Config.pod
-
-shextract = Makefile cflags config.h makeaperl makedepend \
-	makedir myconfig writemain pod/Makefile
-
-# Files to be built with variable substitution after miniperl is
-# available.  Dependencies handled manually below (for now).
-
-pl = pod/pod2html.PL pod/pod2latex.PL pod/pod2man.PL pod/pod2text.PL \
-	pod/pod2usage.PL pod/podchecker.PL pod/podselect.PL
-
-# lib/lib.pm is not listed here because it has a rule of its own.
-plextract = pod/pod2html pod/pod2latex pod/pod2man pod/pod2text \
-	pod/pod2usage pod/podchecker pod/podselect
-
-addedbyconf = UU $(shextract) $(plextract) lib/lib.pm pstruct
-
-# Unicode data files generated by mktables
-unidatafiles = lib/unicore/Canonical.pl lib/unicore/Exact.pl \
-	lib/unicore/Properties lib/unicore/Decomposition.pl \
-	lib/unicore/CombiningClass.pl lib/unicore/Name.pl lib/unicore/PVA.pl
-
-# Directories of Unicode data files generated by mktables
-unidatadirs = lib/unicore/To lib/unicore/lib
-
-h1 = EXTERN.h INTERN.h XSUB.h av.h xconfig.h cop.h cv.h dosish.h
-h2 = embed.h form.h gv.h handy.h hv.h keywords.h mg.h op.h opcode.h
-h3 = pad.h patchlevel.h perl.h perlapi.h perly.h pp.h proto.h regcomp.h
-h4 = regexp.h scope.h sv.h unixish.h util.h iperlsys.h thread.h
-h5 = utf8.h warnings.h
-h = $(h1) $(h2) $(h3) $(h4) $(h5)
-
-c1 = av.c scope.c op.c doop.c doio.c dump.c gv.c hv.c mg.c reentr.c mro.c perl.c
-c2 = perly.c pp.c pp_hot.c pp_ctl.c pp_sys.c regcomp.c regexec.c utf8.c sv.c
-c3 = taint.c toke.c util.c deb.c run.c universal.c xsutils.c pad.c globals.c
-c4 = perlio.c perlapi.c numeric.c mathoms.c locale.c pp_pack.c pp_sort.c
-c5 = $(madlysrc) $(mallocsrc)
-
-c = $(c1) $(c2) $(c3) $(c4) $(c5) miniperlmain.c perlmain.c opmini.c
-
-obj1 = $(madlyobj) $(mallocobj) gv$(OBJ_EXT) toke$(OBJ_EXT) perly$(OBJ_EXT) op$(OBJ_EXT) pad$(OBJ_EXT) regcomp$(OBJ_EXT) dump$(OBJ_EXT) util$(OBJ_EXT) mg$(OBJ_EXT) reentr$(OBJ_EXT) mro$(OBJ_EXT)
-obj2 = hv$(OBJ_EXT) av$(OBJ_EXT) perl$(OBJ_EXT) run$(OBJ_EXT) pp_hot$(OBJ_EXT) sv$(OBJ_EXT) pp$(OBJ_EXT) scope$(OBJ_EXT) pp_ctl$(OBJ_EXT) pp_sys$(OBJ_EXT)
-obj3 = doop$(OBJ_EXT) doio$(OBJ_EXT) regexec$(OBJ_EXT) utf8$(OBJ_EXT) taint$(OBJ_EXT) deb$(OBJ_EXT) universal$(OBJ_EXT) xsutils$(OBJ_EXT) globals$(OBJ_EXT) perlio$(OBJ_EXT) perlapi$(OBJ_EXT) numeric$(OBJ_EXT) mathoms$(OBJ_EXT) locale$(OBJ_EXT) pp_pack$(OBJ_EXT) pp_sort$(OBJ_EXT)
-
-obj = $(obj1) $(obj2) $(obj3) $(ARCHOBJS)
-
-lintflags = \
-    -b \
-    -n \
-    -p \
-    -Ncheck=%all \
-    -Nlevel=4 \
-    -errchk=parentheses \
-    -errhdr=%all \
-    -errfmt=src \
-    -errtags \
-    -erroff=E_ASSIGN_NARROW_CONV \
-    -erroff=E_BAD_PTR_CAST \
-    -erroff=E_BAD_PTR_CAST_ALIGN \
-    -erroff=E_BAD_PTR_INT_COMBINATION \
-    -erroff=E_BAD_SIGN_EXTEND \
-    -erroff=E_BLOCK_DECL_UNUSED \
-    -erroff=E_CASE_FALLTHRU \
-    -erroff=E_CONST_EXPR \
-    -erroff=E_CONSTANT_CONDITION \
-    -erroff=E_END_OF_LOOP_CODE_NOT_REACHED \
-    -erroff=E_EQUALITY_NOT_ASSIGNMENT \
-    -erroff=E_EXPR_NULL_EFFECT \
-    -erroff=E_FALSE_LOGICAL_EXPR \
-    -erroff=E_INCL_NUSD \
-    -erroff=E_LOOP_EMPTY \
-    -erroff=E_MAIN_PARAM \
-    -erroff=E_POINTER_TO_OBJECT \
-    -erroff=E_PTRDIFF_OVERFLOW \
-    -erroff=E_SHIFT_CNT_NEG_TOO_BIG_L \
-    -erroff=E_STATIC_UNUSED \
-    -erroff=E_TRUE_LOGICAL_EXPR
-
-splintflags = \
-    -I/usr/lib/gcc/i486-linux-gnu/4.0.2/include/ \
-    -D__builtin_va_list=va_list \
-    -Dsigjmp_buf=jmp_buf \
-    -warnposix \
-    \
-    +boolint \
-    +charintliteral \
-    -fixedformalarray \
-    -mustfreefresh \
-    -nestedextern \
-    -predboolint \
-    -predboolothers \
-    -preproc \
-    -boolops \
-    -shadow \
-    -nullstate \
-    +longintegral \
-    +matchanyintegral \
-    -type \
-    \
-    +line-len 999 \
-    +weak
-
-splintfiles = $(c1)
-
-.c$(OBJ_EXT):
-	$(CCCMD) -I$(CROSS_LIB) $(PLDLFLAGS) $*.c
-
-.c.i:
-	$(CCCMDSRC) -E $*.c > $*.i
-
-.c.s:
-	$(CCCMDSRC) -S $*.c
-
-all: $(FIRSTMAKEFILE) miniperl$(EXE_EXT) extra.pods $(private) $(unidatafiles) $(public) $(dynamic_ext) $(nonxs_ext) extras.make
-	@echo " ";
-	@echo "	Everything is up to date. Type '$(MAKE) test' to run test suite."
-
-.PHONY: all
-
-
-# This is now done by installman only if you actually want the man pages.
-#	@echo " "; echo "	Making docs"; cd pod; $(MAKE) all;
-
-# Phony target to force checking subdirectories.
-# Apparently some makes require an action for the FORCE target.
-.PHONY: FORCE
-FORCE:
-	@sh -c true
-!NO!SUBS!
-$spitshell >>$Makefile <<!GROK!THIS!
-
-# We do a copy of the op.c instead of a symlink because gcc gets huffy
-# if we have a symlink forest to another disk (it complains about too many
-# levels of symbolic links, even if we have only two)
-
-opmini.c: op.c
-	\$(RMS) opmini.c
-	\$(CPS) op.c opmini.c
-
-opmini\$(OBJ_EXT): opmini.c
-	\$(CCCMD) \$(PLDLFLAGS) $DPERL_EXTERNAL_GLOB opmini.c
-
-globals\$(OBJ_EXT):
-
-!GROK!THIS!
-$spitshell >>$Makefile <<'!NO!SUBS!'
-miniperlmain$(OBJ_EXT): miniperlmain.c patchlevel.h
-	$(CCCMD) $(PLDLFLAGS) $*.c
-
-perlmain.c: miniperlmain.c config.sh $(FIRSTMAKEFILE)
-	sh writemain $(DYNALOADER) $(static_ext) > perlmain.c
-
-!NO!SUBS!
-case "$osname" in
-cygwin)
-	;; # Let cygwin/Makefile.SHs do its work.
-*)
-	$spitshell >>$Makefile <<'!NO!SUBS!'
-perlmain$(OBJ_EXT): perlmain.c
-	$(CCCMD) $(PLDLFLAGS) $*.c
-
-!NO!SUBS!
-	;;
-esac
-$spitshell >>$Makefile <<'!NO!SUBS!'
-# The file ext.libs is a list of libraries that must be linked in
-# for static extensions, e.g. -lm -lgdbm, etc.  The individual
-# static extension Makefile's add to it.
-ext.libs: $(static_ext)
-	-@test -f ext.libs || touch ext.libs
-
-!NO!SUBS!
-
-# How to build libperl.  This is still rather convoluted.
-# Load up custom Makefile.SH fragment for shared loading and executables:
-case "$osname" in
-*)
-	Makefile_s="$osname/Makefile.SHs"
-	;;
-esac
-
-case "$osname" in
-aix)
-	$spitshell >>$Makefile <<!GROK!THIS!
-LIBS			= $perllibs
-# In AIX we need to change this for building Perl itself from
-# its earlier definition (which is for building external
-# extensions *after* Perl has been built and installed)
-CCDLFLAGS		= `echo $ccdlflags|sed -e 's@-bE:.*/perl\.exp@-bE:perl.exp@'`
-
-!GROK!THIS!
-	case "$useshrplib" in
-	define|true|[yY]*)
-		$spitshell >>$Makefile <<'!NO!SUBS!'
-
-LIBPERL_NONSHR		= libperl_nonshr$(LIB_EXT)
-MINIPERL_NONSHR		= miniperl_nonshr$(EXE_EXT)
-
-$(LIBPERL_NONSHR): $(obj)
-	$(RMS) $(LIBPERL_NONSHR)
-	$(AR) rcu $(LIBPERL_NONSHR) $(obj)
-
-$(MINIPERL_NONSHR): $(LIBPERL_NONSHR) miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT)
-	$(CC) $(LDFLAGS) -o $(MINIPERL_NONSHR) miniperlmain$(OBJ_EXT) \
-	    opmini$(OBJ_EXT) $(LIBPERL_NONSHR) $(LIBS)
-
-MINIPERLEXP		= $(MINIPERL_NONSHR)
-
-LIBPERLEXPORT		= perl.exp
-
-!NO!SUBS!
-		
-		;;
-	*)	
-		$spitshell >>$Makefile <<'!NO!SUBS!'
-MINIPERLEXP		= miniperl$(EXE_EXT)
-
-PERLEXPORT		= perl.exp
-
-!NO!SUBS!
-	;;
-	esac
-	$spitshell >>$Makefile <<'!NO!SUBS!'
-perl.exp: $(MINIPERLEXP) makedef.pl config.sh $(SYM) $(SYMH)
-	./$(MINIPERLEXP) makedef.pl PLATFORM=aix CC_FLAGS="$(OPTIMIZE)" | sort -u | sort -f > perl.exp
-
-!NO!SUBS!
-	;;
-os2)
-	$spitshell >>$Makefile <<'!NO!SUBS!'
-MINIPERLEXP		= miniperl
-
-perl5.def: $(MINIPERLEXP) makedef.pl config.sh $(SYM) $(SYMH) miniperl.map
-	./$(MINIPERLEXP) makedef.pl PLATFORM=os2 -DPERL_DLL=$(PERL_DLL) CC_FLAGS="$(OPTIMIZE)" > perl5.def
-
-!NO!SUBS!
-	;;
-esac
-
-if test -r $Makefile_s ; then
-	. $Makefile_s
-	$spitshell >>$Makefile <<!GROK!THIS!
-
-$Makefile: $Makefile_s
-!GROK!THIS!
-else
-	$spitshell >>$Makefile <<'!NO!SUBS!'
-$(LIBPERL): $& $(obj) $(DYNALOADER) $(LIBPERLEXPORT)
-!NO!SUBS!
-	case "$useshrplib" in
-	true)
-		$spitshell >>$Makefile <<'!NO!SUBS!'
-	rm -f $@
-	$(LD) -o $@ $(SHRPLDFLAGS) $(obj) $(DYNALOADER) $(libs)
-!NO!SUBS!
-		case "$osname" in
-		aix)
-			$spitshell >>$Makefile <<'!NO!SUBS!'
-	rm -f libperl$(OBJ_EXT)
-	mv $@ libperl$(OBJ_EXT)
-	$(AR) qv $(LIBPERL) libperl$(OBJ_EXT)
-!NO!SUBS!
-			;;
-		esac
-		;;
-	*)
-		$spitshell >>$Makefile <<'!NO!SUBS!'
-	rm -f $(LIBPERL)
-	$(AR) rcu $(LIBPERL) $(obj) $(DYNALOADER)
-	@$(ranlib) $(LIBPERL)
-!NO!SUBS!
-		;;
-	esac
-	$spitshell >>$Makefile <<'!NO!SUBS!'
-
-# How to build executables.
-
-# The $& notation tells Sequent machines that it can do a parallel make,
-# and is harmless otherwise.
-# The miniperl -w -MExporter line is a basic cheap test to catch errors
-# before make goes on to run preplibrary and then MakeMaker on extensions.
-# This is very handy because later errors are often caused by miniperl
-# build problems but that's not obvious to the novice.
-# The Module used here must not depend on Config or any extensions.
-
-!NO!SUBS!
-
-
-	$spitshell >>$Makefile <<'!NO!SUBS!'
-
-perl$(EXE_EXT): $& perlmain$(OBJ_EXT) $(LIBPERL) $(static_ext) ext.libs $(PERLEXPORT)
-	-@rm -f miniperl.xok
-	$(SHRPENV) $(LDLIBPTH) $(CC) -o perl$(PERL_SUFFIX)dyn$(EXE_EXT) $(PERL_PROFILE_LDFLAGS) $(CLDFLAGS) $(CCDLFLAGS) perlmain$(OBJ_EXT) $(static_ext) $(LLIBPERL) `cat ext.libs` $(libs)
-	$(SHRPENV) $(LDLIBPTH) $(CC) -o perl$(PERL_SUFFIX)$(EXE_EXT) $(PERL_PROFILE_LDFLAGS) $(CLDFLAGS) perlmain$(OBJ_EXT) $(static_ext) $(LLIBPERL) `cat ext.libs` $(libs)
-
-# Purify/Quantify Perls.
-
-pureperl$(EXE_EXT): $& perlmain$(OBJ_EXT) $(LIBPERL) $(static_ext) ext.libs $(PERLEXPORT)
-	$(SHRPENV) $(LDLIBPTH) purify $(CC) -o pureperl $(CLDFLAGS) $(CCDLFLAGS) perlmain$(OBJ_EXT) $(static_ext) $(LLIBPERL) `cat ext.libs` $(libs)
-
-purecovperl$(EXE_EXT): $& perlmain$(OBJ_EXT) $(LIBPERL) $(static_ext) ext.libs $(PERLEXPORT)
-	$(SHRPENV) $(LDLIBPTH) purecov $(CC) -o purecovperl $(CLDFLAGS) $(CCDLFLAGS) perlmain$(OBJ_EXT) $(static_ext) $(LLIBPERL) `cat ext.libs` $(libs)
-
-quantperl$(EXE_EXT): $& perlmain$(OBJ_EXT) $(LIBPERL) $(static_ext) ext.libs $(PERLEXPORT)
-	$(SHRPENV) $(LDLIBPTH) quantify $(CC) -o quantperl $(CLDFLAGS) $(CCDLFLAGS) perlmain$(OBJ_EXT) $(static_ext) $(LLIBPERL) `cat ext.libs` $(libs)
-
-# Valgrind perl (currently Linux only)
-
-perl.valgrind.config: config.sh
-	@echo "To build perl.valgrind you must Configure -Doptimize=-g -Uusemymalloc, checking..."
-	@$(MAKE) perl.config.dashg
-	@echo "Checking usemymalloc='n' in config.sh..."
-	@grep "^usemymalloc="    config.sh
-	@grep "^usemymalloc='n'" config.sh >/dev/null || exit 1
-	@echo "And of course you have to have valgrind..."
-	$(VALGRIND) ./perl -e 1 2>/dev/null || exit 1
-
-# Third Degree Perl (Tru64 only)
-
-perl.config.dashg:
-	@echo "Checking optimize='-g' in config.sh..."
-	@grep "^optimize=" config.sh
-	@egrep "^optimize='(.*-g.*)'" config.sh >/dev/null || exit 1
-
-perl.third.config: config.sh
-	@echo "To build perl.third you must Configure -Doptimize=-g -Uusemymalloc, checking..."
-	@$(MAKE) perl.config.dashg
-	@echo "Checking usemymalloc='n' in config.sh..."
-	@grep "^usemymalloc="    config.sh
-	@grep "^usemymalloc='n'" config.sh >/dev/null || exit 1
-
-perl.third: /usr/bin/atom perl.third.config perl
-	atom -tool third -L. -all -gp -toolargs="-invalid -uninit heap+stack+copy -min 0" perl
-	@echo "Now you may run perl.third and then study perl.3log."
-
-# Pixie Perls (Tru64 and IRIX only)
-
-perl.pixie.config: config.sh
-	@echo "To build perl.pixie you must Configure -Doptimize=-g, checking..."
-	@$(MAKE) perl.config.dashg
-
-perl.pixie.atom: /usr/bin/atom perl
-	atom -tool pixie -L. -all -toolargs="-quiet" perl
-
-perl.pixie.irix: perl
-	pixie perl
-
-perl.pixie: /usr/bin/pixie perl.pixie.config perl
-	if test -x /usr/bin/atom; then \
-	  $(MAKE) perl.pixie.atom; \
-	else \
-	  $(MAKE) perl.pixie.irix; \
-	fi
-	@echo "Now you may run perl.pixie and then run pixie."
-
-# Gprof Perl
-
-perl.config.dashpg:
-	@echo "Checking optimize='-pg' in config.sh..."
-	@grep "^optimize="      config.sh
-	@grep "^optimize='.*-pg.*'" config.sh >/dev/null || exit 1
-
-perl.gprof.config: config.sh
-	@echo "To build perl.gprof you must Configure -Doptimize=-pg, checking..."
-	@$(MAKE) perl.config.dashpg
-
-perl.gprof: /usr/bin/gprof perl.gprof.config
-	@-rm -f perl
-	$(MAKE) PERL_SUFFIX=.gprof PERL_PROFILE_LDFLAGS=-pg perl
-	@echo "Now you may run perl.gprof and then run gprof perl.gprof."
-
-# Gcov Perl
-
-perl.config.gcov:
-	@echo "To build perl.gcov you must use gcc 3.0 or newer, checking..."
-	@echo "Checking gccversion in config.sh..."
-	@grep "^gccversion="      config.sh
-	@grep "^gccversion='[3-9]\." config.sh >/dev/null || exit 1
-	@echo "To build perl.gcov you must Configure -Dccflags=-fprofile-arcs -ftest-coverage, checking..."
-	@echo "Checking ccflags='-fprofile-arcs -ftest-coverage' in config.sh..."
-	@grep "^ccflags="      config.sh
-	@grep "^ccflags='.*-fprofile-arcs -ftest-coverage.*'" config.sh >/dev/null || exit 1
-
-perl.gcov: perl.config.gcov
-	@-rm -f perl
-	$(MAKE) PERL_SUFFIX=.gcov PERL_PROFILE_LDFLAGS='' perl
-	@echo "Now you may run perl.gcov and then run gcov some.c."
-
-# Microperl.  This is just a convenience thing if one happens to
-# build also the full Perl and therefore the real big Makefile:
-# usually one should manually explicitly issue the below command.
-
-.PHONY: microperl
-microperl:
-	$(MAKE) -f Makefile.micro
-
-# This version, if specified in Configure, does ONLY those scripts which need
-# set-id emulation.  Suidperl must be setuid root.  It contains the "taint"
-# checks as well as the special code to validate that the script in question
-# has been invoked correctly.
-
-suidperl$(EXE_EXT): $& sperl$(OBJ_EXT) perlmain$(OBJ_EXT) $(LIBPERL) $(static_ext) ext.libs $(PERLEXPORT)
-	$(SHRPENV) $(LDLIBPTH) $(CC) -o suidperl $(CLDFLAGS) $(CCDLFLAGS) perlmain$(OBJ_EXT) sperl$(OBJ_EXT) $(static_ext) $(LLIBPERL) `cat ext.libs` $(libs)
-
-!NO!SUBS!
-
-fi
-
-$spitshell >>$Makefile <<'!NO!SUBS!'
-
-sperl$(OBJ_EXT): perl.c $(h)
-	$(RMS) sperl.c
-	$(LNS) perl.c sperl.c
-	$(CCCMD) -DIAMSUID sperl.c
-	$(RMS) sperl.c
-
-# We have to call our ./makedir because Ultrix 4.3 make can't handle the line
-#	test -d lib/auto || mkdir lib/auto
-# We need to autosplit in two steps because VOS can't handle so many args
-#
-.PHONY: preplibrary
-preplibrary: miniperl $(CONFIGPM) lib/lib.pm $(PREPLIBRARY_LIBPERL)
-	@sh ./makedir lib/auto
-	@echo "	AutoSplitting perl library"
-	$(LDLIBPTH) ./miniperl -Ilib -MCross -e 'use AutoSplit; \
-		autosplit_lib_modules(@ARGV)' lib/*.pm
-	$(LDLIBPTH) ./miniperl -Ilib -MCross -e 'use AutoSplit; \
-		autosplit_lib_modules(@ARGV)' lib/*/*.pm
-	$(MAKE) lib/re.pm
-
-.PHONY: makeppport
-makeppport: miniperl$(EXE_EXT) $(CONFIGPM)
-	$(LDLIBPTH) ./miniperl$(EXE_EXT) -Ilib mkppport
-
-$(CROSS_LIB)/Config.pod: config.sh miniperl configpm Porting/Glossary
-	$(LDLIBPTH) ./miniperl -Ilib configpm --cross=$(CROSS_NAME)
-	cp *.h $(CROSS_LIB)/
-	cp ext/re/re.pm $(LIBDIR)/
-
-$(CONFIGPM): $(CROSS_LIB)/Config.pod xconfig.h
-
-lib/re.pm: ext/re/re.pm
-	@-rm -f $@
-	cp ext/re/re.pm lib/re.pm
-
-$(plextract):	miniperl $(CONFIGPM) x2p/s2p
-	@-rm -f $@
-	$(LDLIBPTH) ./miniperl -I`pwd`/lib $@.PL
-
-lib/lib.pm:	miniperl $(CONFIGPM)
-	@-rm -f $@
-	$(LDLIBPTH) ./miniperl -Ilib -MCross lib/lib_pm.PL
-
-unidatafiles $(unidatafiles): uni.data
-
-uni.data: miniperl$(EXE_EXT) $(CONFIGPM) lib/unicore/mktables
-	cd lib/unicore && $(LDLIBPTH) ../../miniperl -I../../lib mktables -w
-	touch uni.data
-
-extra.pods: miniperl
-	-@test ! -f extra.pods || rm -f `cat extra.pods`
-	-@rm -f extra.pods
-	-@for x in `grep -l '^=[a-z]' README.* | grep -v README.vms` ; do \
-	    nx=`echo $$x | sed -e "s/README\.//"`; \
-	    cd pod ; $(LNS) ../$$x "perl"$$nx".pod" ; cd .. ; \
-	    echo "pod/perl"$$nx".pod" >> extra.pods ; \
-	done
-	-@rm -f pod/perlvms.pod
-	-@test -f vms/perlvms.pod && cd pod && $(LNS) ../vms/perlvms.pod perlvms.pod && cd .. && echo "pod/perlvms.pod" >> extra.pods
-	-@rm -f pod/perldelta.pod
-	-@test -f pod/perl5100delta.pod && cd pod && $(LNS) perl5100delta.pod perldelta.pod && cd .. && echo "pod/perldelta.pod" >> extra.pods # See buildtoc
-
-extras.make: perl$(EXE_EXT)
-	-@test ! -s extras.lst || PATH="`pwd`:${PATH}" PERL5LIB="`pwd`/lib" $(LDLIBPTH) ./perl -Ilib -MCPAN -e '@ARGV&&make(@ARGV)' `cat extras.lst`
-
-extras.test: perl$(EXE_EXT)
-	-@test ! -s extras.lst || PATH="`pwd`:${PATH}" PERL5LIB="`pwd`/lib" $(LDLIBPTH) ./perl -Ilib -MCPAN -e '@ARGV&&test(@ARGV)' `cat extras.lst`
-
-extras.install: perl$(EXE_EXT)
-	-@test ! -s extras.lst || PATH="`pwd`:${PATH}" PERL5LIB="`pwd`/lib" $(LDLIBPTH) ./perl -Ilib -MCPAN -e '@ARGV&&install(@ARGV)' `cat extras.lst`
-
-.PHONY: install install-strip install-all install-verbose install-silent \
-	no-install install.perl install.man install.html
-
-META.yml:	Porting/makemeta Porting/Maintainers.pl Porting/Maintainers.pm
-	$(LDLIBPTH) ./miniperl -Ilib Porting/makemeta
-
-install-strip:
-	$(MAKE) STRIPFLAGS=-s install DESTDIR="$(DESTDIR)"
-
-install install-all:
-	$(MAKE) install.perl install.man STRIPFLAGS=$(STRIPFLAGS) DESTDIR="$(DESTDIR)"
-
-install-verbose:
-	$(MAKE) install.perl install.man STRIPFLAGS=$(STRIPFLAGS) INSTALLFLAGS=-V DESTDIR="$(DESTDIR)"
-
-install-silent:
-	$(MAKE) install.perl install.man STRIPFLAGS=$(STRIPFLAGS) INSTALLFLAGS=-S DESTDIR="$(DESTDIR)"
-
-no-install:
-	$(MAKE) install.perl install.man STRIPFLAGS=$(STRIPFLAGS) INSTALLFLAGS=-n DESTDIR="$(DESTDIR)"
-
-# Set this to an empty string to avoid an attempt of rebuild before install
-INSTALL_DEPENDENCE = all
-
-install.perl:	$(INSTALL_DEPENDENCE) installperl
-	$(LDLIBPTH) ./perl installperl --destdir=$(DESTDIR) $(INSTALLFLAGS) $(STRIPFLAGS)
-	-@test ! -s extras.lst || $(MAKE) extras.install
-
-install.man:	all installman
-	$(LDLIBPTH) ./perl installman --destdir=$(DESTDIR) $(INSTALLFLAGS)
-
-# XXX Experimental. Hardwired values, but useful for testing.
-# Eventually Configure could ask for some of these values.
-install.html: all installhtml
-	-@test -f README.vms && cd vms && $(LNS) ../README.vms README_vms.pod && cd ..
-	$(LDLIBPTH) ./perl installhtml   \
-      --podroot=. --podpath=. --recurse  \
-      --htmldir=$(privlib)/html   \
-      --htmlroot=$(privlib)/html  \
-      --splithead=pod/perlipc     \
-      --splititem=pod/perlfunc    \
-      --libpods=perlfunc:perlguts:perlvar:perlrun:perlop \
-      --ignore=Porting/Maintainers.pm,Porting/patching.pod,Porting/pumpkin.pod,Porting/repository.pod \
-      --verbose
-
-
-# I now supply perly.c with the kits, so the following section is
-# used only if you force bison to run by saying
-# 	make regen_perly
-# You normally shouldn't remake perly.[ch].
-
-.PHONY: regen_perly
-
-run_byacc:
-	@echo "run_byacc is obsolete; try 'make regen_perly' instead"
-
-# this outputs perly.h, perly.act and perly.tab
-regen_perly:
-	perl regen_perly.pl
-
-# We don't want to regenerate perly.c and perly.h, but they might
-# appear out-of-date after a patch is applied or a new distribution is
-# made.
-perly.c: perly.y
-	-@sh -c true
-
-perly.h: perly.y
-	-@sh -c true
-
-# No compat3.sym here since and including the 5.004_50.
-# No interp.sym since 5.005_03.
-SYM  = global.sym globvar.sym perlio.sym pp.sym
-
-SYMH = perlvars.h intrpvar.h
-
-CHMOD_W = chmod +w
-
-# The following files are generated automatically
-#	autodoc.pl:	pod/perlapi.pod pod/perlintern.pod
-#	embed.pl:	proto.h embed.h embedvar.h global.sym
-#			perlapi.h perlapi.c 
-# [* embed.pl needs pp.sym generated by opcode.pl! *]
-#	keywords.pl:	keywords.h
-#	opcode.pl:	opcode.h opnames.h pp_proto.h pp.sym
-#	regcomp.pl:	regnodes.h
-#	warnings.pl:	warnings.h lib/warnings.pm
-# The correct versions should be already supplied with the perl kit,
-# in case you don't have perl available.
-# To force them to be regenerated, run
-#       perl regen.pl
-# with your existing copy of perl
-# (make regen_headers is kept for backwards compatibility)
-
-AUTOGEN_FILES = keywords.h opcode.h opnames.h pp_proto.h pp.sym proto.h \
-		embed.h embedvar.h global.sym \
-		pod/perlintern.pod pod/perlapi.pod \
-		perlapi.h perlapi.c regnodes.h \
-		warnings.h lib/warnings.pm
-
-.PHONY: regen_headers regen_pods regen_all
-
-regen regen_headers:	FORCE
-	-perl regen.pl
-
-regen_pods:	FORCE
-	-cd pod; $(LDLIBPTH) $(MAKE) regen_pods
-
-regen_all: regen regen_pods
-
-.PHONY:	manisort manicheck
-
-manisort:	FORCE
-	LC_ALL=C sort -fdc MANIFEST || (echo "WARNING: re-sorting MANIFEST"; \
-		LC_ALL=C sort -fdo MANIFEST MANIFEST)
-
-manicheck:	FORCE
-	perl Porting/manicheck
-
-# Extensions:
-# Names added to $(dynamic_ext) or $(static_ext) or $(nonxs_ext) will
-# automatically get built.  There should ordinarily be no need to change
-# any of this part of makefile.
-#
-# The dummy dependency is a place holder in case $(dynamic_ext) or
-# $(static_ext) is empty.
-#
-# DynaLoader may be needed for extensions that use Makefile.PL.
-
-###$(DYNALOADER).c: $(EXTDIR)/DynaLoader/dl_dld.xs $(CONFIGPM)
-###	if not exist $(AUTODIR) mkdir $(AUTODIR)
-###	cd $(EXTDIR)\$(*B)
-###	$(HPERL) -I..\..\lib -MCross=$(CROSS_NAME) $(*B)_pm.PL
-###	$(HPERL) -I..\..\lib -MCross=$(CROSS_NAME) XSLoader_pm.PL
-###	cd ..\..\win32
-###	$(XCOPY) $(EXTDIR)\$(*B)\$(*B).pm $(LIBDIR)\$(NULL)
-###	$(XCOPY) $(EXTDIR)\$(*B)\XSLoader.pm $(LIBDIR)\$(NULL)
-###	cd $(EXTDIR)\$(*B)
-###	$(XSUBPP) dl_win32.xs > $(*B).c
-###	cd ..\..\win32
-###
-###$(EXTDIR)\DynaLoader\dl_win32.xs: dl_win32.xs
-###	$(COPY) dl_win32.xs $(EXTDIR)\DynaLoader\dl_win32.xs
-
-
-
-$(DYNALOADER):	preplibrary FORCE
-	@$(LDLIBPTH) sh ext/util/make_ext_cross $(STATIC) $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL)
-
-d_dummy $(dynamic_ext):	miniperl$(EXE_EXT) preplibrary makeppport $(DYNALOADER) FORCE
-	@$(LDLIBPTH) sh ext/util/make_ext_cross dynamic $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL)
-
-s_dummy $(static_ext):	miniperl$(EXE_EXT) preplibrary makeppport $(DYNALOADER) FORCE
-	@$(LDLIBPTH) sh ext/util/make_ext_cross $(STATIC) $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL)
-
-n_dummy $(nonxs_ext):	miniperl$(EXE_EXT) preplibrary $(DYNALOADER) FORCE
-	@$(LDLIBPTH) sh ext/util/make_ext_cross nonxs $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL)
-!NO!SUBS!
-
-$spitshell >>$Makefile <<EOF
-$extra_dep
-EOF
-
-$spitshell >>$Makefile <<'!NO!SUBS!'
-
-.PHONY: printconfig
-printconfig:
-	@eval `$(LDLIBPTH) ./perl -Ilib -V:$(CONFIGVAR)`; echo $$$(CONFIGVAR)
-
-.PHONY: clean _tidy _mopup _cleaner1 _cleaner2 \
-	realclean _realcleaner clobber _clobber \
-	distclean veryclean _verycleaner \
-	cleanup_unpacked_files unpack_files
-
-clean:		cleanup_unpacked_files _tidy _mopup 
-
-realclean:	cleanup_unpacked_files _realcleaner _mopup
-	@echo "Note that '$(MAKE) realclean' does not delete config.sh or Policy.sh"
-
-_clobber:
-	-@rm -f Cross/run-* Cross/to-* Cross/from-*
-	rm -f config.sh cppstdin Policy.sh extras.lst
-
-clobber:	cleanup_unpacked_files _realcleaner _mopup _clobber
-
-distclean:	clobber
-
-# Like distclean but also removes emacs backups and *.orig.
-veryclean:	_verycleaner _mopup _clobber
-	-@rm -f Obsolete Wanted
-
-# Do not 'make _mopup' directly.
-_mopup:
-	rm -f *$(OBJ_EXT) *$(LIB_EXT) all perlmain.c opmini.c uudmap.h generate_uudmap$(EXE_EXT)
-	-rmdir .depending
-	-@test -f extra.pods && rm -f `cat extra.pods`
-	-@test -f vms/README_vms.pod && rm -f vms/README_vms.pod
-	-rm -f perl.exp ext.libs extra.pods uni.data opmini.o
-	-rm -f perl.export perl.dll perl.libexp perl.map perl.def
-	-rm -f perl.loadmap miniperl.loadmap perl.prelmap miniperl.prelmap
-	-rm -f perl.third lib*.so.perl.third perl.3log t/perl.third t/perl.3log
-	-rm -f perl.pixie lib*.so.perl.pixie lib*.so.Addrs
-	-rm -f perl.Addrs perl.Counts t/perl.Addrs t/perl.Counts *perl.xok
-	-rm -f cygwin.c libperl*.def libperl*.dll cygperl*.dll *.exe.stackdump
-	-rm -f perl$(EXE_EXT) suidperl$(EXE_EXT) miniperl$(EXE_EXT) $(LIBPERL) libperl.* microperl
-	-rm -f opcode.h-old opnames.h-old pp.sym-old pp_proto.h-old
-	-rm -f config.over
-
-# Do not 'make _tidy' directly.
-_tidy:
-	-cd pod; $(LDLIBPTH) $(MAKE) clean
-	-cd utils; $(LDLIBPTH) $(MAKE) clean
-	-cd x2p; $(LDLIBPTH) $(MAKE) clean
-	-@for x in $(DYNALOADER) $(dynamic_ext) $(static_ext) $(nonxs_ext) ; do \
-	$(LDLIBPTH) sh ext/util/make_ext clean $$x MAKE=$(MAKE) ; \
-	done
-
-_cleaner1:
-	-cd os2; rm -f Makefile
-	-cd pod; $(LDLIBPTH) $(MAKE) $(CLEAN)
-	-cd utils; $(LDLIBPTH) $(MAKE) $(CLEAN)
-	-cd x2p; $(LDLIBPTH) $(MAKE) $(CLEAN)
-	-@for x in $(DYNALOADER) $(dynamic_ext) $(static_ext) $(nonxs_ext) ; do \
-	$(LDLIBPTH) sh ext/util/make_ext $(CLEAN) $$x MAKE=$(MAKE) ; \
-	done
-	-@test ! -f ./miniperl$(EXE_EXT) || $(LDLIBPTH) ./miniperl$(EXE_EXT) -Ilib mkppport --clean
-
-# Some systems do not support "?", so keep these files separate.
-_cleaner2:
-	-rm -f core.*perl.*.? t/core.perl.*.? .?*.c
-	rm -f core *perl.core t/core t/*perl.core core.* t/core.*
-	rm -f t/misctmp* t/forktmp* t/tmp* t/c t/perl$(EXE_EXT) t/rantests
-	rm -f so_locations $(LIBPERL_NONSHR) $(MINIPERL_NONSHR)
-	rm -rf $(addedbyconf)
-	rm -f $(FIRSTMAKEFILE) $(FIRSTMAKEFILE).old makefile.old
-	rm -f $(private)
-	rm -rf $(unidatafiles) $(unidatadirs)
-	rm -rf lib/auto
-	rm -f lib/.exists lib/*/.exists lib/*/*/.exists
-	rm -f h2ph.man pstruct
-	rm -rf .config
-	rm -f preload
-	rm -rf lib/Encode lib/Compress lib/Hash lib/re
-	rm -rf lib/IO/Compress lib/IO/Uncompress
-	rm -f lib/ExtUtils/ParseXS/t/XSTest.c
-	rm -f lib/ExtUtils/ParseXS/t/XSTest$(OBJ_EXT)
-	rm -f lib/ExtUtils/ParseXS/t/XSTest$(DLSUFFIX)
-	-rmdir lib/B lib/Data
-	-rmdir lib/Filter/Util lib/IO/Socket
-	-rmdir lib/List lib/MIME lib/Scalar lib/Sys
-	-rmdir lib/threads lib/XS
-
-_realcleaner:
-	@$(LDLIBPTH) $(MAKE) _cleaner1 CLEAN=realclean
-	@$(LDLIBPTH) $(MAKE) _cleaner2
-
-_verycleaner:
-	@$(LDLIBPTH) $(MAKE) _cleaner1 CLEAN=veryclean
-	@$(LDLIBPTH) $(MAKE) _cleaner2
-	-rm -f *~ *.orig */*~ */*.orig */*/*~ */*/*.orig
-
-.PHONY: lint
-lint: $(c)
-	rm -f *.ln
-	lint $(lintflags) -DPERL_CORE -D_REENTRANT -DDEBUGGING -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $(c)
-
-.PHONY: splint
-splint: $(c)
-	splint $(splintflags) -DPERL_CORE -D_REENTRANT -DDEBUGGING -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $(splintfiles)
-
-# Need to unset during recursion to go out of loop.
-# The README below ensures that the dependency list is never empty and
-# that when MAKEDEPEND is empty $(FIRSTMAKEFILE) doesn't need rebuilding.
-
-MAKEDEPEND = Makefile makedepend
-
-$(FIRSTMAKEFILE):	README $(MAKEDEPEND)
-	$(MAKE) depend MAKEDEPEND=
-
-config.h: config_h.SH config.sh
-	$(SHELL) config_h.SH
-	# TODO - improve following line
-	cp config.h $(CROSS_LIB)/
-
-xconfig.h: config_h.SH Cross/config-$(CROSS_NAME).sh
-	CONFIG_SH=Cross/config-$(CROSS_NAME).sh CONFIG_H=xconfig.h $(SHELL) config_h.SH
-	#TODO $(LDLIBPTH) ./miniperl -Ilib -MCross=$(CROSS_NAME) config_h.PL "INST_VER=$(INST_VER)" "CORE_DIR=$(CROSS_LIB)" "CONFIG_H=xconfig.h"
-	cp xconfig.h $(CROSS_LIB)/
-	cp xconfig.h $(CROSS_LIB)/config.h
-
-# When done, touch perlmain.c so that it doesn't get remade each time.
-.PHONY: depend
-depend: makedepend
-	sh ./makedepend MAKE=$(MAKE)
-	- test -s perlmain.c && touch perlmain.c
-	cd x2p; $(MAKE) depend
-
-# Cannot postpone this until $firstmakefile is ready ;-)
-makedepend: makedepend.SH config.sh
-	sh ./makedepend.SH
-
-.PHONY: test check test_prep test_prep_nodll test_prep_pre _test_prep \
-	test_tty test-tty _test_tty test_notty test-notty _test_notty \
-	utest ucheck test.utf8 check.utf8 test.torture torturetest \
-	test.utf16 check.utf16 utest.utf16 ucheck.utf16 \
-	test.third check.third utest.third ucheck.third test_notty.third \
-	test.deparse test_notty.deparse test_harness test_harness_notty \
-	minitest coretest test.taintwarn
-
-# Cannot delegate rebuilding of t/perl to make
-# to allow interlaced test and minitest
-
-TESTFILE=TEST
-
-_test_prep: unpack_files
-	cd t && (rm -f $(PERL)$(EXE_EXT); $(LNS) ../$(PERL)$(EXE_EXT) $(PERL)$(EXE_EXT))
-
-# Architecture-neutral stuff:
-
-test_prep_pre: preplibrary utilities $(nonxs_ext)
-
-test_prep: test_prep_pre miniperl$(EXE_EXT) $(unidatafiles) perl$(EXE_EXT) $(dynamic_ext) $(TEST_PERL_DLL)
-	PERL=./perl $(MAKE) _test_prep
-
-_test_tty:
-	cd t && $(PERL_DEBUG) $(LDLIBPTH) $(PERL) $(TESTFILE) $(TEST_ARGS) </dev/tty
-
-_test_notty:
-	cd t && $(PERL_DEBUG) PERL_SKIP_TTY_TEST=1 $(LDLIBPTH) $(PERL) $(TESTFILE) $(TEST_ARGS)
-
-unpack_files:
-	$(LDLIBPTH) ./miniperl$(EXE_EXT) -Ilib uupacktool.pl -u -m
-
-cleanup_unpacked_files:
-	-@test ! -f ./miniperl$(EXE_EXT) || $(LDLIBPTH) ./miniperl$(EXE_EXT) -Ilib uupacktool.pl -c
-
-# The second branch is for testing without a tty or controlling terminal,
-# see t/op/stat.t
-_test:
-	if (true </dev/tty) >/dev/null 2>&1; then \
-	  $(MAKE) TEST_ARGS=$(TEST_ARGS) TESTFILE=$(TESTFILE) _test_tty   ; \
-	else \
-	  $(MAKE) TEST_ARGS=$(TEST_ARGS) TESTFILE=$(TESTFILE) _test_notty ; \
-	fi
-	@echo "Ran tests" > t/rantests
-
-test check: test_prep
-	PERL=./perl $(MAKE) _test
-
-test_tty: test_prep
-	PERL=./perl $(MAKE) _test_tty
-
-test_notty: test_prep
-	PERL=./perl $(MAKE) _test_notty
-
-utest ucheck test.utf8 check.utf8: test_prep
-	PERL=./perl TEST_ARGS=-utf8 $(MAKE) _test
-
-coretest: test_prep
-	PERL=./perl TEST_ARGS=-core $(MAKE) _test
-
-test-prep:	test_prep
-
-test-tty:	test_tty
-
-test-notty:	test_notty
-
-# Torture testing
-
-test.torture torturetest:	test_prep
-	PERL=./perl TEST_ARGS=-torture $(MAKE) _test
-
-# Targets for UTF16 testing:
-
-minitest.utf16: minitest.prep
-	- cd t && (rm -f perl$(EXE_EXT); $(LNS) ../miniperl$(EXE_EXT) perl$(EXE_EXT)) \
-		&& $(LDLIBPTH) ./perl TEST -minitest -utf16 base/*.t comp/*.t cmd/*.t run/*.t io/*.t op/*.t uni/*.t </dev/tty
-
-test.utf16 check.utf16: test_prep
-	PERL=./perl $(MAKE) TEST_ARGS=-utf16 _test
-
-utest.utf16 ucheck.utf16: test_prep
-	PERL=./perl $(MAKE) TEST_ARGS="-utf8 -utf16" _test
-
-# Targets for valgrind testing:
-
-test_prep.valgrind: test_prep perl.valgrind
-	PERL=./perl $(MAKE) _test_prep
-
-test.valgrind check.valgrind:	test_prep perl.valgrind.config
-	PERL=./perl PERL_DEBUG=PERL_VALGRIND=1 VALGRIND='$(VALGRIND)' $(MAKE) _test
-
-utest.valgrind ucheck.valgrind: test_prep.valgrind perl.valgrind.config
-	PERL=./perl PERL_DEBUG=PERL_VALGRIND=1 TEST_ARGS=-utf8 $(MAKE) _test
-
-test_notty.valgrind: test_prep.valgrind perl.valgrind.config
-	PERL=./perl $(MAKE) PERL_DEBUG=PERL_VALGRIND=1 _test_notty
-
-# Targets for Third Degree testing.
-
-test_prep.third: test_prep perl.third
-	PERL=./perl.third $(MAKE) _test_prep
-
-test.third check.third:	test_prep.third perl.third
-	PERL=./perl.third PERL_DEBUG=PERL_3LOG=1 $(MAKE) _test
-
-utest.third ucheck.third: test_prep.third perl.third
-	PERL=./perl.third PERL_DEBUG=PERL_3LOG=1 TEST_ARGS=-utf8 $(MAKE) _test
-
-test_notty.third: test_prep.third perl.third
-	PERL=./perl.third $(MAKE) PERL_DEBUG=PERL_3LOG=1 _test_notty
-
-# Targets for Deparse testing.
-
-test.deparse:	test_prep
-	PERL=./perl TEST_ARGS=-deparse $(MAKE) _test
-
-test_notty.deparse:	test_prep
-	PERL=./perl TEST_ARGS=-deparse $(MAKE) _test_notty
-
-# Targets to run the test suite with -t
-
-test.taintwarn:	test_prep
-	PERL=./perl TEST_ARGS=-taintwarn $(MAKE) _test
-
-minitest.prep:
-	-@test -f lib/lib.pm && test -f lib/Config.pm || \
-	  $(MAKE) lib/Config.pm lib/lib.pm $(unidatafiles)
-	@echo " "
-	@echo "You may see some irrelevant test failures if you have been unable"
-	@echo "to build lib/Config.pm, lib/lib.pm or the Unicode data files."
-	@echo " "
-
-# Can't depend on lib/Config.pm because that might be where miniperl
-# is crashing.
-minitest: miniperl$(EXE_EXT) lib/re.pm minitest.prep
-	- cd t && (rm -f perl$(EXE_EXT); $(LNS) ../miniperl$(EXE_EXT) perl$(EXE_EXT)) \
-		&& $(LDLIBPTH) ./perl TEST -minitest base/*.t comp/*.t cmd/*.t run/*.t io/*.t op/*.t uni/*.t </dev/tty
-
-# Test via harness
-
-test_harness: test_prep
-	PERL=./perl $(MAKE) TESTFILE=harness _test
-
-test_harness_notty: test_prep
-	PERL=./perl HARNESS_NOTTY=1 $(MAKE) TESTFILE=harness _test
-
-# Handy way to run perlbug -ok without having to install and run the
-# installed perlbug. We don't re-run the tests here - we trust the user.
-# Please *don't* use this unless all tests pass.
-# If you want to report test failures, use "make nok" instead.
-
-.PHONY: ok okfile oknack okfilenack nok nokfile noknack nokfilenack
-
-ok:	utilities
-	$(LDLIBPTH) ./perl -Ilib utils/perlbug -ok -s '(UNINSTALLED)'
-
-okfile:	utilities
-	$(LDLIBPTH) ./perl -Ilib utils/perlbug -ok -s '(UNINSTALLED)' -F perl.ok
-
-oknack:	utilities
-	$(LDLIBPTH) ./perl -Ilib utils/perlbug -ok -s '(UNINSTALLED)' -A
-
-okfilenack:	utilities
-	$(LDLIBPTH) ./perl -Ilib utils/perlbug -ok -s '(UNINSTALLED)' -F perl.ok -A
-
-nok:	utilities
-	$(LDLIBPTH) ./perl -Ilib utils/perlbug -nok -s '(UNINSTALLED)'
-
-nokfile:	utilities
-	$(LDLIBPTH) ./perl -Ilib utils/perlbug -nok -s '(UNINSTALLED)' -F perl.nok
-
-noknack:	utilities
-	$(LDLIBPTH) ./perl -Ilib utils/perlbug -nok -s '(UNINSTALLED)' -A
-
-nokfilenack:	utilities
-	$(LDLIBPTH) ./perl -Ilib utils/perlbug -nok -s '(UNINSTALLED)' -F perl.nok -A
-
-.PHONY: clist hlist shlist pllist
-
-clist:	$(c)
-	echo $(c) | tr ' ' $(TRNL) >.clist
-
-hlist:  $(h)
-	echo $(h) | tr ' ' $(TRNL) >.hlist
-
-shlist: $(sh)
-	echo $(sh) | tr ' ' $(TRNL) >.shlist
-
-pllist: $(pl)
-	echo $(pl) | tr ' ' $(TRNL) >.pllist
-
-Makefile: Makefile.SH ./config.sh
-	$(SHELL) Makefile.SH
-
-.PHONY: distcheck
-distcheck: FORCE
-	perl '-MExtUtils::Manifest=&fullcheck' -e 'fullcheck()'
-
-.PHONY: elc
-elc:	emacs/cperl-mode.elc
-
-emacs/cperl-mode.elc: emacs/cperl-mode.el
-	-cd emacs; emacs -batch -q -no-site-file -f batch-byte-compile cperl-mode.el
-
-.PHONY: etags ctags tags
-
-etags:	TAGS
-
-TAGS: emacs/cperl-mode.elc
-	sh emacs/ptags
-
-# Let's hope make will not go into an infinite loop on case-unsensitive systems
-# This may also fail if . is in the head of the path, since perl will
-# require -Ilib
-tags:	TAGS
-	perl emacs/e2ctags.pl TAGS > tags
-
-ctags:
-	ctags -f Tags -N --totals --languages=c --langmap=c:+.h --exclude=opmini.c *.c *.h
-
-# AUTOMATICALLY GENERATED MAKE DEPENDENCIES--PUT NOTHING BELOW THIS LINE
-# If this runs make out of memory, delete /usr/include lines.
-!NO!SUBS!
-
-$eunicefix $Makefile
-case `pwd` in
-*SH)
-    $rm -f ../$Makefile
-    $ln $Makefile ../$Makefile
-    ;;
-esac
-$rm -f $firstmakefile
-
-# Now do any special processing required before building.
-
-case "$ebcdic" in
-define)
-    xxx=''
-    echo "This is an EBCDIC system, checking if any parser files need regenerating." >&2
-case "$osname" in
-os390|posix-bc)
-    if cd x2p
-    then
-        rm -f y.tab.c y.tab.h
-        case "$osname" in
-        posix-bc)
-           # we are using two different yaccs in BS2000 Posix!
-           byacc a2p.y >/dev/null 2>&1
-           ;;
-        *) # e.g. os390
-           yacc  a2p.y >/dev/null 2>&1
-           ;;
-        esac
-        if cmp -s y.tab.c a2p.c
-        then
-            rm -f y.tab.c
-        else
-            echo "a2p.y -> a2p.c" >&2
-            mv -f y.tab.c a2p.c
-            chmod u+w a2p.c
-            sed -e 's/fprintf *( *stderr *,/PerlIO_printf(Perl_debug_log,/g' \
-		-e 's|^static void __YY_YACC_MAIN.*BS2000.*|/*static main deleted*/|' \
-                -e 's/y\.tab/a2p/g' a2p.c >a2p.tmp && mv a2p.tmp a2p.c
-            xxx="$xxx a2p.c"
-        fi
-        # In case somebody yacc -d:ed the a2p.y.
-        if test -f y.tab.h
-        then
-            if cmp -s y.tab.h a2p.h
-            then
-                rm -f y.tab.h
-            else
-                echo "a2p.h -> a2p.h" >&2
-                mv -f y.tab.h a2p.h
-                xxx="$xxx a2p.h"
-            fi
-        fi
-        cd ..
-    fi
-    ;;
-vmesa)
-    # Do nothing in VM/ESA.
-    ;;
-*)
-    echo "'$osname' is an EBCDIC system I don't know that well." >&4
-    ;;
-esac
-    case "$xxx" in
-    '') echo "No parser files were regenerated.  That's okay." >&2 ;;
-    esac
-    ;;
-esac
-
-# ex: set ts=8 sts=4 sw=4 noet:
diff --git a/Cross/README b/Cross/README
index 683ef9381a..64d2dde024 100644
--- a/Cross/README
+++ b/Cross/README
@@ -55,7 +55,9 @@ in this directory:
 
 1)	Copy the Perl source code onto your TARGET machine.
 2)	Execute sh Configure as normal and configure as required,
-	do not "make".
+	do not "make". Note that you should have C compiler on
+	the TARGET, because Configure depends on it (among other
+	essential *nix commands).
 3)	Copy the config.sh file that is generated to your BUILD
 	machine and place it in the Cross directory with the
 	filename config.sh-ARCH-OS.  For example,
diff --git a/Cross/README.new b/Cross/README.new
index bbdeeb4963..7c746462e7 100644
--- a/Cross/README.new
+++ b/Cross/README.new
@@ -8,75 +8,106 @@ README.new - Cross-compilation for linux
 
 =head1 DESCRIPTION
 
-This is second approach to linux cross-compilation, which should allow
-building full perl and entensions for target platform. Cross-compilation
-for linux uses similar approach and shares the same files as
-cross-compilation for WinCE.
+This approach to linux cross-compilation allows building full perl and
+extensions for target platform. Cross-compilation for linux uses similar
+approach as cross-compilation for WinCE, and there are many similarities
+within generated files.
 
-We refer to HOST as the platform where the build is performed, and to
-TARGET as where final executables will run.
+We refer as HOST the platform where the build is performed, and the TARGET
+is where final executables will run.
 
-=head2 Basic ideas
+=head2 How to cross-compile
 
-=head3 common
+Look into the shell script ./Cross/build-arm-n770-sh, modify it and run.
+You should only modify few parameters: path to cross-compiler GCC and may
+be your cross-compilation identifier, which should be named "properly"
+(no minuses in its name, better name it "arm" or "scale" but not "arm-1").
 
-Unlike WinCE, output files from GCC cross-compiler are produced in the same
-directory where C files are. All TARGET binaries have different extensions
-so to distinguish HOST and TARGET binaries. Namely, object files for C<arm>
-cross-compilation will have extension C<.armo>, executable files will have
-C<.arm>.
+All should be smooth and you'll get your binaries for TARGET. Following below
+is the explanation of the build process, which is not even needed if you
+have no errors.
 
-After typical cross-compilation the following files will be built, among
-others:
+=head2 Build process
 
-  sv.c
-  sv.o
-  sv.armo
-  libperl.arma
+During cross-compilation following stages occur:
 
-(this approach may be reconsidered, however.)
+=over 1
 
-=head3 build process
+=item C<miniperl> for HOST by running:
 
-C<miniperl> is built. This executable is intended to run on HOST, and it
-will facilitate the remaining build process; all binaries built after it are
-foreign (TARGET) and should not run locally (HOST).
 
-Unlike HOST build, miniperl will not have C<Config.pm> of HOST within reach;
-it rather will use the C<Config.pm> from the cross-compilation directories.
-In fact, if the build process does have Config.pm within reach, this is only
-an indication of a mistake somewhere in the middle.
+=over 2
 
-  # following command is okay:
-  ./miniperl -Ilib -MCross -MConfig -e 1
-  # following command should cluck, and it is bad if it does not:
-  ./miniperl -Ilib -MConfig -e 1
+=item C<Configure> for HOST
+
+=item generation of C<Makefile>
+
+=item building C<miniperl> using C<Makefile>
+
+=back
+
+=item generation of C<Makefile-cross-XXX>
+
+=item C<Config.pm> for TARGET
+
+=item C<miniperl> for TARGET
+
+=item C<perl> for TARGET
+
+=item extensions for TARGET
+
+=back
+
+=head3 Configure, Makefile
+
+In order to build C<miniperl> for HOST, the usual C<Configure> is run, which
+will generate C<Makefile> by running C<Makefile.SH> - this is no different
+compared to standard building process.
 
-After C<miniperl> is built, C<configpm> is invoked to create an
-appropriate C<Config.pm> in the right place and its corresponding
+=head3 Makefile-cross-XXXX
+
+To create Makefile for cross-compilation the script Makefile.SH is
+executed with variable CROSS_NAME set to the name of cross-compilation.
+
+=head3 miniperl
+
+The C<miniperl> executable is intended to run on HOST, and it
+will facilitate the remaining build process; binaries built after it are
+foreign (TARGET) and should not run locally (HOST).
+
+=head3 Config.pm
+
+After C<miniperl> is built, C<configpm --cross=XXX> is invoked to create an
+appropriate C<Config.pm> for TARGET and its corresponding
 C<Cross.pm>.
 
 File C<Cross.pm> is dead simple: for given cross-architecture places in @INC
 a path where perl modules are, and right C<Config.pm> in that place.
 
-That said, C<miniperl -Ilib -MConfig -we 1> should report an error, because
-it cannot find C<Config.pm>. If it does not give an error, a wrong C<Config.pm>
-is substituted, and resulting binaries will be a mess.
+C<miniperl> will not have workable C<Config.pm> of HOST within reach;
+it rather will use C<Config.pm> for TARGET from the cross-compilation directories.
+In fact, Config.pm for HOST during the cross-compilation does nothing except
+signalling the error.
+
+  # following command is okay:
+  ./miniperl -Ilib -MCross -MConfig -e 1
+  # following command will report an error
+  ./miniperl -Ilib -MConfig -e 1
 
 C<miniperl -MCross -MConfig -we 1> should run okay, and it will provide a
 correct C<Config.pm> for further compilations.
 
 During extensions build phase, the script C<./ext/util/make_ext_cross> is
-invoked.
-
-All invocations of C<Makefile.PL> are provided with C<-MCross> so to enable
+invoked.  It will invoke C<Makefile.PL> with C<-MCross> so to enable
 cross-compilation.
 
-=head2 BUILD
+=head2 Tools & SDK
 
-=head3 Tools & SDK
+To compile, you need native compiler (to build miniperl) and cross-compiler
+to build the entire perl.
 
-To compile, you need the following:
+Look at the sample script C<build-arm-n770-sh> and its comments as an
+example how the cross-compiling environment could be established.
 
 =over 4
 
@@ -84,6 +115,24 @@ To compile, you need the following:
 
 =back
 
+=head1 miscellaneous
+
+Unlike WinCE, output files from GCC cross-compiler are produced in the same
+directory where C files are. All TARGET binaries have different extensions
+so to distinguish HOST and TARGET binaries. Namely, object files for C<arm>
+cross-compilation will have extension C<.armo>, executable files will have
+C<.arm>.
+
+After typical cross-compilation the following files will be built, among
+others:
+
+  sv.c
+  sv.o
+  sv.armo
+  libperl.arma
+
+(this approach may be reconsidered, however.)
+
 =head1 Things to be done
 
 =over 4
diff --git a/Cross/TODO b/Cross/TODO
index 096e4db815..44a06d89b9 100644
--- a/Cross/TODO
+++ b/Cross/TODO
@@ -1 +1,3 @@
-Provide a better sandbox for building additional XS libraries.
+* move logic from ./Cross/build-arm-n770-sh to Makefile
+* construct automatic generation process of configs like ./Cross/config.sh-arm-linux-n770
+* generate object files in './xlib/xxx/' subdir?
diff --git a/Cross/build-arm-n770-sh b/Cross/build-arm-n770-sh
index b3e6a67ca3..bc4dd2e479 100755
--- a/Cross/build-arm-n770-sh
+++ b/Cross/build-arm-n770-sh
@@ -1,13 +1,20 @@
 # this is a build script for ARM-linux cross-compiling.
-# it builds miniperl on HOST and then perl for TARGET
-# this approach is like Perl-CE cross-compiling, and allows
+#
+# Cross-compiling SDK could be downloaded from the URL
+#   http://www.codesourcery.com/gnu_toolchains/arm
+# or alternatively from
+#   http://www.handhelds.org/download/projects/toolchain/
+#
+# SDK also could be downloaded from www.maemo.org, somehow (how - TBD)
+#
+# Cross-compile process similar to Perl-CE cross-compiling, and allows
 # for full TARGET perl (as opposed to renamed miniperl)
-
-# to skip Configure/build for HOST miniperl, pass "noconf" argument to this script
-
+#
 # some trick is different, however - the file extension for objects files
 # are choosen to be .${CROSS_NAME}, .armo in our case
 
+# to skip Configure/build for HOST miniperl, pass "noconf" argument to this script
+
 # note how invoked Makefile.PL for cross-compilation:
 #   miniperl -MCross Makefile.PL
 
@@ -28,7 +35,8 @@ CROSSCC=${CCPREF}gcc
 export CROSSCC
 export CROSS_NAME
 
-cp config.sh-arm-linux-n770 config-${CROSS_NAME}.sh
+# (re-)building this config-xxxx.sh is TBD
+cp config.sh-arm-linux-n770 ../config-${CROSS_NAME}.sh
 
 # following should be done better:
 cd ..
@@ -38,50 +46,43 @@ if [[ "x$1" != xnoconf* ]] ; then
 CROSS_NAME= ./Configure -des -D prefix=./dummy -Dusedevel
 make miniperl
 make uudmap.h
-# fake uudmap, which should be on HOST
-# TODO - all host utilities should be clearly stated and not built for TARGET
-cp generate_uudmap generate_uudmap.${CROSS_NAME}
 fi
 
-#?? cd Cross
-
 # do the rest for TARGET
 $CROSSCC --version
 
-# call make thusly so it will crosscompile...
+# call make this way so it will crosscompile...
 XCOREDIR=xlib/$CROSS_NAME/CORE
-PERL_CONFIG_SH=Cross/config-${CROSS_NAME}.sh
-
-#?? . $PERL_CONFIG_SH 
+PERL_CONFIG_SH=config-${CROSS_NAME}.sh
 
 # make cflags do cross-compile work (now its hackish, will be improved!)
 rm cflags-cross-$CROSS_NAME
 cp Cross/cflags-cross-$CROSS_NAME .
 rm Makefile-cross-$CROSS_NAME
 CROSS_NAME=$CROSS_NAME sh Makefile.SH
-cp Cross/Makefile-cross-$CROSS_NAME .
 
 mkdir xlib
 mkdir xlib/$CROSS_NAME
 mkdir ${XCOREDIR}
 
-#??OBJ_EXT=.${CROSS_NAME}o
-# TODO these -- AR=${CCPREF}ar LD=${CCPREF}ld
 cmd="make -f Makefile-cross-$CROSS_NAME xconfig.h"
 echo "running $cmd"
-$cmd
+$cmd || exit
 
-echo "running $cmd"
-cmd="make -f Makefile-cross-$CROSS_NAME libperl.${CROSS_NAME}a  OBJ_EXT=.${CROSS_NAME}o EXE_EXT=.$CROSS_NAME LIB_EXT=.${CROSS_NAME}a  AR=${CCPREF}ar LD=${CCPREF}ld"
-$cmd
 
-exit
+#cmd="make -f Makefile-cross-$CROSS_NAME DynaLoader.${CROSS_NAME}o  OBJ_EXT=.${CROSS_NAME}o EXE_EXT=.$CROSS_NAME LIB_EXT=.${CROSS_NAME}a  AR=${CCPREF}ar LD=${CCPREF}ld"
+#echo "running $cmd"
+#$cmd || exit
+#
 
-cmd="make -f Makefile-cross-$CROSS_NAME DynaLoader.${CROSS_NAME}o  OBJ_EXT=.${CROSS_NAME}o EXE_EXT=.$CROSS_NAME LIB_EXT=.${CROSS_NAME}a  AR=${CCPREF}ar LD=${CCPREF}ld"
+cmd="make -f Makefile-cross-$CROSS_NAME all"
 echo "running $cmd"
-$cmd
-
-cmd="make -f Makefile-cross-$CROSS_NAME perl.${CROSS_NAME}"
-echo "running $cmd"
-$cmd
-
+$cmd || exit
+
+# extensions not currently built here:
+#  DB_File
+#  GDBM_File
+#  NDBM_File
+#  ODBM_File
+#  SDBM_File
+#
diff --git a/Cross/cflags-cross-arm b/Cross/cflags-cross-arm
index d33b1136de..2c0d21eb97 100755
--- a/Cross/cflags-cross-arm
+++ b/Cross/cflags-cross-arm
@@ -11,15 +11,15 @@ extra=""
 
 case $PERL_CONFIG_SH in
 '')
-	if test -f Cross/config-arm.sh; then TOP=.;
-	elif test -f ../Cross/config-arm.sh; then TOP=..;
-	elif test -f ../../Cross/config-arm.sh; then TOP=../..;
-	elif test -f ../../../Cross/config-arm.sh; then TOP=../../..;
-	elif test -f ../../../../Cross/config-arm.sh; then TOP=../../../..;
+	if test -f ./config-arm.sh; then TOP=.;
+	elif test -f ../config-arm.sh; then TOP=..;
+	elif test -f ../../config-arm.sh; then TOP=../..;
+	elif test -f ../../../config-arm.sh; then TOP=../../..;
+	elif test -f ../../../../config-arm.sh; then TOP=../../../..;
 	else
 		echo "Can't find config-arm.sh."; exit 1
 	fi
-	. $TOP/Cross/config-arm.sh
+	. $TOP/config-arm.sh
 	;;
 esac
 
@@ -152,6 +152,6 @@ fi
     echo "$CROSSCC -c -DUSE_CROSS_COMPILE -DPERL_CORE $ccflags $stdflags $optimize $warn $extra"
     eval "$also "'"$CROSSCC -DUSE_CROSS_COMPILE -DPERL_CORE -c $ccflags $stdflags $optimize $warn $extra"'
 
-    . $TOP/Cross/config-arm.sh
+    . $TOP/config-arm.sh
 
 done
diff --git a/Cross/config.sh-arm-linux-n770 b/Cross/config.sh-arm-linux-n770
index a07fcbbd9a..880fde7c28 100644
--- a/Cross/config.sh-arm-linux-n770
+++ b/Cross/config.sh-arm-linux-n770
@@ -482,6 +482,12 @@ d_tcgetpgrp='define'
 d_tcsetpgrp='define'
 d_telldir='define'
 d_telldirproto='define'
+d_ctime64='undef'
+d_localtime64='undef'
+d_gmtime64='undef'
+d_mktime64='undef'
+d_difftime64='undef'
+d_asctime64='undef'
 d_time='define'
 d_timegm='define'
 d_times='define'
@@ -531,7 +537,7 @@ dlsrc='dl_dlopen.xs'
 doublesize='8'
 drand01='drand48()'
 drand48_r_proto='0'
-dynamic_ext='B ByteLoader Cwd Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Encode Fcntl File/Glob Filter/Util/Call I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Time/HiRes Unicode/Normalize XS/APItest XS/Typemap attrs re threads threads/shared'
+dynamic_ext='B Compress/Raw/Zlib Cwd Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/Glob Filter/Util/Call Hash/Util I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Time/HiRes Time/Piece Unicode/Normalize XS/APItest XS/Typemap attrs re threads threads/shared Hash/Util/FieldHash'
 eagain='EAGAIN'
 ebcdic='undef'
 echo='echo'
@@ -546,7 +552,7 @@ endservent_r_proto='0'
 eunicefix=':'
 exe_ext=''
 expr='expr'
-extensions='B ByteLoader Cwd Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Encode Fcntl File/Glob Filter/Util/Call I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Time/HiRes Unicode/Normalize XS/APItest XS/Typemap attrs re threads threads/shared Errno'
+extensions='B Compress/Raw/Zlib Cwd Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/Glob Filter/Util/Call Hash/Util I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Time/HiRes Time/Piece Unicode/Normalize XS/APItest XS/Typemap attrs re threads threads/shared Hash/Util/FieldHash Compress/Zlib Errno IO_Compress_Base IO_Compress_Zlib Module/Pluggable Test/Harness'
 extras=''
 fflushNULL='define'
 fflushall='undef'
@@ -736,7 +742,7 @@ issymlink='/usr/bin/test -h'
 ivdformat='"ld"'
 ivsize='4'
 ivtype='long'
-known_extensions='B ByteLoader Cwd DB_File Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Encode Fcntl File/Glob Filter/Util/Call GDBM_File I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 NDBM_File ODBM_File Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Time/HiRes Unicode/Normalize XS/APItest XS/Typemap attrs re threads threads/shared'
+known_extensions='B Compress/Raw/Zlib Cwd Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/Glob Filter/Util/Call Hash/Util I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Time/HiRes Time/Piece Unicode/Normalize Win32 Win32API/File Win32CORE XS/APItest XS/Typemap attrs re threads threads/shared Hash/Util/FieldHash'
 ksh=''
 ld='arm-none-linux-gnueabi-gcc'
 lddlflags='-shared -L/usr/local/lib'
@@ -943,7 +949,7 @@ src='.'
 ssizetype='ssize_t'
 startperl='#!/usr/bin/perl'
 startsh='#!/bin/sh'
-static_ext='DynaLoader '
+static_ext=' '
 stdchar='char'
 stdio_base='((fp)->_IO_read_base)'
 stdio_bufsiz='((fp)->_IO_read_end - (fp)->_IO_read_base)'
diff --git a/INSTALL b/INSTALL
index 88525b94e3..273866e52f 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1659,7 +1659,7 @@ the particular platforms:
 
 README.ce
 
-=item Open Zaurus
+=item arm-linux (Open Zaurus, N770, etc)
 
 Cross/README
 
@@ -1688,19 +1688,13 @@ For some cross-compilation environments the Configure option
 C<-Dinstallprefix=...> might be handy, see L<Changing the installation
 directory>.
 
-About the cross-compilation support of Configure: what is known to
-work is running Configure in a cross-compilation environment and
-building the miniperl executable.  What is known not to work is
-building the perl executable because that would require building
-extensions: Dynaloader statically and File::Glob dynamically, for
-extensions one needs MakeMaker and MakeMaker is not yet
-cross-compilation aware, and neither is the main Makefile.
-
-The cross-compilation setup of Configure has successfully been used in
-at least two Linux cross-compilation environments.  The setups were
-both such that the host system was Intel Linux with a gcc built for
-cross-compiling into ARM Linux, and there was a SSH connection to the
-target system.
+About the cross-compilation support of Configure: it supports
+cross-compilation process up to building the miniperl executable.
+You should go this way if your platform is not supported for perl
+cross-compilation (i.e. it is not arm-linux, wince or another platform
+mentioned above).
+
+If this is your case, keep reading this section.
 
 To run Configure in cross-compilation mode the basic switch that
 has to be used is C<-Dusecrosscompile>.
diff --git a/MANIFEST b/MANIFEST
index 955dead3d1..ceef3c602c 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -34,7 +34,6 @@ Cross/config.sh-arm-linux-n770	Cross-compilation
 Cross/generate_config_sh	Cross-compilation
 Cross/installperl.patch		Cross-compilation
 Cross/Makefile		Cross-compilation
-Cross/Makefile-cross-SH	Cross-compilation
 Cross/Makefile.SH.patch	Cross-compilation
 Cross/README		Cross-compilation
 Cross/README.new	Cross-compilation
diff --git a/Makefile.SH b/Makefile.SH
index ff50cfd0d7..7857e09e58 100644
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -13,11 +13,23 @@ esac
 case $CROSS_NAME in
 '')
 	Makefile=Makefile
+	make_ext=make_ext
+	utilities="utilities"
+	translators="translators"
+	MCROSS=""
 	;;
 *)
 	# if cross-compilation, the Makefile named accordingly
 	Makefile=Makefile-cross-$CROSS_NAME
-	. Cross/config-${CROSS_NAME}.sh
+	make_ext=make_ext_cross
+
+	# MCROSS is either empty or -MCross so proper TARGET machine config.pm
+	# will be activated
+	MCROSS="-MCross"
+	# cross-compiling of utilities (in utils), translators (in x2p) not yet here
+	utilities=""
+	translators=""
+	. config-${CROSS_NAME}.sh
 	;;
 esac
 
@@ -289,6 +301,7 @@ RUN = $run
 # These variables may need to be manually set for non-Unix systems.
 AR = $full_ar
 HOST_EXE_EXT = 
+HOST_OBJ_EXT = .o
 EXE_EXT = $_exe
 LIB_EXT = $_a
 OBJ_EXT = $_o
@@ -303,7 +316,7 @@ DYNALOADER = DynaLoader\$(OBJ_EXT)
 
 libs = $perllibs $cryptlib
 
-public = perl\$(EXE_EXT) $suidperl utilities translators
+public = perl\$(EXE_EXT) $suidperl $utilities $translators
 
 shellflags = $shellflags
 
@@ -376,6 +389,10 @@ CONFIGPM = lib/Config.pm lib/Config_heavy.pl
 CONFIGPOD = lib/Config.pod
 
 CONFIGH = config.h
+
+$(CONFIGPOD): config.sh miniperl$(EXE_EXT) configpm Porting/Glossary
+	$(LDLIBPTH) $(RUN) ./miniperl -Ilib configpm
+
 !NO!SUBS!
 	;;
 *)
@@ -390,12 +407,20 @@ CONFIGPM = xlib/\$(CROSS_NAME)/Config.pm
 CONFIGPOD = xlib/\$(CROSS_NAME)/Config.pod
 CONFIGH = xconfig.h
 
-xconfig.h: config_h.SH Cross/config-\$(CROSS_NAME).sh
-	CONFIG_SH=Cross/config-\$(CROSS_NAME).sh CONFIG_H=xconfig.h \$(SHELL) config_h.SH
+xconfig.h: config_h.SH config-\$(CROSS_NAME).sh
+	CONFIG_SH=config-\$(CROSS_NAME).sh CONFIG_H=xconfig.h \$(SHELL) config_h.SH
 	#TODO \$(LDLIBPTH) ./miniperl -Ilib -MCross=\$(CROSS_NAME) config_h.PL "INST_VER=\$(INST_VER)" "CORE_DIR=\$(CROSS_LIB)" "CONFIG_H=xconfig.h"
 	cp xconfig.h \$(CROSS_LIB)/
 	cp xconfig.h \$(CROSS_LIB)/config.h
 
+\$(CONFIGPM): config.sh miniperl configpm Porting/Glossary
+	\$(LDLIBPTH) ./miniperl -Ilib configpm --cross=\$(CROSS_NAME)
+	cp *.h \$(CROSS_LIB)/
+	cp ext/re/re.pm \$(CROSS_LIB)/
+
+\$(CONFIGPOD): config.sh miniperl\$(EXE_EXT) configpm Porting/Glossary
+	\$(LDLIBPTH) \$(RUN) ./miniperl -Ilib configpm --cross=\$(CROSS_NAME)
+
 !GROK!THIS!
 	;;
 esac
@@ -576,8 +601,8 @@ globals\$(OBJ_EXT): uudmap.h
 uudmap.h: generate_uudmap\$(HOST_EXE_EXT)
 	\$(RUN) ./generate_uudmap\$(HOST_EXE_EXT) >uudmap.h
 
-generate_uudmap\$(HOST_EXE_EXT): generate_uudmap\$(OBJ_EXT)
-	\$(CC) -o generate_uudmap\$(EXE_EXT) \$(LDFLAGS) generate_uudmap\$(OBJ_EXT) \$(libs)
+generate_uudmap\$(HOST_EXE_EXT): generate_uudmap\$(HOST_OBJ_EXT)
+	\$(CC) -o generate_uudmap\$(HOST_EXE_EXT) \$(LDFLAGS) generate_uudmap\$(HOST_OBJ_EXT) \$(libs)
 
 !GROK!THIS!
 $spitshell >>$Makefile <<'!NO!SUBS!'
@@ -585,7 +610,7 @@ miniperlmain$(OBJ_EXT): miniperlmain.c patchlevel.h
 	$(CCCMD) $(PLDLFLAGS) $*.c
 
 perlmain.c: miniperlmain.c config.sh $(FIRSTMAKEFILE)
-	sh writemain $(DYNALOADER) $(static_ext) > perlmain.c
+	sh writemain DynaLoader $(static_ext) > perlmain.c
 
 perlmain$(OBJ_EXT): perlmain.c
 	$(CCCMD) $(PLDLFLAGS) $*.c
@@ -801,18 +826,18 @@ miniperl$(EXE_EXT): $& miniperlmain$(OBJ_EXT) $(obj) opmini$(OBJ_EXT)
 
 perl$(EXE_EXT): $& perlmain$(OBJ_EXT) $(LIBPERL) $(static_ext) ext.libs $(PERLEXPORT)
 	-@rm -f miniperl.xok
-	$(SHRPENV) $(LDLIBPTH) $(CC) -o perl$(PERL_SUFFIX) $(PERL_PROFILE_LDFLAGS) $(CLDFLAGS) $(CCDLFLAGS) perlmain$(OBJ_EXT) $(static_ext) $(LLIBPERL) `cat ext.libs` $(libs)
+	$(SHRPENV) $(LDLIBPTH) $(CC) -o perl$(PERL_SUFFIX)$(EXE_EXT) $(PERL_PROFILE_LDFLAGS) $(CLDFLAGS) $(CCDLFLAGS) perlmain$(OBJ_EXT) $(static_ext) $(LLIBPERL) `cat ext.libs` $(libs)
 
 # Purify/Quantify Perls.
 
 pureperl$(EXE_EXT): $& perlmain$(OBJ_EXT) $(LIBPERL) $(static_ext) ext.libs $(PERLEXPORT)
-	$(SHRPENV) $(LDLIBPTH) purify $(CC) -o pureperl $(CLDFLAGS) $(CCDLFLAGS) perlmain$(OBJ_EXT) $(static_ext) $(LLIBPERL) `cat ext.libs` $(libs)
+	$(SHRPENV) $(LDLIBPTH) purify $(CC) -o pureperl$(EXE_EXT) $(CLDFLAGS) $(CCDLFLAGS) perlmain$(OBJ_EXT) $(static_ext) $(LLIBPERL) `cat ext.libs` $(libs)
 
 purecovperl$(EXE_EXT): $& perlmain$(OBJ_EXT) $(LIBPERL) $(static_ext) ext.libs $(PERLEXPORT)
-	$(SHRPENV) $(LDLIBPTH) purecov $(CC) -o purecovperl $(CLDFLAGS) $(CCDLFLAGS) perlmain$(OBJ_EXT) $(static_ext) $(LLIBPERL) `cat ext.libs` $(libs)
+	$(SHRPENV) $(LDLIBPTH) purecov $(CC) -o purecovperl$(EXE_EXT) $(CLDFLAGS) $(CCDLFLAGS) perlmain$(OBJ_EXT) $(static_ext) $(LLIBPERL) `cat ext.libs` $(libs)
 
 quantperl$(EXE_EXT): $& perlmain$(OBJ_EXT) $(LIBPERL) $(static_ext) ext.libs $(PERLEXPORT)
-	$(SHRPENV) $(LDLIBPTH) quantify $(CC) -o quantperl $(CLDFLAGS) $(CCDLFLAGS) perlmain$(OBJ_EXT) $(static_ext) $(LLIBPERL) `cat ext.libs` $(libs)
+	$(SHRPENV) $(LDLIBPTH) quantify $(CC) -o quantperl$(EXE_EXT) $(CLDFLAGS) $(CCDLFLAGS) perlmain$(OBJ_EXT) $(static_ext) $(LLIBPERL) `cat ext.libs` $(libs)
 
 # Valgrind perl (currently Linux only)
 
@@ -944,28 +969,35 @@ makeppport: miniperl\$(EXE_EXT) \$(CONFIGPM)
 !GROK!THIS!
 ;;
 *)
-$spitshell >>$Makefile <<'!NO!SUBS!'
+$spitshell >>$Makefile <<!GROK!THIS!
 .PHONY: makeppport
-makeppport: miniperl$(EXE_EXT) $(CONFIGPM)
-	$(LDLIBPTH) $(RUN) ./miniperl$(EXE_EXT) -Ilib mkppport
+makeppport: miniperl\$(HOST_EXE_EXT) \$(CONFIGPM)
+	\$(LDLIBPTH) \$(RUN) ./miniperl\$(HOST_EXE_EXT) $MCROSS -Ilib mkppport
 
-!NO!SUBS!
+!GROK!THIS!
 ;;
 esac
 
-$spitshell >>$Makefile <<'!NO!SUBS!'
+$spitshell >>$Makefile <<!GROK!THIS!
+
+lib/lib.pm:	miniperl\$(EXE_EXT) \$(CONFIGPM)
+	@-rm -f \$@
+	\$(LDLIBPTH) \$(RUN) ./miniperl -Ilib $MCROSS lib/lib_pm.PL
 
 # We have to call our ./makedir because Ultrix 4.3 make can't handle the line
 #	test -d lib/auto || mkdir lib/auto
 # We need to autosplit in two steps because VOS can't handle so many args
 #
 .PHONY: preplibrary
-preplibrary: miniperl$(EXE_EXT) $(CONFIGPM) lib/lib.pm $(PREPLIBRARY_LIBPERL)
+preplibrary: miniperl\$(EXE_EXT) \$(CONFIGPM) lib/lib.pm \$(PREPLIBRARY_LIBPERL)
 	@sh ./makedir lib/auto
 	@echo "	AutoSplitting perl library"
-	$(LDLIBPTH) $(RUN) ./miniperl -Ilib -MAutoSplit -MFile::Find -e 'find ({no_chdir=>1, wanted => sub {autosplit_lib_modules($$_) if /\.pm$$/}}, "lib")'
-	$(MAKE) lib/re.pm
+	\$(LDLIBPTH) \$(RUN) ./miniperl -Ilib $MCROSS -MAutoSplit -MFile::Find -e 'find ({no_chdir=>1, wanted => sub {autosplit_lib_modules(\$\$_) if /\.pm\$\$/}}, "lib")'
+	\$(MAKE) lib/re.pm
+
+!GROK!THIS!
 
+$spitshell >>$Makefile <<'!NO!SUBS!'
 $(CONFIGPOD): config.sh miniperl$(EXE_EXT) configpm Porting/Glossary
 	$(LDLIBPTH) $(RUN) ./miniperl -Ilib configpm
 
@@ -985,10 +1017,6 @@ $(plextract):	miniperl$(EXE_EXT) $(CONFIGPM) x2p/s2p
 x2p/s2p: miniperl$(EXE_EXT) $(CONFIGPM) x2p/s2p.PL
 	cd x2p; $(LDLIBPTH) $(MAKE) s2p
 
-lib/lib.pm:	miniperl$(EXE_EXT) $(CONFIGPM)
-	@-rm -f $@
-	$(LDLIBPTH) $(RUN) ./miniperl -Ilib lib/lib_pm.PL
-
 unidatafiles $(unidatafiles): uni.data
 
 uni.data: miniperl$(EXE_EXT) $(CONFIGPM) lib/unicore/mktables
@@ -1148,18 +1176,22 @@ manicheck:	FORCE
 #
 # DynaLoader may be needed for extensions that use Makefile.PL.
 
-$(DYNALOADER):	miniperl$(EXE_EXT) preplibrary FORCE
-	@$(LDLIBPTH) sh ext/util/make_ext $(STATIC) $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL)
+!GROK!THIS!
 
-d_dummy $(dynamic_ext):	miniperl$(EXE_EXT) preplibrary makeppport $(DYNALOADER) FORCE
-	@$(LDLIBPTH) sh ext/util/make_ext dynamic $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL)
+$spitshell >>$Makefile <<!GROK!THIS!
+\$(DYNALOADER):	miniperl preplibrary FORCE
+	@\$(LDLIBPTH) sh ext/util/$make_ext \$(STATIC) \$@ MAKE=\$(MAKE) LIBPERL_A=\$(LIBPERL)
 
-s_dummy $(static_ext):	miniperl$(EXE_EXT) preplibrary makeppport $(DYNALOADER) FORCE
-	@$(LDLIBPTH) sh ext/util/make_ext $(STATIC) $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL)
+d_dummy \$(dynamic_ext):	miniperl preplibrary makeppport \$(DYNALOADER) FORCE
+	@\$(LDLIBPTH) sh ext/util/$make_ext dynamic \$@ MAKE=\$(MAKE) LIBPERL_A=\$(LIBPERL)
 
-n_dummy $(nonxs_ext):	miniperl$(EXE_EXT) preplibrary FORCE
-	@$(LDLIBPTH) sh ext/util/make_ext nonxs $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL)
-!NO!SUBS!
+s_dummy \$(static_ext):	miniperl preplibrary makeppport \$(DYNALOADER) FORCE
+	@\$(LDLIBPTH) sh ext/util/$make_ext \$(STATIC) \$@ MAKE=\$(MAKE) LIBPERL_A=\$(LIBPERL)
+
+n_dummy \$(nonxs_ext):	miniperl preplibrary FORCE
+	@\$(LDLIBPTH) sh ext/util/$make_ext nonxs \$@ MAKE=\$(MAKE) LIBPERL_A=\$(LIBPERL)
+
+!GROK!THIS!
 
 $spitshell >>$Makefile <<EOF
 $extra_dep
diff --git a/ext/POSIX/Makefile.PL b/ext/POSIX/Makefile.PL
index 5f6679d145..5658b73f0a 100644
--- a/ext/POSIX/Makefile.PL
+++ b/ext/POSIX/Makefile.PL
@@ -1,6 +1,6 @@
 # Explicitly avoid including '.' in @INC; autoloader gets confused since it
 # can find POSIX.pm, but can't find autosplit.ix.
-BEGIN { @INC = '../../lib';}
+BEGIN { @INC = '../../lib' unless defined $Cross::platform;}
 #
 use ExtUtils::MakeMaker;
 use ExtUtils::Constant 0.11 'WriteConstants';
diff --git a/lib/ExtUtils/MM_Unix.pm b/lib/ExtUtils/MM_Unix.pm
index 3624619c74..6bef1f4ee1 100644
--- a/lib/ExtUtils/MM_Unix.pm
+++ b/lib/ExtUtils/MM_Unix.pm
@@ -146,7 +146,7 @@ sub c_o {
 	$command -S $flags \$*.c
 
 .c\$(OBJ_EXT):
-	$command $flags \$*.c
+	$command $flags -o \$*\$(OBJ_EXT) \$*.c
 
 .cpp\$(OBJ_EXT):
 	$command $flags \$*.cpp
@@ -2585,7 +2585,7 @@ $(OBJECT) : $(FIRST_MAKEFILE)
     my $newer_than_target = $Is{VMS} ? '$(MMS$SOURCE_LIST)' : '$?';
     my $mpl_args = join " ", map qq["$_"], @ARGV;
 
-    $m .= sprintf <<'MAKE_FRAG', $newer_than_target, $mpl_args;
+    $m .= sprintf <<'MAKE_FRAG', $newer_than_target, $mpl_args unless defined $Cross::platform;
 # We take a very conservative approach here, but it's worth it.
 # We move Makefile to Makefile.old here to avoid gnu make looping.
 $(FIRST_MAKEFILE) : Makefile.PL $(CONFIGDEP)
@@ -2790,19 +2790,30 @@ sub perldepend {
     my($self) = shift;
     my(@m);
 
+    my $configsh = "config.sh";
     my $make_config = $self->cd('$(PERL_SRC)', '$(MAKE) lib/Config.pm');
 
-    push @m, sprintf <<'MAKE_FRAG', $make_config if $self->{PERL_SRC};
+    if (defined $Cross::platform) {
+	# in cross-compiling the dependant config.sh contains cross-identifier
+	# in its name, yet Config.pm is located in ./xlib/xxxx/
+	$make_config = $self->cd('$(PERL_SRC)', "\$(MAKE) xlib/$Cross::platform/Config.pm");
+	$configsh = "config-$Cross::platform.sh";
+    }
+
+    if ($self->{PERL_SRC}) {
+	push @m, "CONFIGSH = \$(PERL_SRC)/$configsh\n";
+	push @m, sprintf <<'MAKE_FRAG', $make_config;
 # Check for unpropogated config.sh changes. Should never happen.
 # We do NOT just update config.h because that is not sufficient.
 # An out of date config.h is not fatal but complains loudly!
-$(PERL_INC)/config.h: $(PERL_SRC)/config.sh
-	-$(NOECHO) $(ECHO) "Warning: $(PERL_INC)/config.h out of date with $(PERL_SRC)/config.sh"; false
+$(PERL_INC)/config.h: $(CONFIGSH)
+	-$(NOECHO) $(ECHO) "Warning: $(PERL_INC)/config.h out of date with $(CONFIGSH)"; false
 
-$(PERL_ARCHLIB)/Config.pm: $(PERL_SRC)/config.sh
-	$(NOECHO) $(ECHO) "Warning: $(PERL_ARCHLIB)/Config.pm may be out of date with $(PERL_SRC)/config.sh"
+$(PERL_ARCHLIB)/Config.pm: $(CONFIGSH)
+	$(NOECHO) $(ECHO) "Warning: $(PERL_ARCHLIB)/Config.pm may be out of date with $(CONFIGSH)"
 	%s
 MAKE_FRAG
+    }
 
     return join "", @m unless $self->needs_linking;
 
@@ -3732,7 +3743,7 @@ sub xs_o {	# many makes are too dumb to use xs_c then c_o
     '
 .xs$(OBJ_EXT):
 	$(XSUBPPRUN) $(XSPROTOARG) $(XSUBPPARGS) $*.xs > $*.xsc && $(MV) $*.xsc $*.c
-	$(CCCMD) $(CCCDLFLAGS) "-I$(PERL_INC)" $(PASTHRU_DEFINE) $(DEFINE) $*.c
+	$(CCCMD) $(CCCDLFLAGS) "-I$(PERL_INC)" $(PASTHRU_DEFINE) $(DEFINE) -o $*$(OBJ_EXT) $*.c
 ';
 }