wince crosscompile patch for 28132

Message-ID: <44607877.90603@vkonovalov.ru>

p4raw-id: //depot/perl@28140

diff --git a/INSTALL b/INSTALL
index 36e738e..5da1d9a 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -1971,7 +1971,8 @@ has to be used is C<-Dusecrosscompile>.
    sh ./Configure -des -Dusecrosscompile -D...
 
 This will make the cpp symbol USE_CROSS_COMPILE and the %Config
-symbol C<usecrosscompile> available.
+symbol C<usecrosscompile> available, and C<xconfig.h> will be used
+for cross-compilation.
 
 During the Configure and build, certain helper scripts will be created
 into the Cross/ subdirectory.  The scripts are used to execute a

diff --git a/perl.h b/perl.h
index 8e8d67b..f83cbf8 100644 (file)
--- a/perl.h
+++ b/perl.h
@@ -34,7 +34,11 @@
 #ifdef PERL_MICRO
 #   include "uconfig.h"
 #else
-#   include "config.h"
+#   ifndef USE_CROSS_COMPILE
+#       include "config.h"
+#   else
+#       include "xconfig.h"
+#   endif
 #endif
 
 /* See L<perlguts/"The Perl API"> for detailed notes on

diff --git a/perlio.c b/perlio.c
index 6efc7cd..288159c 100644 (file)
--- a/perlio.c
+++ b/perlio.c
@@ -30,7 +30,11 @@
 #ifdef PERL_MICRO
 #   include "uconfig.h"
 #else
-#   include "config.h"
+#   ifndef USE_CROSS_COMPILE
+#       include "config.h"
+#   else
+#       include "xconfig.h"
+#   endif
 #endif
 
 #define PERLIO_NOT_STDIO 0

diff --git a/win32/Makefile.ce b/win32/Makefile.ce
index a948f71..85a55e2 100644 (file)
--- a/win32/Makefile.ce
+++ b/win32/Makefile.ce
@@ -1,6 +1,8 @@
+#
 # perl makefile for wince
+# During the cross-compilation, it first uses Makefile file to build
+# miniperl on HOST and then build required platform
 #
-# Time-stamp: <26/10/01 15:10:06 keuchel@keuchelnt>
 
 SRCDIR     = ..
 PV         = 59
@@ -380,7 +382,7 @@ LIB=$(WCEROOT)\$(OSVERSION)\$(PLATFORM)\lib\$(ARCH)
 # Additional compiler flags can be specified here.
 #
 
-BUILDOPT       = $(BUILDOPT) $(CECFLAGS)
+BUILDOPT       = $(BUILDOPT) $(CECFLAGS) -DUSE_CROSS_COMPILE
 
 
 !IF "$(CRYPT_SRC)$(CRYPT_LIB)" == ""

diff --git a/win32/config.ce b/win32/config.ce
index f189a96..d155e88 100644 (file)
--- a/win32/config.ce
+++ b/win32/config.ce
@@ -895,6 +895,7 @@ subversion='~SUBVERSION~'
 sysman='/usr/man/man1'
 tail=''
 tar=''
+targetarch='wince'
 tbl=''
 tee=''
 test=''
@@ -924,7 +925,7 @@ uquadtype='unsigned __int64'
 use5005threads='undef'
 use64bitall='undef'
 use64bitint='undef'
-usecrosscompile='undef'
+usecrosscompile='define'
 usedl='define'
 usefaststdio='undef'
 useithreads='~USE_ITHREADS~'

diff --git a/win32/config_H.ce b/win32/config_H.ce
index fa2b0a8..9809781 100644 (file)
--- a/win32/config_H.ce
+++ b/win32/config_H.ce
@@ -914,8 +914,8 @@
  *     Perl has been cross-compiled to.  Undefined if not a cross-compile.
  */
 #ifndef USE_CROSS_COMPILE
-/*#define      USE_CROSS_COMPILE       /**/
-#define        PERL_TARGETARCH "undef" /**/
+#define        USE_CROSS_COMPILE       /**/
+#define        PERL_TARGETARCH "wince" /**/
 #endif
 
 /* MULTIARCH: