From: Jarkko Hietaniemi <jhi@iki.fi>
Date: Fri, 8 Sep 2000 21:18:10 +0000 (+0000)
Subject: Do away with memory models cruft. Sorry, PDP users.
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=5869b1f143426909d25f97cd2df1d47cc4159ed3;p=p5sagit%2Fp5-mst-13.2.git
Do away with memory models cruft. Sorry, PDP users.
p4raw-id: //depot/perl@7041
---
diff --git a/Configure b/Configure
index 55d1e6b..8324d42 100755
--- a/Configure
+++ b/Configure
@@ -20,7 +20,7 @@
# $Id: Head.U,v 3.0.1.9 1997/02/28 15:02:09 ram Exp $
#
-# Generated on Sat Sep 2 18:40:07 EET DST 2000 [metaconfig 3.0 PL70]
+# Generated on Fri Sep 8 23:42:12 EET DST 2000 [metaconfig 3.0 PL70]
# (with additional metaconfig patches by perlbug@perl.org)
cat >/tmp/c1$$ <<EOF
@@ -761,12 +761,6 @@ installman3dir=''
man3dir=''
man3direxp=''
man3ext=''
-huge=''
-large=''
-medium=''
-models=''
-small=''
-split=''
modetype=''
multiarch=''
mydomain=''
@@ -997,8 +991,7 @@ loclibpth="/usr/local/lib /opt/local/lib /usr/gnu/lib"
loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib"
: general looking path for locating libraries
-glibpth="/usr/lib/large /lib /usr/lib $xlibpth"
-glibpth="$glibpth /lib/large /usr/lib/small /lib/small"
+glibpth="/lib /usr/lib $xlibpth"
glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib"
test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth"
test -f /shlib/libc.so && glibpth="/shlib $glibpth"
@@ -2888,174 +2881,6 @@ esac
set usemultiplicity
eval $setvar
-: determine where manual pages are on this system
-echo " "
-case "$sysman" in
-'')
- syspath='/usr/man/man1 /usr/man/mann /usr/man/manl /usr/man/local/man1'
- syspath="$syspath /usr/man/u_man/man1 /usr/share/man/man1"
- syspath="$syspath /usr/catman/u_man/man1 /usr/man/l_man/man1"
- syspath="$syspath /usr/local/man/u_man/man1 /usr/local/man/l_man/man1"
- syspath="$syspath /usr/man/man.L /local/man/man1 /usr/local/man/man1"
- sysman=`./loc . /usr/man/man1 $syspath`
- ;;
-esac
-if $test -d "$sysman"; then
- echo "System manual is in $sysman." >&4
-else
- echo "Could not find manual pages in source form." >&4
-fi
-
-: see what memory models we can support
-case "$models" in
-'')
- $cat >pdp11.c <<'EOP'
-int main() {
-#ifdef pdp11
- exit(0);
-#else
- exit(1);
-#endif
-}
-EOP
- case "$cc" in
- '') modelcc="$cc" ;;
- *) modelcc="cc" ;;
- esac
- ( $modelcc -o pdp11 pdp11.c ) >/dev/null 2>&1
- if $test -f pdp11 && ./pdp11 2>/dev/null; then
- dflt='unsplit split'
- else
- tans=`./loc . X /lib/small /lib/large /usr/lib/small /usr/lib/large /lib/medium /usr/lib/medium /lib/huge`
- case "$tans" in
- X) dflt='none';;
- *) if $test -d /lib/small || $test -d /usr/lib/small; then
- dflt='small'
- else
- dflt=''
- fi
- if $test -d /lib/medium || $test -d /usr/lib/medium; then
- dflt="$dflt medium"
- fi
- if $test -d /lib/large || $test -d /usr/lib/large; then
- dflt="$dflt large"
- fi
- if $test -d /lib/huge || $test -d /usr/lib/huge; then
- dflt="$dflt huge"
- fi
- esac
- fi;;
-*) dflt="$models";;
-esac
-$cat <<EOM
-
-Some systems have different model sizes. On most systems they are called
-small, medium, large, and huge. On the PDP11 they are called unsplit and
-split. If your system doesn't support different memory models, say "none".
-If you wish to force everything to one memory model, say "none" here and
-put the appropriate flags later when it asks you for other cc and ld flags.
-Venix systems may wish to put "none" and let the compiler figure things out.
-(In the following question multiple model names should be space separated.)
-
-The default for most systems is "none".
-
-EOM
-rp="Which memory models are supported?"
-. ./myread
-models="$ans"
-
-case "$models" in
-none)
- small=''
- medium=''
- large=''
- huge=''
- unsplit=''
- split=''
- ;;
-*split)
- case "$split" in
- '') if $contains '\-i' $sysman/ld.1 >/dev/null 2>&1 || \
- $contains '\-i' $sysman/cc.1 >/dev/null 2>&1; then
- dflt='-i'
- else
- dflt='none'
- fi;;
- *) dflt="$split";;
- esac
- rp="What flag indicates separate I and D space?"
- . ./myread
- tans="$ans"
- case "$tans" in
- none) tans='';;
- esac
- split="$tans"
- unsplit='';;
-*large*|*small*|*medium*|*huge*)
- case "$models" in
- *large*)
- case "$large" in
- '') dflt='-Ml';;
- *) dflt="$large";;
- esac
- rp="What flag indicates large model?"
- . ./myread
- tans="$ans"
- case "$tans" in
- none) tans='';
- esac
- large="$tans";;
- *) large='';;
- esac
- case "$models" in
- *huge*) case "$huge" in
- '') dflt='-Mh';;
- *) dflt="$huge";;
- esac
- rp="What flag indicates huge model?"
- . ./myread
- tans="$ans"
- case "$tans" in
- none) tans='';
- esac
- huge="$tans";;
- *) huge="$large";;
- esac
- case "$models" in
- *medium*) case "$medium" in
- '') dflt='-Mm';;
- *) dflt="$medium";;
- esac
- rp="What flag indicates medium model?"
- . ./myread
- tans="$ans"
- case "$tans" in
- none) tans='';
- esac
- medium="$tans";;
- *) medium="$large";;
- esac
- case "$models" in
- *small*) case "$small" in
- '') dflt='none';;
- *) dflt="$small";;
- esac
- rp="What flag indicates small model?"
- . ./myread
- tans="$ans"
- case "$tans" in
- none) tans='';
- esac
- small="$tans";;
- *) small='';;
- esac
- ;;
-*)
- echo "Unrecognized memory models--you may have to edit Makefile.SH" >&4
- ;;
-esac
-$rm -f pdp11.* pdp11
-
: make some quick guesses about what we are up against
echo " "
$echo $n "Hmm... $c"
@@ -3151,51 +2976,13 @@ chmod +x bsd usg v7 osf1 eunice xenix venix os2
$eunicefix bsd usg v7 osf1 eunice xenix venix os2
$rm -f foo
-: see if we need a special compiler
-echo " "
-if ./usg; then
- case "$cc" in
- '') case "$Mcc" in
- /*) dflt='Mcc';;
- *) case "$large" in
- -M*) dflt='cc';;
- *) if $contains '\-M' $sysman/cc.1 >/dev/null 2>&1 ; then
- if $contains '\-M' $sysman/cpp.1 >/dev/null 2>&1; then
- dflt='cc'
- else
- dflt='cc -M'
- fi
- else
- dflt='cc'
- fi;;
- esac;;
- esac;;
- *) dflt="$cc";;
- esac
- case "$dflt" in
- *M*) $cat <<'EOM'
-On some older systems the default C compiler will not resolve multiple global
-references that happen to have the same name. On some such systems the "Mcc"
-command may be used to force these to be resolved. On other systems a "cc -M"
-command is required. (Note that the -M flag on other systems indicates a
-memory model to use!) If you have the Gnu C compiler, you might wish to use
-that instead.
-
-EOM
- ;;
- esac
- rp="Use which C compiler?"
- . ./myread
- cc="$ans"
-else
- case "$cc" in
- '') dflt=cc;;
- *) dflt="$cc";;
- esac
- rp="Use which C compiler?"
- . ./myread
- cc="$ans"
-fi
+case "$cc" in
+'') dflt=cc;;
+*) dflt="$cc";;
+esac
+rp="Use which C compiler?"
+. ./myread
+cc="$ans"
: Look for a hint-file generated 'call-back-unit'. Now that the
: user has specified the compiler, we may need to set or change some
: other defaults.
@@ -6943,6 +6730,24 @@ case "$ldlibpthname" in
none) ldlibpthname='' ;;
esac
+: determine where manual pages are on this system
+echo " "
+case "$sysman" in
+'')
+ syspath='/usr/man/man1 /usr/man/mann /usr/man/manl /usr/man/local/man1'
+ syspath="$syspath /usr/man/u_man/man1 /usr/share/man/man1"
+ syspath="$syspath /usr/catman/u_man/man1 /usr/man/l_man/man1"
+ syspath="$syspath /usr/local/man/u_man/man1 /usr/local/man/l_man/man1"
+ syspath="$syspath /usr/man/man.L /local/man/man1 /usr/local/man/man1"
+ sysman=`./loc . /usr/man/man1 $syspath`
+ ;;
+esac
+if $test -d "$sysman"; then
+ echo "System manual is in $sysman." >&4
+else
+ echo "Could not find manual pages in source form." >&4
+fi
+
: determine where manual pages go
set man1dir man1dir none
eval $prefixit
@@ -15811,7 +15616,6 @@ h_fcntl='$h_fcntl'
h_sysfile='$h_sysfile'
hint='$hint'
hostcat='$hostcat'
-huge='$huge'
i16size='$i16size'
i16type='$i16type'
i32size='$i32size'
@@ -15926,7 +15730,6 @@ ivsize='$ivsize'
ivtype='$ivtype'
known_extensions='$known_extensions'
ksh='$ksh'
-large='$large'
ld='$ld'
lddlflags='$lddlflags'
ldflags='$ldflags'
@@ -15972,11 +15775,9 @@ man1ext='$man1ext'
man3dir='$man3dir'
man3direxp='$man3direxp'
man3ext='$man3ext'
-medium='$medium'
mips_type='$mips_type'
mkdir='$mkdir'
mmaptype='$mmaptype'
-models='$models'
modetype='$modetype'
more='$more'
multiarch='$multiarch'
@@ -16091,7 +15892,6 @@ sizesize='$sizesize'
sizetype='$sizetype'
sleep='$sleep'
smail='$smail'
-small='$small'
so='$so'
sockethdr='$sockethdr'
socketlib='$socketlib'
@@ -16099,7 +15899,6 @@ socksizetype='$socksizetype'
sort='$sort'
spackage='$spackage'
spitshell='$spitshell'
-split='$split'
src='$src'
ssizetype='$ssizetype'
startperl='$startperl'
diff --git a/Makefile.SH b/Makefile.SH
index 40b1db1..fa22695 100644
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -134,8 +134,6 @@ LD = $ld
LDFLAGS = $ldflags
CLDFLAGS = $ldflags
-SMALL = $small
-LARGE = $large $split
mallocsrc = $mallocsrc
mallocobj = $mallocobj
LNS = $lns
@@ -469,7 +467,7 @@ miniperl: $& miniperlmain$(OBJ_EXT) $(LIBPERL) opmini$(OBJ_EXT)
*)
$spitshell >>Makefile <<'!NO!SUBS!'
miniperl: $& miniperlmain$(OBJ_EXT) $(LIBPERL) opmini$(OBJ_EXT)
- $(LDLIBPTH) $(CC) $(LARGE) $(CLDFLAGS) -o miniperl \
+ $(LDLIBPTH) $(CC) $(CLDFLAGS) -o miniperl \
miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) $(LLIBPERL) $(libs)
$(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest
!NO!SUBS!
@@ -479,16 +477,16 @@ miniperl: $& miniperlmain$(OBJ_EXT) $(LIBPERL) opmini$(OBJ_EXT)
$spitshell >>Makefile <<'!NO!SUBS!'
perl: $& perlmain$(OBJ_EXT) $(LIBPERL) $(DYNALOADER) $(static_ext) ext.libs $(PERLEXPORT)
- $(SHRPENV) $(LDLIBPTH) $(CC) $(LARGE) $(CLDFLAGS) $(CCDLFLAGS) -o perl perlmain$(OBJ_EXT) $(DYNALOADER) $(static_ext) $(LLIBPERL) `cat ext.libs` $(libs)
+ $(SHRPENV) $(LDLIBPTH) $(CC) $(CLDFLAGS) $(CCDLFLAGS) -o perl perlmain$(OBJ_EXT) $(DYNALOADER) $(static_ext) $(LLIBPERL) `cat ext.libs` $(libs)
pureperl: $& perlmain$(OBJ_EXT) $(LIBPERL) $(DYNALOADER) $(static_ext) ext.libs $(PERLEXPORT)
- $(SHRPENV) $(LDLIBPTH) purify $(CC) $(LARGE) $(CLDFLAGS) $(CCDLFLAGS) -o pureperl perlmain$(OBJ_EXT) $(DYNALOADER) $(static_ext) $(LLIBPERL) `cat ext.libs` $(libs)
+ $(SHRPENV) $(LDLIBPTH) purify $(CC) $(CLDFLAGS) $(CCDLFLAGS) -o pureperl perlmain$(OBJ_EXT) $(DYNALOADER) $(static_ext) $(LLIBPERL) `cat ext.libs` $(libs)
purecovperl: $& perlmain$(OBJ_EXT) $(LIBPERL) $(DYNALOADER) $(static_ext) ext.libs $(PERLEXPORT)
- $(SHRPENV) $(LDLIBPTH) purecov $(CC) $(LARGE) $(CLDFLAGS) $(CCDLFLAGS) -o purecovperl perlmain$(OBJ_EXT) $(DYNALOADER) $(static_ext) $(LLIBPERL) `cat ext.libs` $(libs)
+ $(SHRPENV) $(LDLIBPTH) purecov $(CC) $(CLDFLAGS) $(CCDLFLAGS) -o purecovperl perlmain$(OBJ_EXT) $(DYNALOADER) $(static_ext) $(LLIBPERL) `cat ext.libs` $(libs)
quantperl: $& perlmain$(OBJ_EXT) $(LIBPERL) $(DYNALOADER) $(static_ext) ext.libs $(PERLEXPORT)
- $(SHRPENV) $(LDLIBPTH) quantify $(CC) $(LARGE) $(CLDFLAGS) $(CCDLFLAGS) -o quantperl perlmain$(OBJ_EXT) $(DYNALOADER) $(static_ext) $(LLIBPERL) `cat ext.libs` $(libs)
+ $(SHRPENV) $(LDLIBPTH) quantify $(CC) $(CLDFLAGS) $(CCDLFLAGS) -o quantperl perlmain$(OBJ_EXT) $(DYNALOADER) $(static_ext) $(LLIBPERL) `cat ext.libs` $(libs)
# This version, if specified in Configure, does ONLY those scripts which need
# set-id emulation. Suidperl must be setuid root. It contains the "taint"
@@ -496,7 +494,7 @@ quantperl: $& perlmain$(OBJ_EXT) $(LIBPERL) $(DYNALOADER) $(static_ext) ext.libs
# has been invoked correctly.
suidperl: $& sperl$(OBJ_EXT) perlmain$(OBJ_EXT) $(LIBPERL) $(DYNALOADER) $(static_ext) ext.libs $(PERLEXPORT)
- $(SHRPENV) $(LDLIBPTH) $(CC) $(LARGE) $(CLDFLAGS) $(CCDLFLAGS) -o suidperl perlmain$(OBJ_EXT) sperl$(OBJ_EXT) $(DYNALOADER) $(static_ext) $(LLIBPERL) `cat ext.libs` $(libs)
+ $(SHRPENV) $(LDLIBPTH) $(CC) $(CLDFLAGS) $(CCDLFLAGS) -o suidperl perlmain$(OBJ_EXT) sperl$(OBJ_EXT) $(DYNALOADER) $(static_ext) $(LLIBPERL) `cat ext.libs` $(libs)
!NO!SUBS!
diff --git a/Porting/Glossary b/Porting/Glossary
index be59c16..0899d79 100644
--- a/Porting/Glossary
+++ b/Porting/Glossary
@@ -174,8 +174,8 @@ cat (Loc.U):
cc (cc.U):
This variable holds the name of a command to execute a C compiler which
can resolve multiple global references that happen to have the same
- name. Usual values are 'cc', 'Mcc', 'cc -M', and 'gcc'.
- Fervent ANSI compilers may be called 'c89'. AIX has xlc.
+ name. Usual values are 'cc' and 'gcc'.
+ Fervent ANSI compilers may be called 'c89'. AIX has xlc.
cccdlflags (dlsrc.U):
This variable contains any special flags that might need to be
@@ -1913,12 +1913,6 @@ hostcat (nis.U):
On some systems, such as os390, there may be no equivalent
command, in which case this variable is unset.
-huge (models.U):
- This variable contains a flag which will tell the C compiler and loader
- to produce a program running with a huge memory model. If the
- huge model is not supported, contains the flag to produce large
- model programs. It is up to the Makefile to use this.
-
i16size (perlxv.U):
This variable is the size of an I16 in bytes.
@@ -2432,11 +2426,6 @@ ksh (Loc.U):
This variable is defined but not used by Configure.
The value is a plain '' and is not useful.
-large (models.U):
- This variable contains a flag which will tell the C compiler and loader
- to produce a program running with a large memory model. It is up to
- the Makefile to use this.
-
ld (dlsrc.U):
This variable indicates the program to be used to link
libraries for dynamic loading. On some systems, it is 'ld'.
@@ -2660,12 +2649,6 @@ Mcc (Loc.U):
full pathname (if any) of the Mcc program. After Configure runs,
the value is reset to a plain "Mcc" and is not useful.
-medium (models.U):
- This variable contains a flag which will tell the C compiler and loader
- to produce a program running with a medium memory model. If the
- medium model is not supported, contains the flag to produce large
- model programs. It is up to the Makefile to use this.
-
mips_type (usrinc.U):
This variable holds the environment type for the mips system.
Possible values are "BSD 4.3" and "System V".
@@ -2680,11 +2663,6 @@ mmaptype (d_mmap.U):
(and simultaneously the type of the first argument).
It can be 'void *' or 'caddr_t'.
-models (models.U):
- This variable contains the list of memory models supported by this
- system. Possible component values are none, split, unsplit, small,
- medium, large, and huge. The component values are space separated.
-
modetype (modetype.U):
This variable defines modetype to be something like mode_t,
int, unsigned short, or whatever type is used to declare file
@@ -3230,11 +3208,6 @@ smail (Loc.U):
This variable is defined but not used by Configure.
The value is a plain '' and is not useful.
-small (models.U):
- This variable contains a flag which will tell the C compiler and loader
- to produce a program running with a small memory model. It is up to
- the Makefile to use this.
-
so (so.U):
This variable holds the extension used to identify shared libraries
(also known as shared objects) on the system. Usually set to 'so'.
@@ -3264,12 +3237,6 @@ spitshell (spitshell.U):
This variable contains the command necessary to spit out a runnable
shell on this system. It is either cat or a grep '-v' for # comments.
-split (models.U):
- This variable contains a flag which will tell the C compiler and loader
- to produce a program that will run in separate I and D space, for those
- machines that support separation of instruction and data space. It is
- up to the Makefile to use this.
-
sPRId64 (quadfio.U):
This variable, if defined, contains the string used by stdio to
format 64-bit decimal numbers (format 'd') for output.
diff --git a/Porting/config.sh b/Porting/config.sh
index d82f0b3..6af2537 100644
--- a/Porting/config.sh
+++ b/Porting/config.sh
@@ -8,7 +8,7 @@
# Package name : perl5
# Source directory : /m/fs/work/work/permanent/perl/pp4/perl
-# Configuration time: Fri Sep 1 21:11:01 EET DST 2000
+# Configuration time: Fri Sep 8 23:45:25 EET DST 2000
# Configured by : jhi
# Target system : osf1 alpha.hut.fi v4.0 878 alpha
@@ -62,7 +62,7 @@ ccsymbols='__alpha=1 __LANGUAGE_C__=1 __osf__=1 __unix__=1 _LONGLONG=1 _SYSTYPE_
ccversion='V5.6-082'
cf_by='jhi'
cf_email='yourname@yourhost.yourplace.com'
-cf_time='Fri Sep 1 21:11:01 EET DST 2000'
+cf_time='Fri Sep 8 23:45:25 EET DST 2000'
charsize='1'
chgrp=''
chmod=''
@@ -430,7 +430,6 @@ h_fcntl='false'
h_sysfile='true'
hint='recommended'
hostcat='cat /etc/hosts'
-huge=''
i16size='2'
i16type='short'
i32size='4'
@@ -545,7 +544,6 @@ ivsize='8'
ivtype='long'
known_extensions='B ByteLoader DB_File Data/Dumper Devel/DProf Devel/Peek Fcntl File/Glob GDBM_File IO IPC/SysV NDBM_File ODBM_File Opcode POSIX SDBM_File Socket Storable Sys/Hostname Sys/Syslog Thread attrs re'
ksh=''
-large=''
ld='ld'
lddlflags='-shared -expect_unresolved "*" -msym -std -s'
ldflags=''
@@ -591,11 +589,9 @@ man1ext='1'
man3dir='/opt/perl/man/man3'
man3direxp='/opt/perl/man/man3'
man3ext='3'
-medium=''
mips_type=''
mkdir='mkdir'
mmaptype='void *'
-models='none'
modetype='mode_t'
more='more'
multiarch='undef'
@@ -710,7 +706,6 @@ sizesize='8'
sizetype='size_t'
sleep=''
smail=''
-small=''
so='so'
sockethdr=''
socketlib=''
@@ -718,7 +713,6 @@ socksizetype='int'
sort='sort'
spackage='Perl5'
spitshell='cat'
-split=''
src='/m/fs/work/work/permanent/perl/pp4/perl'
ssizetype='ssize_t'
startperl='#!/opt/perl/bin/perl'
diff --git a/Porting/config_H b/Porting/config_H
index eb27ac0..7213407 100644
--- a/Porting/config_H
+++ b/Porting/config_H
@@ -17,7 +17,7 @@
/*
* Package name : perl5
* Source directory : /m/fs/work/work/permanent/perl/pp4/perl
- * Configuration time: Fri Sep 1 21:11:01 EET DST 2000
+ * Configuration time: Fri Sep 8 23:45:25 EET DST 2000
* Configured by : jhi
* Target system : osf1 alpha.hut.fi v4.0 878 alpha
*/
diff --git a/cflags.SH b/cflags.SH
index ec6dc35..d215255 100755
--- a/cflags.SH
+++ b/cflags.SH
@@ -129,8 +129,8 @@ for file do
fi
: Can we perhaps use $ansi2knr here
- echo "$cc -c -DPERL_CORE $ccflags $optimize $perltype $large $split"
- eval "$also "'"$cc -DPERL_CORE -c $ccflags $optimize $perltype $large $split"'
+ echo "$cc -c -DPERL_CORE $ccflags $optimize $perltype"
+ eval "$also "'"$cc -DPERL_CORE -c $ccflags $optimize $perltype"'
. $TOP/config.sh
diff --git a/configure.com b/configure.com
index ae6141e..8556f8c 100644
--- a/configure.com
+++ b/configure.com
@@ -743,7 +743,7 @@ $ sharpbang = "$ "
$!: figure out how to guarantee sh startup !sfn
$!: find out where common programs are !sfn
$!loclist="awk/cat/comm/cp/echo/expr/find/grep/ln/ls/mkdir/rm/sed/sort/touch/tr/uniq"
-$!trylist="Mcc/byacc/cpp/csh/date/egrep/less/line/more/nroff/perl/pg/sendmail/test/uname"
+$!trylist="byacc/cpp/csh/date/egrep/less/line/more/nroff/perl/pg/sendmail/test/uname"
$! echo "I don't know where '$file' is, and my life depends on it."
$! echo "Go find a public domain implementation or fix your PATH setting!"
$! echo ""
diff --git a/epoc/config.sh b/epoc/config.sh
index 4d2a911..af89237 100644
--- a/epoc/config.sh
+++ b/epoc/config.sh
@@ -17,7 +17,6 @@ Header=''
Id='$Id'
Locker=''
Log='$Log'
-Mcc=''
RCSfile='$RCSfile'
Revision='$Revision'
Source=''
@@ -409,7 +408,6 @@ h_fcntl=''
h_sysfile=''
hint=''
hostcat=''
-huge=''
i_arpainet='define'
i_bsdioctl='undef'
i_db='undef'
@@ -502,7 +500,6 @@ installvendorlib=''
intsize='4'
known_extensions='Data/Dumper File/Glob IO Socket Fcntl'
ksh=''
-large=''
ld='echo'
lddlflags=''
ldflags=''
@@ -542,12 +539,10 @@ man1ext=''
man3dir=''
man3direxp=''
man3ext=''
-medium=''
mips=''
mips_type=''
mkdir='mkdir'
mmaptype=''
-models='none'
modetype='mode_t'
more='more'
multiarch='define'
@@ -646,7 +641,6 @@ sizesize='4'
sizetype='size_t'
sleep=''
smail=''
-small=''
so=''
socksizetype='size_t'
sockethdr=''
@@ -654,7 +648,6 @@ socketlib=''
sort='sort'
spackage=''
spitshell='cat'
-split=''
src='.'
ssizetype='long'
startperl=''
diff --git a/hints/mint.sh b/hints/mint.sh
index ab55e61..b9a7886 100644
--- a/hints/mint.sh
+++ b/hints/mint.sh
@@ -53,7 +53,6 @@ d_fsetpos='fpos_t'
gidtype='gid_t'
groupstype='gid_t'
lseektype='long'
-models='none'
modetype='mode_t'
sizetype='size_t'
timetype='time_t'
diff --git a/hints/titanos.sh b/hints/titanos.sh
index cea99f8..88a3e7a 100644
--- a/hints/titanos.sh
+++ b/hints/titanos.sh
@@ -12,7 +12,6 @@ intsize='4'
usenm='true'
nm_opt='-eh'
malloctype='void *'
-models='none'
ccflags="$ccflags -I/usr/include/net -DDEBUGGING -DSTANDARD_C"
cppflags="$cppflags -I/usr/include/net -DDEBUGGING -DSTANDARD_C"
stdchar='unsigned char'
diff --git a/hints/vmesa.sh b/hints/vmesa.sh
index bc03387..9172c29 100644
--- a/hints/vmesa.sh
+++ b/hints/vmesa.sh
@@ -294,7 +294,6 @@ make='gnumake'
mallocobj=''
mallocsrc=''
malloctype='void *'
-models='none'
netdb_hlen_type='size_t'
netdb_host_type='char *'
netdb_name_type='const char *'
diff --git a/lib/ExtUtils/MM_Unix.pm b/lib/ExtUtils/MM_Unix.pm
index 0cf3954..595d152 100644
--- a/lib/ExtUtils/MM_Unix.pm
+++ b/lib/ExtUtils/MM_Unix.pm
@@ -305,8 +305,8 @@ sub cflags {
$libperl ||= $self->{LIBPERL_A} || "libperl$self->{LIB_EXT}" ;
$libperl =~ s/\.\$\(A\)$/$self->{LIB_EXT}/;
- @cflags{qw(cc ccflags optimize large split shellflags)}
- = @Config{qw(cc ccflags optimize large split shellflags)};
+ @cflags{qw(cc ccflags optimize shellflags)}
+ = @Config{qw(cc ccflags optimize shellflags)};
my($optdebug) = "";
$cflags{shellflags} ||= '';
@@ -341,16 +341,12 @@ sub cflags {
optimize=\"$cflags{optimize}\"
perltype=\"$cflags{perltype}\"
optdebug=\"$cflags{optdebug}\"
- large=\"$cflags{large}\"
- split=\"$cflags{'split'}\"
eval '$prog'
echo cc=\$cc
echo ccflags=\$ccflags
echo optimize=\$optimize
echo perltype=\$perltype
echo optdebug=\$optdebug
- echo large=\$large
- echo split=\$split
`;
my($line);
foreach $line (@o){
@@ -368,7 +364,7 @@ sub cflags {
$cflags{optimize} = $optdebug;
}
- for (qw(ccflags optimize perltype large split)) {
+ for (qw(ccflags optimize perltype)) {
$cflags{$_} =~ s/^\s+//;
$cflags{$_} =~ s/\s+/ /g;
$cflags{$_} =~ s/\s+$//;
@@ -411,8 +407,6 @@ sub cflags {
CCFLAGS = $self->{CCFLAGS}
OPTIMIZE = $self->{OPTIMIZE}
PERLTYPE = $self->{PERLTYPE}
-LARGE = $self->{LARGE}
-SPLIT = $self->{SPLIT}
MPOLLUTE = $pollute
};
@@ -483,7 +477,7 @@ sub const_cccmd {
return '' unless $self->needs_linking();
return $self->{CONST_CCCMD} =
q{CCCMD = $(CC) -c $(INC) $(CCFLAGS) $(OPTIMIZE) \\
- $(PERLTYPE) $(LARGE) $(SPLIT) $(MPOLLUTE) $(DEFINE_VERSION) \\
+ $(PERLTYPE) $(MPOLLUTE) $(DEFINE_VERSION) \\
$(XS_DEFINE_VERSION)};
}
@@ -2370,7 +2364,7 @@ $(MAKE_APERL_FILE) : $(FIRST_MAKEFILE)
# The front matter of the linkcommand...
$linkcmd = join ' ', "\$(CC)",
- grep($_, @Config{qw(large split ldflags ccdlflags)});
+ grep($_, @Config{qw(ldflags ccdlflags)});
$linkcmd =~ s/\s+/ /g;
$linkcmd =~ s,(perl\.exp),\$(PERL_INC)/$1,;
diff --git a/win32/config.bc b/win32/config.bc
index 3fe0c4d..b617117 100644
--- a/win32/config.bc
+++ b/win32/config.bc
@@ -7,7 +7,6 @@ Header=''
Id='$Id'
Locker=''
Log='$Log'
-Mcc='Mcc'
RCSfile='$RCSfile'
Revision='$Revision'
Source=''
@@ -413,7 +412,6 @@ h_fcntl='false'
h_sysfile='true'
hint='recommended'
hostcat='ypcat hosts'
-huge=''
i16size='2'
i16type='short'
i32size='4'
@@ -529,7 +527,6 @@ ivsize='4'
ivtype='long'
known_extensions='~static_ext~ ~dynamic_ext~ ~nonxs_ext~'
ksh=''
-large=''
ld='tlink32'
lddlflags='-Tpd ~LINK_FLAGS~'
ldflags='~LINK_FLAGS~'
@@ -573,11 +570,9 @@ man1ext='1'
man3dir='~INST_TOP~~INST_VER~\man\man3'
man3direxp='~INST_TOP~~INST_VER~\man\man3'
man3ext='3'
-medium=''
mips_type=''
mkdir='mkdir'
mmaptype='void *'
-models='none'
modetype='mode_t'
more='more /e'
multiarch='undef'
@@ -688,7 +683,6 @@ sizesize='4'
sizetype='size_t'
sleep=''
smail=''
-small=''
so='dll'
sockethdr=''
socketlib=''
@@ -696,7 +690,6 @@ socksizetype='int'
sort='sort'
spackage='Perl5'
spitshell=''
-split=''
src=''
ssizetype='int'
startperl='#!perl'
diff --git a/win32/config.gc b/win32/config.gc
index 731ba39..639be82 100644
--- a/win32/config.gc
+++ b/win32/config.gc
@@ -7,7 +7,6 @@ Header=''
Id='$Id'
Locker=''
Log='$Log'
-Mcc='Mcc'
RCSfile='$RCSfile'
Revision='$Revision'
Source=''
@@ -413,7 +412,6 @@ h_fcntl='false'
h_sysfile='true'
hint='recommended'
hostcat='ypcat hosts'
-huge=''
i16size='2'
i16type='short'
i32size='4'
@@ -529,7 +527,6 @@ ivsize='4'
ivtype='long'
known_extensions='~static_ext~ ~dynamic_ext~ ~nonxs_ext~'
ksh=''
-large=''
ld='gcc'
lddlflags='-mdll ~LINK_FLAGS~'
ldflags='~LINK_FLAGS~'
@@ -573,11 +570,9 @@ man1ext='1'
man3dir='~INST_TOP~~INST_VER~\man\man3'
man3direxp='~INST_TOP~~INST_VER~\man\man3'
man3ext='3'
-medium=''
mips_type=''
mkdir='mkdir'
mmaptype='void *'
-models='none'
modetype='mode_t'
more='more /e'
multiarch='undef'
@@ -688,7 +683,6 @@ sizesize='4'
sizetype='size_t'
sleep=''
smail=''
-small=''
so='dll'
sockethdr=''
socketlib=''
@@ -696,7 +690,6 @@ socksizetype='int'
sort='sort'
spackage='Perl5'
spitshell=''
-split=''
src=''
ssizetype='int'
startperl='#!perl'
diff --git a/win32/config.vc b/win32/config.vc
index 1152d84..2dfe830 100644
--- a/win32/config.vc
+++ b/win32/config.vc
@@ -7,7 +7,6 @@ Header=''
Id='$Id'
Locker=''
Log='$Log'
-Mcc='Mcc'
RCSfile='$RCSfile'
Revision='$Revision'
Source=''
@@ -413,7 +412,6 @@ h_fcntl='false'
h_sysfile='true'
hint='recommended'
hostcat='ypcat hosts'
-huge=''
i16size='2'
i16type='short'
i32size='4'
@@ -529,7 +527,6 @@ ivsize='4'
ivtype='long'
known_extensions='~static_ext~ ~dynamic_ext~ ~nonxs_ext~'
ksh=''
-large=''
ld='link'
lddlflags='-dll ~LINK_FLAGS~'
ldflags='~LINK_FLAGS~'
@@ -573,11 +570,9 @@ man1ext='1'
man3dir='~INST_TOP~~INST_VER~\man\man3'
man3direxp='~INST_TOP~~INST_VER~\man\man3'
man3ext='3'
-medium=''
mips_type=''
mkdir='mkdir'
mmaptype='void *'
-models='none'
modetype='mode_t'
more='more /e'
multiarch='undef'
@@ -688,7 +683,6 @@ sizesize='4'
sizetype='size_t'
sleep=''
smail=''
-small=''
so='dll'
sockethdr=''
socketlib=''
@@ -696,7 +690,6 @@ socksizetype='int'
sort='sort'
spackage='Perl5'
spitshell=''
-split=''
src=''
ssizetype='int'
startperl='#!perl'
diff --git a/x2p/Makefile.SH b/x2p/Makefile.SH
index be09401..a0ba96a 100755
--- a/x2p/Makefile.SH
+++ b/x2p/Makefile.SH
@@ -34,10 +34,7 @@ cat >Makefile <<!GROK!THIS!
CC = $cc
BYACC = $byacc
LDFLAGS = $ldflags
-SMALL = $small
-LARGE = $large $split
-# XXX Perl malloc temporarily unusable (declaration collisions with
-# stdlib.h)
+# XXX Perl malloc temporarily unusable (declaration collisions with stdlib.h)
#mallocsrc = $mallocsrc
#mallocobj = $mallocobj
shellflags = $shellflags
@@ -129,7 +126,7 @@ a2p.c: a2p.y
a2p$(OBJ_EXT): a2p.c a2py.c a2p.h EXTERN.h util.h INTERN.h \
../handy.h ../config.h str.h hash.h
- $(CCCMD) $(LARGE) a2p.c
+ $(CCCMD) a2p.c
clean:
rm -f a2p *$(OBJ_EXT) $(plexe) $(plc) $(plm)
diff --git a/x2p/cflags.SH b/x2p/cflags.SH
index b5ef917..dcd97a1 100755
--- a/x2p/cflags.SH
+++ b/x2p/cflags.SH
@@ -84,8 +84,8 @@ for file do
ccflags="`echo $ccflags | sed -e 's/-DMULTIPLICITY//'`"
- echo "$cc -c $ccflags $optimize $large $split"
- eval "$also "'"$cc -c $ccflags $optimize $large $split"'
+ echo "$cc -c $ccflags $optimize"
+ eval "$also "'"$cc -c $ccflags $optimize"'
. $TOP/config.sh