Re: Configure -Dno_mathoms

Message-ID: <lrslug7glm.fsf@caliper.activestate.com>

p4raw-id: //depot/perl@25991

2 files changed, 14 insertions, 0 deletions

diff --git a/mathoms.c b/mathoms.c
index bc355e9842..0f82677fb2 100644
--- a/mathoms.c
+++ b/mathoms.c
@@ -14,6 +14,8 @@
  * hand to hand were of that sort." 
  */
 
+#ifndef NO_MATHOMS
+
 /* 
  * This file contains mathoms, various binary artifacts from previous
  * versions of Perl.  For binary or source compatibility reasons, though,
@@ -27,6 +29,8 @@
 #define PERL_IN_MATHOMS_C
 #include "perl.h"
 
+void Perl_mathoms() {}
+
 /* ref() is now a macro using Perl_doref;
  * this version provided for binary compatibility only.
  */
@@ -1030,6 +1034,8 @@ Perl_sv_nounlocking(pTHX_ SV *sv)
     PERL_UNUSED_ARG(sv);
 }
 
+#endif /* NO_MATHOMS */
+
 /*
  * Local variables:
  * c-indentation-style: bsd
diff --git a/perl.c b/perl.c
index e3676957d5..a77c8865e5 100644
--- a/perl.c
+++ b/perl.c
@@ -137,6 +137,14 @@ static I32 read_e_script(pTHX_ int idx, SV *buf_sv, int maxlen);
 #endif
 #endif
 
+#ifndef NO_MATHOMS
+/* This reference ensure that the mathoms are linked with perl */
+void Perl_mathoms_ref() {
+    extern void Perl_mathoms();
+    Perl_mathoms();
+}
+#endif
+
 static void
 S_init_tls_and_interp(PerlInterpreter *my_perl)
 {