fix XS_EXTERNAL for solaris and -flto=thin

SunPro cc __global needs to be before the funcion decl, not after.
use a new GLOBAL define for GLOBAL (exported) XS functions, similar to
EXT with variables.
Simplify the definition of XS_EXTERNAL and XSPROTO, by using GLOBAL.

Fixup the wrong generated code for solaris by ExtUtils::ParseXS

Author: Reini Urban

EXTERN.h

@@ -23,26 +23,26 @@
     /* miniperl should not export anything */
 #    if defined(PERL_IS_MINIPERL) && !defined(UNDER_CE) && defined(_MSC_VER)
 #      define EXT extern
-#      define dEXT 
+#      define dEXT
 #      define EXTCONST extern const
 #      define dEXTCONST const
 #    else
 #      if defined(PERLDLL) || defined(__SYMBIAN32__)
 #        define EXT EXTERN_C __declspec(dllexport)
-#        define dEXT 
+#        define dEXT
 #        define EXTCONST EXTERN_C __declspec(dllexport) const
 #        define dEXTCONST const
 #      else
 #        define EXT EXTERN_C __declspec(dllimport)
-#        define dEXT 
+#        define dEXT
 #        define EXTCONST EXTERN_C __declspec(dllimport) const
 #        define dEXTCONST const
 #      endif
 #    endif
 #  else
 #    if defined(__CYGWIN__) && defined(USEIMPORTLIB)
 #      define EXT extern __declspec(dllimport)
-#      define dEXT 
+#      define dEXT
 #      define EXTCONST extern __declspec(dllimport) const
 #      define dEXTCONST const
 #    else

XSUB.h

@@ -124,31 +124,25 @@ is a lexical C<$_> in scope.
  * "STATIC", ie. it exports XSUB symbols. You probably don't want that.
  */
 
-#define XSPROTO(name) void name(pTHX_ CV* cv)
+#if defined(HASATTRIBUTE_UNUSED) && !defined(__cplusplus)
+#  define XSPROTO(name) void name(pTHX_ CV* cv __attribute__unused__)
+#else
+#  define XSPROTO(name) void name(pTHX_ CV* cv)
+#endif
 
 #undef XS
 #undef XS_EXTERNAL
 #undef XS_INTERNAL
-#if defined(__CYGWIN__) && defined(USE_DYNAMIC_LOADING)
-#  define XS_EXTERNAL(name) __declspec(dllexport) XSPROTO(name)
-#  define XS_INTERNAL(name) STATIC XSPROTO(name)
-#endif
 #if defined(__SYMBIAN32__)
 #  define XS_EXTERNAL(name) EXPORT_C XSPROTO(name)
 #  define XS_INTERNAL(name) EXPORT_C STATIC XSPROTO(name)
-#endif
-#ifndef XS_EXTERNAL
-#  if defined(HASATTRIBUTE_UNUSED) && !defined(__cplusplus)
-#    define XS_EXTERNAL(name) void name(pTHX_ CV* cv __attribute__unused__)
-#    define XS_INTERNAL(name) STATIC void name(pTHX_ CV* cv __attribute__unused__)
+#else
+#  ifdef __cplusplus
+#    define XS_EXTERNAL(name) extern "C" GLOBAL XSPROTO(name)
+#    define XS_INTERNAL(name) static XSPROTO(name)
 #  else
-#    ifdef __cplusplus
-#      define XS_EXTERNAL(name) extern "C" XSPROTO(name)
-#      define XS_INTERNAL(name) static XSPROTO(name)
-#    else
-#      define XS_EXTERNAL(name) XSPROTO(name)
-#      define XS_INTERNAL(name) STATIC XSPROTO(name)
-#    endif
+#    define XS_EXTERNAL(name) GLOBAL XSPROTO(name)
+#    define XS_INTERNAL(name) STATIC XSPROTO(name)
 #  endif
 #endif
 

dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm

@@ -893,13 +893,8 @@ EOF
 
   # Windows already has __declspec(dllexport) in XS_EXTERNAL
   print Q(<<"EOF");
-#XS_EXTERNAL(boot_$self->{Module_cname}) /* prototype to pass -Wmissing-prototypes */
-##if defined(__GNUC__)
-#  __attribute__((__visibility__("default")))
-##elif defined(__SUNPRO_C)
-#  __global
-##endif
-  ;
+#XS_EXTERNAL(boot_$self->{Module_cname}) __attribute__global__ ;
+#
 #XS_EXTERNAL(boot_$self->{Module_cname})
 #[[
 ##if PERL_VERSION_LE(5, 21, 5)

embed.fnc

@@ -2905,7 +2905,7 @@ Apo	|void*	|my_cxt_init	|NN int *index|size_t size
 so	|void	|xs_version_bootcheck|U32 items|U32 ax|NN const char *xs_p \
 				|STRLEN xs_len
 #endif
-Xpon	|I32	|xs_handshake	|const U32 key|NN void * v_my_perl\
+Apon	|I32	|xs_handshake	|const U32 key|NN void * v_my_perl\
 				|NN const char * file| ...
 Xp	|void	|xs_boot_epilog	|const I32 ax
 #ifndef HAS_STRLCAT

ext/DynaLoader/dlboot_c.PL

@@ -80,19 +80,19 @@ const char ldlibpthname[] = LDLIBPTHNAME;
 
 static SV * dl_findfile(pTHX_ AV* args, int gimme);
 static char * av_tostr(pTHX_ AV *args);
-PERL_CALLCONV void XS_DynaLoader_bootstrap_inherit(pTHX_ CV *cv);
-PERL_CALLCONV void XS_DynaLoader_bootstrap(pTHX_ CV *cv);
-PERL_CALLCONV void XS_DynaLoader_dl_findfile(pTHX_ CV *cv);
+XS_EXTERNAL(XS_DynaLoader_bootstrap_inherit);
+XS_EXTERNAL(XS_DynaLoader_bootstrap);
+XS_EXTERNAL(XS_DynaLoader_dl_findfile);
 #ifndef VMS
-PERL_CALLCONV void XS_DynaLoader_dl_expandspec(pTHX_ CV *cv);
+XS_EXTERNAL(XS_DynaLoader_dl_expandspec);
 #endif
-PERL_CALLCONV void XS_DynaLoader_dl_find_symbol_anywhere(pTHX_ CV *cv);
+XS_EXTERNAL(XS_DynaLoader_dl_find_symbol_anywhere);
 #ifdef HAS_LIBNAME_UNIQUE
-PERL_CALLCONV void XS_DynaLoader_mod2fname(pTHX_ CV *cv);
+XS_EXTERNAL(XS_DynaLoader_mod2fname);
 #endif
-PERL_CALLCONV void XS_XSLoader_load(pTHX_ CV *cv);
-PERL_CALLCONV void XS_XSLoader_load_file(pTHX_ CV *cv);
-PERL_CALLCONV void XS_XSLoader_bootstrap_inherit(pTHX_ CV *cv);
+XS_EXTERNAL(XS_XSLoader_load);
+XS_EXTERNAL(XS_XSLoader_load_file);
+XS_EXTERNAL(XS_XSLoader_bootstrap_inherit);
 
 EXTERN_C void
 dl_boot (pTHX) {

hv.h

@@ -52,7 +52,7 @@ struct he {
 struct hek {
     U32		hek_hash;	/* hash of key */
     I32		hek_len;	/* length of hash key */
-#ifdef PERL_GCC_BRACE_GROUPS_FORBIDDEN
+#if defined(PERL_GCC_BRACE_GROUPS_FORBIDDEN) || defined(__SUNPRO_C)
     char	hek_key[1];	/* variable-length hash key */
 #else
     char	hek_key[];      /* for easier debugging */

perl.h

@@ -3647,15 +3647,23 @@ EXTERN_C int perl_tsa_mutex_unlock(perl_mutex* mutex)
 #  endif
 #endif
 
-/* We could also use GLOBAL instead of  __attribute__global__.
-   But GLOBAL would be expected at the front of the declaration,
-   whilst the attribute needs to be put behind. */
+/* GLOBAL is in front of the declaration: sun cc, MSVC,
+   Similar to EXT, which is for exported perl.h variables.
+   __attribute__global__ after: gnuc, clang. */
 #if defined(__clang__) && defined(LTO)
+#  define GLOBAL
 #  define __attribute__global__         __attribute__((__visibility__("default")))
 #elif defined(__SUNPRO_C) && defined(LTO)
-#  define __attribute__global__	        __global
+#  define GLOBAL  __global
+#  define __attribute__global__
+#elif defined(__CYGWIN__) && defined(USE_DYNAMIC_LOADING)
+#  define GLOBAL __declspec(dllexport)
+#  define __attribute__global__
+#elif !defined(UNDER_CE) && defined(WIN32) && defined(USE_DYNAMIC_LOADING)
+#  define GLOBAL __declspec(dllexport)
+#  define __attribute__global__
 #else
-/* on windows __declspec(dllexport) is already in the front. put nothing here */
+#  define GLOBAL
 #  define __attribute__global__
 #endif
 #ifdef HASATTRIBUTE_DEPRECATED

pod/perlcdelta.pod

@@ -163,6 +163,11 @@ any NULL-sensitive op-tree structure. See how many with C<-Dk>.
 C<-DPERL_FAKE_SIGNATURE> is now default, making most function calls 2x faster.
 See L</fake_signatures>
 
+=item *
+
+The new compiler option support allows generation of much faster
+code. I.e. clang-4.0 with -flto or zapcc produce ~20% faster code.
+
 =back
 
 =head1 Modules and Pragmata
@@ -424,6 +429,21 @@ L<[cperl #217]|https://github.com/perl11/cperl/issues/217>.
 
 =back
 
+=head1 Platform Support
+
+=head2 Platform-Specific Notes
+
+=over 4
+
+=item Solaris
+
+With the SunPro cc compiler we use now the C<__global> declaration
+for exported functions, similar to Windows C<__declspec(dllexport)>.
+
+This is hidden under the new C<GLOBAL> macro.
+
+=back
+
 =head1 Configuration and Compilation
 
 =over 4
@@ -525,18 +545,28 @@ This is related to the new C<-Wc++11-compat> and C<-fpermissive> fixes.
 =item *
 
 Support for clang C<-flto> and the new C<-flto=thin> optimization was
-added, via C<__attribute__global__> for global visibility for all
-exported API functions, even if not used, and C<-DLTO>. Note that is
-not needed for C<gcc -flto>, and the clang variant produces slower code.
+added, via C<GLOBAL> declaration and C<__attribute__global__> for
+global visibility for all exported API functions, even if not used,
+and C<-DLTO>. Note that is not needed for C<gcc -flto>, and the clang
+variant produces slower code.
 
 Rudimentary support for C<-fsanitize=cfi> was also added, which is
 safer than the old C<-fstack-protector-strong>, but this is not yet
 finished.
 
-ExtUtils-ParseXS adds now a correct visibility declaration of
+L<ExtUtils::ParseXS> adds now a correct visibility declaration of
 C<XS_EXTERNAL> for C<-flto> and C<-fvisibility=hidden>, which is needed for
 C<-fsanitize=cfi> support.
 
+C<Perl_xs_handshake> is now properly exported, which is needed for
+C<clang -flto=thin>.
+
+=item *
+
+C<XS_EXTERNAL> and C<XSPROTO> were simplified to use the new C<GLOBAL>
+declaration and C<__attribute__global__> attribute, for easier
+platform abstractions.
+
 =item *
 
 Added many OP read-write field accessor macros, like C<OpFIRST>,
@@ -551,9 +581,6 @@ See L<[cperl #219]|https://github.com/perl11/cperl/issues/219>.
 
 =head1 Selected Bug Fixes
 
-XXX Important bug fixes in the core language are summarized here.  Bug fixes in
-files in F<ext/> and F<lib/> are best summarized in L</Modules and Pragmata>.
-
 =over 4
 
 =item *

t/porting/customized.dat

@@ -57,7 +57,7 @@ ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/t/Mkbootstrap.t 2f88adc65c55c7bd2e23
 ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/t/pm_to_blib.t 71ebcee355691ce374fcad251b12d8b2412462b3
 ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/t/prereq.t c1fe6e8ce96e8a648043ee8066e60a871fb4e0ba
 ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/t/vstrings.t c60ad8cfd3496f136aeb71008f51d2db0a34eb5f
-ExtUtils::ParseXS dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm 3c74d16f9e837bdea95326c2860f130e6739be5a
+ExtUtils::ParseXS dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm dd71fa31e2b2a38344fd91eec22fd6948d08307e
 File::Path cpan/File-Path/lib/File/Path.pm 623799e76e11a756ca5e18749d8bc1bdc3800ecd
 File::Path cpan/File-Path/t/Path_win32.t 94b9276557ce7f80b91f6fd9bfa7a0cd9bf9683e
 File::Spec dist/PathTools/t/rel2abs_vs_symlink.t abbf1a890a1b6fefebc0c8a9e2849694ade89fa9

xsutils.c

@@ -25,17 +25,17 @@
 
 /* public XS package methods */
 /* -- converted to XS */
-PERL_CALLCONV void XS_strict_bits(pTHX_ CV *cv);
-PERL_CALLCONV void XS_strict_import(pTHX_ CV *cv);
-PERL_CALLCONV void XS_strict_unimport(pTHX_ CV *cv);
-PERL_CALLCONV void XS_attributes_reftype(pTHX_ CV *cv);
-PERL_CALLCONV void XS_attributes__fetch_attrs(pTHX_ CV *cv);
-PERL_CALLCONV void XS_attributes__modify_attrs(pTHX_ CV *cv);
-PERL_CALLCONV void XS_attributes__guess_stash(pTHX_ CV *cv);
-PERL_CALLCONV void XS_attributes_bootstrap(pTHX_ CV *cv);
+XS_EXTERNAL(XS_strict_bits);
+XS_EXTERNAL(XS_strict_import);
+XS_EXTERNAL(XS_strict_unimport);
+XS_EXTERNAL(XS_attributes_reftype);
+XS_EXTERNAL(XS_attributes__fetch_attrs);
+XS_EXTERNAL(XS_attributes__modify_attrs);
+XS_EXTERNAL(XS_attributes__guess_stash);
+XS_EXTERNAL(XS_attributes_bootstrap);
 /* converted to XS */
-PERL_CALLCONV void XS_attributes_import(pTHX_ CV *cv);
-PERL_CALLCONV void XS_attributes_get(pTHX_ CV *cv);
+XS_EXTERNAL(XS_attributes_import);
+XS_EXTERNAL(XS_attributes_get);
 
 /* internal only */
 static HV*  S_guess_stash(pTHX_ SV*);
@@ -296,7 +296,7 @@ Perl_boot_core_xsutils(pTHX)
         | HINT_EXPLICIT_STRICT_VARS)
 
 /* Needed by B::Deparse and vars */
-XS(XS_strict_bits)
+XS_EXTERNAL(XS_strict_bits)
 {
     dVAR;
     dXSARGS;
@@ -325,7 +325,7 @@ XS(XS_strict_bits)
 /*
   See L<strict>
 */
-XS(XS_strict_import)
+XS_EXTERNAL(XS_strict_import)
 {
     dVAR;
     dXSARGS;
@@ -357,7 +357,7 @@ XS(XS_strict_import)
 /*
   See L<strict>
 */
-XS(XS_strict_unimport)
+XS_EXTERNAL(XS_strict_unimport)
 {
     dVAR;
     dXSARGS;
@@ -564,7 +564,7 @@ S_guess_stash(pTHX_ SV* sv)
     }
 }
 
-XS(XS_attributes_bootstrap)
+XS_EXTERNAL(XS_attributes_bootstrap)
 {
     dVAR;
     dXSARGS;
@@ -610,7 +610,7 @@ If there are any bad attributes C<import> croaks.
 
 */
 
-XS(XS_attributes_import)
+XS_EXTERNAL(XS_attributes_import)
 {
     /*
       @_ > 2 && ref $_[2] or do {
@@ -691,7 +691,7 @@ S_attributes__push_fetch(pTHX_ SV *sv)
   Handling"> below.  Otherwise, only L<built-in attributes|"Built-in
   Attributes"> will be returned.
  */
-XS(XS_attributes_get)
+XS_EXTERNAL(XS_attributes_get)
 {
     dVAR;
     dXSARGS;
@@ -751,7 +751,7 @@ XS(XS_attributes_get)
 }
 
 /* default modify handler for builtin attributes */
-XS(XS_attributes__modify_attrs)
+XS_EXTERNAL(XS_attributes__modify_attrs)
 {
     dVAR;
     dXSARGS;
@@ -773,7 +773,7 @@ XS(XS_attributes__modify_attrs)
 }
 
 /* default fetch handler for builtin attributes */
-XS(XS_attributes__fetch_attrs)
+XS_EXTERNAL(XS_attributes__fetch_attrs)
 {
     dVAR;
     dXSARGS;
@@ -794,7 +794,7 @@ XS(XS_attributes__fetch_attrs)
 }
 
 /* helper function to return and set the stash of the svref */
-XS(XS_attributes__guess_stash)
+XS_EXTERNAL(XS_attributes__guess_stash)
 {
     dVAR;
     dXSARGS;
@@ -828,7 +828,7 @@ XS(XS_attributes__guess_stash)
   This can be useful for determining the I<type> value which forms part of
   the method names described in L<"Package-specific Attribute Handling"> below.
 */
-XS(XS_attributes_reftype)
+XS_EXTERNAL(XS_attributes_reftype)
 {
     dVAR;
     dXSARGS;