make EMBEDMYMALLOC the default and provide PERL_POLLUTE_MALLOC to let

them ask for insanity (untested)

p4raw-id: //depot/perl@2832

4 files changed, 5 insertions, 16 deletions

diff --git a/hints/machten.sh b/hints/machten.sh
index f283873699..767283792b 100644
--- a/hints/machten.sh
+++ b/hints/machten.sh
@@ -64,13 +64,6 @@ usemymalloc=${usemymalloc:-y}
 # Do not wrap the following long line
 malloc_cflags='ccflags="$ccflags -DPLAIN_MALLOC -DNO_FANCY_MALLOC -DUSE_PERL_SBRK"'
 
-# Note that an empty malloc_cflags appears in config.sh if perl's
-# malloc() is not used.  his is harmless.
-case "$usemymalloc" in
-n) unset malloc_cflags;;
-*) ccflags="$ccflags  -DHIDEMYMALLOC"
-esac
-
 # When MachTen does a fork(), it immediately copies the whole of
 # the parent process' data space for the child.  This can be
 # expensive.  Using vfork() where appropriate avoids this cost.
diff --git a/hints/next_3.sh b/hints/next_3.sh
index 99adf50ffe..1a174b8d54 100644
--- a/hints/next_3.sh
+++ b/hints/next_3.sh
@@ -32,8 +32,8 @@
 # than no perl at all.
 #
 # So, this hintsfile is using perl's malloc. If you want to turn
-# perl's malloc off, you need to remove '-DUSE_PERL_SBRK' and
-# '-DHIDEMYMALLOC' from the ccflags and set usemymalloc to 'n'.
+# perl's malloc off, you need to remove '-DUSE_PERL_SBRK'
+# from the ccflags and set usemymalloc to 'n'.
 #
 # 1997:
 # From perl5.003_22 the malloc bug has no impact any more. We can run
@@ -42,7 +42,7 @@
 #
 # use the following two lines to enable USE_PERL_SBRK. Try this if you
 # encounter intermittent core dumps:
-#ccflags='-DUSE_NEXT_CTYPE -DUSE_PERL_SBRK -DHIDEMYMALLOC'
+#ccflags='-DUSE_NEXT_CTYPE -DUSE_PERL_SBRK'
 #usemymalloc='y'
 # use the following two lines if you have perl5.003_22 or better and
 # do not encounter intermittent core dumps.
diff --git a/hints/next_4.sh b/hints/next_4.sh
index d1d0398dd9..8bc623a9e4 100644
--- a/hints/next_4.sh
+++ b/hints/next_4.sh
@@ -18,7 +18,7 @@ libc='/NextLibrary/Frameworks/System.framework/System'
 
 ldflags='-dynamic -prebind'
 lddlflags='-dynamic -bundle -undefined suppress'
-ccflags='-dynamic -fno-common -DUSE_NEXT_CTYPE -DUSE_PERL_SBRK -DHIDEMYMALLOC'
+ccflags='-dynamic -fno-common -DUSE_NEXT_CTYPE -DUSE_PERL_SBRK'
 cccdlflags='none'
 ld='cc'
 #optimize='-g -O'
diff --git a/hints/qnx.sh b/hints/qnx.sh
index b53a33d737..06d9010144 100644
--- a/hints/qnx.sh
+++ b/hints/qnx.sh
@@ -98,13 +98,9 @@ libc='/usr/lib/clib3r.lib'
 # constructs make a lot of noise, so I turn those warnings off.
 # A few still remain...
 #
-# HIDEMYMALLOC is necessary if using mymalloc since it is very
-# tricky (though not impossible) to totally replace the watcom
-# malloc/free set.
-#
 # unix.h is required as a general rule for unixy applications.
 #----------------------------------------------------------------
-ccflags='-DHIDEMYMALLOC -mf -w4 -Wc,-wcd=202 -Wc,-wcd=203 -Wc,-wcd=302 -Wc,-fi=unix.h'
+ccflags='-mf -w4 -Wc,-wcd=202 -Wc,-wcd=203 -Wc,-wcd=302 -Wc,-fi=unix.h'
 
 #----------------------------------------------------------------
 # ldflags: