Do away with memory models cruft. Sorry, PDP users.

p4raw-id: //depot/metaconfig@7041

diff --git a/U/modified/cc.U b/U/modified/cc.U
index b7d3ede..af4dd43 100644 (file)
--- a/U/modified/cc.U
+++ b/U/modified/cc.U
@@ -26,68 +26,25 @@
 ?RCS: Revision 3.0  1993/08/18  12:05:30  ram
 ?RCS: Baseline for dist 3.0 netwide release.
 ?RCS:
-?MAKE:cc: cat contains sysman +large cpp \
-       Mcc Myread Guess Options Oldconfig Loc test Checkcc
+?MAKE:cc: cpp Myread Guess Options Oldconfig Loc test Checkcc
 ?MAKE: -pick add $@ %<
 ?S:cc:
 ?S:    This variable holds the name of a command to execute a C compiler which
 ?S:    can resolve multiple global references that happen to have the same
-?S:    name.  Usual values are 'cc', 'Mcc', 'cc -M', and 'gcc'.
-?S:    Fervent ANSI compilers may be called 'c89'. AIX has xlc.
+?S:    name.  Usual values are 'cc' and 'gcc'.
+?S:    Fervent ANSI compilers may be called 'c89'.  AIX has xlc.
 ?S:.
 ?F:!cc.cbu
 ?D:cc='cc'
 ?LINT:change cpp
 ?LINT:extern ldflags
-: 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
-?X: I've received sensible complaints about how this prompt.  It's
-?X: wordy, hard for the novice to check out, and almost never relevant.
-?X: I'll only include it if it looks like we need Mcc or cc -M, though
-?X: I have no idea if anyone ever needs them anymore.  --A.D.  2/1998.
-       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.

diff --git a/U/modified/libpth.U b/U/modified/libpth.U
index 10cc0eb..9f1354b 100644 (file)
--- a/U/modified/libpth.U
+++ b/U/modified/libpth.U
@@ -69,9 +69,7 @@
 ?INIT:loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib"
 ?INIT:
 ?INIT:: general looking path for locating libraries
-?X:    I don't know why the large & small libraries are in this order.
-?INIT:glibpth="/usr/lib/large /lib /usr/lib $xlibpth"
-?INIT:glibpth="$glibpth /lib/large /usr/lib/small /lib/small"
+?INIT:glibpth="/lib /usr/lib $xlibpth"
 ?INIT:glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib"
 ?X:    /shlib is for Digital Unix 4.0
 ?X:    /usr/shlib is for OSF/1 systems.