In perl.git, the branch blead has been updated

<https://perl5.git.perl.org/perl.git/commitdiff/1b30b4a8259a74c5ffaee362bc1d881c40fc5279?hp=00c1316e738f63fb8f488ffc1fc410ef289cd50a>

- Log -----------------------------------------------------------------
commit 1b30b4a8259a74c5ffaee362bc1d881c40fc5279
Author: Daniel Dragan <bul...@hotmail.com>
Date:   Fri Apr 6 18:41:22 2018 -0400

    fix win32 with Ming.org GCC 3.4.5 build
    
    dlltool 2.20.51.20100123 from Strawberry 5.12 and
    dlltool 2.17.50 20060824 from Strawberry 5.8.9 were making a libperl527.a
    that caused perl.exe and all XS DLLs to import "perl527.exp.dll" while
    the disk file is called perl527.dll.
    
    This bug was eventually fixed, since in my testing dlltool 2.25 no date
    code, Copyright 2014 from Strawberry 5.22.1 doesn't have this problem. I
    suspect the bug was fixed in binutils commit 04276a0cf5
    "2010-12-01 Kai Tietz <kai.ti...@onevision.com>"
    https://sourceware.org/bugzilla/show_bug.cgi?id=11065
    in version "AM_INIT_AUTOMAKE(bfd, 2.21.51)" or 1 ver bump higher. Just
    always pass an explicit DLL name to dlltool instead of any kind of
    dlltool version checking at build time and then optional arg.
    
    The breakage for Mingw.org 3.4.5 was introduced in
    commit bf543eaf90d "add parallelness to win32/GNUmakefile" where I added
    parallelness by making the import lib .a file from just perldll.def,
    rather than the import lib being a build product coming out of g++
    linking perl527.dll. The old serial build recipie passed --dllname
    to dlltool, my newer code didn't.
    
    Passing $(PERLDLL) to dlltool's -D causes this harmless but scary warning
    
    "dlltool: Path components stripped from dllname, '..\perl527.dll'."
    
    So create PERLDLLBASE to silence the warning.
    
    win32.h: In old GCCs,
    https://sourceforge.net/p/mingw/mailman/message/22184185/ a function marked
    declspec(dllimport) is not a constant. VC from day 1, and newer GCCs use
    the address of a 1 instruction jump stub function if a constant function
    pointer is needed to a function from a DLL that wont be known till runtime.
    This can be worked around in older GCCs by deoptimizing them to always
    use the jump stub for all references, and not the newer GCC and VC way
    where x86 call instructions directly read the import table in the caller,
    while constant functions ptrs in data or vars always refer to the jump
    stubs. Since these are old GCCs, performance isn't the highest priority
    and building at all is a more important goal. I suspect gcc 3.4.5 has
    been broken since 5.13.6 when the declspec(dllimport) code was added.

-----------------------------------------------------------------------

Summary of changes:
 win32/GNUmakefile |  3 ++-
 win32/makefile.mk |  3 ++-
 win32/win32.h     | 43 +++++++++++++++++++++++++++++++------------
 3 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/win32/GNUmakefile b/win32/GNUmakefile
index ac4632bbea..82bf593705 100644
--- a/win32/GNUmakefile
+++ b/win32/GNUmakefile
@@ -963,6 +963,7 @@ PERLIMPLIBBASE      ?= perl527$(a)
 PERLEXPLIB     ?= $(COREDIR)\perl527.exp
 PERLSTATICLIB  ?= ..\perl527s$(a)
 PERLDLL                = ..\perl527.dll
+PERLDLLBASE    = perl527.dll
 
 # don't let "gmake -n all" try to run "miniperl.exe make_ext.pl"
 PLMAKE         = gmake
@@ -1478,7 +1479,7 @@ $(PERLEXPLIB) : $(PERLIMPLIB)
 
 $(PERLIMPLIB) : perldll.def
 ifeq ($(CCTYPE),GCC)
-       $(IMPLIB) -k -d perldll.def -l $(PERLIMPLIB) -e $(PERLEXPLIB)
+       $(IMPLIB) -k -d perldll.def -D $(PERLDLLBASE) -l $(PERLIMPLIB) -e 
$(PERLEXPLIB)
 else
        lib -def:perldll.def -machine:$(ARCHITECTURE) /OUT:$(PERLIMPLIB)
 endif
diff --git a/win32/makefile.mk b/win32/makefile.mk
index 57563c4538..265e93baaf 100644
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -937,6 +937,7 @@ PERLIMPLIB  *= $(COREDIR)\perl527$(a)
 PERLEXPLIB     *= $(COREDIR)\perl527.exp
 PERLSTATICLIB  *= ..\perl527s$(a)
 PERLDLL                = ..\perl527.dll
+PERLDLLBASE    = perl527.dll
 
 #EUMM on Win32 isn't ready for parallel make, so only allow this file to be 
parallel
 #$(MAKE) will contain the -P that this makefile was called with, which is bad 
for
@@ -1427,7 +1428,7 @@ perldll.def : $(HAVEMINIPERL) $(CONFIGPM) ..\embed.fnc 
..\makedef.pl
 
 $(PERLEXPLIB) $(PERLIMPLIB) .UPDATEALL : perldll.def
 .IF "$(CCTYPE)" == "GCC"
-       $(IMPLIB) -k -d perldll.def -l $(PERLIMPLIB) -e $(PERLEXPLIB)
+       $(IMPLIB) -k -d perldll.def -D $(PERLDLLBASE) -l $(PERLIMPLIB) -e 
$(PERLEXPLIB)
 .ELSE #VC family
        lib -def:perldll.def -machine:$(ARCHITECTURE) /OUT:$(PERLIMPLIB)
 .ENDIF
diff --git a/win32/win32.h b/win32/win32.h
index cdfadfe4c5..29621c0cd3 100644
--- a/win32/win32.h
+++ b/win32/win32.h
@@ -103,23 +103,42 @@
  * The XS code in the re extension is special, in that it redefines
  * core APIs locally, so don't mark them as "dllimport" because GCC
  * cannot handle this situation.
+ *
+ * Certain old GCCs will not allow the function pointer of dllimport marked
+ * function to be "const". This was fixed later on. Since this is a
+ * deoptimization, target "gcc version 3.4.5 (mingw-vista special r3)" only,
+ * The GCC bug was fixed in GCC patch "varasm.c (initializer_constant_valid_p):
+ * Don't deny DECL_DLLIMPORT_P on functions", which probably was first released
+ * in GCC 4.3.0, this #if can be expanded upto but not including 4.3.0 if more
+ * deployed GCC are found that wont build with the follow error, initializer
+ * element is a PerlIO func exported from perl5xx.dll.
+ *
+ * encoding.xs:610: error: initializer element is not constant
+ * encoding.xs:610: error: (near initialization for `PerlIO_encode.Open')
  */
-#if !defined(PERLDLL) && !defined(PERL_EXT_RE_BUILD)
-#  ifdef __cplusplus
-#    define PERL_CALLCONV extern "C" __declspec(dllimport)
-#    ifdef _MSC_VER
-#      define PERL_CALLCONV_NO_RET extern "C" __declspec(dllimport) 
__declspec(noreturn)
+
+#if (defined(__GNUC__) && defined(__MINGW32__) && \
+     !defined(__MINGW64_VERSION_MAJOR) && !defined(__clang__) && \
+       ((__GNUC__ < 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ <= 5))))
+/* use default fallbacks from perl.h for this particular GCC */
+#else
+#  if !defined(PERLDLL) && !defined(PERL_EXT_RE_BUILD)
+#    ifdef __cplusplus
+#      define PERL_CALLCONV extern "C" __declspec(dllimport)
+#      ifdef _MSC_VER
+#        define PERL_CALLCONV_NO_RET extern "C" __declspec(dllimport) 
__declspec(noreturn)
+#      endif
+#    else
+#      define PERL_CALLCONV __declspec(dllimport)
+#      ifdef _MSC_VER
+#        define PERL_CALLCONV_NO_RET __declspec(dllimport) __declspec(noreturn)
+#      endif
 #    endif
-#  else
-#    define PERL_CALLCONV __declspec(dllimport)
+#  else /* MSVC noreturn support inside the interp */
 #    ifdef _MSC_VER
-#      define PERL_CALLCONV_NO_RET __declspec(dllimport) __declspec(noreturn)
+#      define PERL_CALLCONV_NO_RET __declspec(noreturn)
 #    endif
 #  endif
-#else /* MSVC noreturn support inside the interp */
-#  ifdef _MSC_VER
-#    define PERL_CALLCONV_NO_RET __declspec(noreturn)
-#  endif
 #endif
 
 #ifdef _MSC_VER

-- 
Perl5 Master Repository

Reply via email to