Commit 90e04ea2 authored by Paul Eggert's avatar Paul Eggert

[admin/ChangeLog]

Remove no-longer needed getloadavg symbols.
* CPP-DEFINES (LOAD_AVE_CVT, LOAD_AVE_TYPE, FSCALE, KERNEL_FILE):
(LDAV_SYMBOL): Remove.
[src/ChangeLog]
Remove no-longer needed getloadavg symbols.
* m/alpha.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove.
* m/amdx86-64.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove.
* m/ia64.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove.
* m/ibms390.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove.
* m/macppc.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove.
* m/sparc.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove.
* m/template.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove.
* m/vax.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove.
* s/aix4-2.h (KERNEL_FILE, LDAV_SYMBOL): Remove.
* s/bsd-common.h (KERNEL_FILE, LDAV_SYMBOL): Remove #undef.
* s/hpux10-20.h (KERNEL_FILE, LOAD_AVE_TYPE, LOAD_AVE_CVT):
(LDAV_SYMBOL): Remove.
* s/unixware.h (LOAD_AVE_TYPE, LOAD_AVE_CVT, FSCALE): Remove.
* s/usg5-4-common.h (KERNEL_FILE, LDAV_SYMBOL): Remove.
parent be6d9980
...@@ -62,8 +62,6 @@ SIGTYPE ...@@ -62,8 +62,6 @@ SIGTYPE
SYSTEM_TYPE SYSTEM_TYPE
** Machine specific macros, decribed in detail in src/m/template.h ** Machine specific macros, decribed in detail in src/m/template.h
LOAD_AVE_CVT
LOAD_AVE_TYPE
VIRT_ADDR_VARIES VIRT_ADDR_VARIES
** Misc macros ** Misc macros
...@@ -111,7 +109,6 @@ EMACS_INT ...@@ -111,7 +109,6 @@ EMACS_INT
EMACS_UINT EMACS_UINT
FILE_SYSTEM_CASE FILE_SYSTEM_CASE
FLOAT_CHECK_DOMAIN FLOAT_CHECK_DOMAIN
FSCALE
GC_LISP_OBJECT_ALIGNMENT GC_LISP_OBJECT_ALIGNMENT
GC_MARK_SECONDARY_STACK GC_MARK_SECONDARY_STACK
GC_MARK_STACK GC_MARK_STACK
...@@ -193,8 +190,6 @@ HPUX ...@@ -193,8 +190,6 @@ HPUX
INTERNAL_TERMINAL INTERNAL_TERMINAL
IS_ANY_SEP IS_ANY_SEP
IS_DIRECTORY_SEP IS_DIRECTORY_SEP
KERNEL_FILE
LDAV_SYMBOL
LINKER LINKER
LINUX_VERSION_CODE LINUX_VERSION_CODE
LISP_FLOAT_TYPE LISP_FLOAT_TYPE
...@@ -381,4 +376,3 @@ vfork ...@@ -381,4 +376,3 @@ vfork
wait wait
write write
xfree xfree
2011-02-10 Paul Eggert <eggert@cs.ucla.edu>
Remove no-longer needed getloadavg symbols.
* CPP-DEFINES (LOAD_AVE_CVT, LOAD_AVE_TYPE, FSCALE, KERNEL_FILE):
(LDAV_SYMBOL): Remove.
2011-02-05 Glenn Morris <rgm@gnu.org> 2011-02-05 Glenn Morris <rgm@gnu.org>
* bzrmerge.el (bzrmerge-warning-buffer): New constant. * bzrmerge.el (bzrmerge-warning-buffer): New constant.
......
2011-02-10 Paul Eggert <eggert@cs.ucla.edu> 2011-02-10 Paul Eggert <eggert@cs.ucla.edu>
Remove no-longer needed getloadavg symbols.
* m/alpha.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove.
* m/amdx86-64.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove.
* m/ia64.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove.
* m/ibms390.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove.
* m/macppc.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove.
* m/sparc.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove.
* m/template.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove.
* m/vax.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove.
* s/aix4-2.h (KERNEL_FILE, LDAV_SYMBOL): Remove.
* s/bsd-common.h (KERNEL_FILE, LDAV_SYMBOL): Remove #undef.
* s/hpux10-20.h (KERNEL_FILE, LOAD_AVE_TYPE, LOAD_AVE_CVT):
(LDAV_SYMBOL): Remove.
* s/unixware.h (LOAD_AVE_TYPE, LOAD_AVE_CVT, FSCALE): Remove.
* s/usg5-4-common.h (KERNEL_FILE, LDAV_SYMBOL): Remove.
Import getloadavg module from gnulib. Import getloadavg module from gnulib.
* deps.mk (getloadavg.o): Remove; gnulib now does this. * deps.mk (getloadavg.o): Remove; gnulib now does this.
* lisp.h (getloadavg) [!defined HAVE_GETLOADAVG]: Remove; gnulib * lisp.h (getloadavg) [!defined HAVE_GETLOADAVG]: Remove; gnulib
...@@ -29,12 +29,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -29,12 +29,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* __alpha defined automatically */ /* __alpha defined automatically */
/* Data type of load average, as read out of kmem. */
#define LOAD_AVE_TYPE long
/* Convert that into an integer that is 100 for a load average of 1.0 */
#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
#ifdef __ELF__ #ifdef __ELF__
#if !defined(GNU_LINUX) && !defined(__NetBSD__) #if !defined(GNU_LINUX) && !defined(__NetBSD__)
...@@ -57,4 +51,3 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -57,4 +51,3 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
Define DBL_MIN_REPLACEMENT to be the next value larger than DBL_MIN: Define DBL_MIN_REPLACEMENT to be the next value larger than DBL_MIN:
this avoids the assembler bug. */ this avoids the assembler bug. */
#define DBL_MIN_REPLACEMENT 2.2250738585072019e-308 #define DBL_MIN_REPLACEMENT 2.2250738585072019e-308
...@@ -30,12 +30,5 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -30,12 +30,5 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#define EMACS_INT long #define EMACS_INT long
#define EMACS_UINT unsigned long #define EMACS_UINT unsigned long
/* Data type of load average, as read out of kmem. */
#define LOAD_AVE_TYPE long
/* Convert that into an integer that is 100 for a load average of 1.0 */
#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
/* Define XPNTR to avoid or'ing with DATA_SEG_BITS */ /* Define XPNTR to avoid or'ing with DATA_SEG_BITS */
#undef DATA_SEG_BITS #undef DATA_SEG_BITS
...@@ -30,12 +30,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -30,12 +30,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#define EMACS_INT long #define EMACS_INT long
#define EMACS_UINT unsigned long #define EMACS_UINT unsigned long
/* Data type of load average, as read out of kmem. */
#define LOAD_AVE_TYPE long
/* Convert that into an integer that is 100 for a load average of 1.0 */
#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
#ifdef REL_ALLOC #ifdef REL_ALLOC
#ifndef _MALLOC_INTERNAL #ifndef _MALLOC_INTERNAL
/* "char *" because ralloc.c defines it that way. gmalloc.c thinks it /* "char *" because ralloc.c defines it that way. gmalloc.c thinks it
...@@ -45,4 +39,3 @@ extern char *r_alloc (), *r_re_alloc (); ...@@ -45,4 +39,3 @@ extern char *r_alloc (), *r_re_alloc ();
extern void r_alloc_free (); extern void r_alloc_free ();
#endif /* not _MALLOC_INTERNAL */ #endif /* not _MALLOC_INTERNAL */
#endif /* REL_ALLOC */ #endif /* REL_ALLOC */
...@@ -18,12 +18,6 @@ You should have received a copy of the GNU General Public License ...@@ -18,12 +18,6 @@ You should have received a copy of the GNU General Public License
along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Data type of load average, as read out of kmem. */
#define LOAD_AVE_TYPE long
/* Convert that into an integer that is 100 for a load average of 1.0 */
#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
/* Define VIRT_ADDR_VARIES if the virtual addresses of /* Define VIRT_ADDR_VARIES if the virtual addresses of
pure and impure space as loaded can vary, and even their pure and impure space as loaded can vary, and even their
relative order cannot be relied on. relative order cannot be relied on.
...@@ -31,4 +25,3 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -31,4 +25,3 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
Otherwise Emacs assumes that text space precedes data space, Otherwise Emacs assumes that text space precedes data space,
numerically. */ numerically. */
#define VIRT_ADDR_VARIES #define VIRT_ADDR_VARIES
...@@ -17,15 +17,8 @@ GNU General Public License for more details. ...@@ -17,15 +17,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Data type of load average, as read out of kmem. */
#define LOAD_AVE_TYPE long
/* Convert that into an integer that is 100 for a load average of 1.0 */
#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
#ifdef _ARCH_PPC64 #ifdef _ARCH_PPC64
#ifndef _LP64 #ifndef _LP64
#define _LP64 #define _LP64
#endif #endif
#endif #endif
...@@ -19,12 +19,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -19,12 +19,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* __sparc__ is defined by the compiler by default. */ /* __sparc__ is defined by the compiler by default. */
/* Data type of load average, as read out of kmem. */
#define LOAD_AVE_TYPE long
/* Convert that into an integer that is 100 for a load average of 1.0 */
#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
#ifdef __arch64__ /* GCC, 64-bit ABI. */ #ifdef __arch64__ /* GCC, 64-bit ABI. */
#define BITS_PER_LONG 64 #define BITS_PER_LONG 64
...@@ -34,4 +28,3 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -34,4 +28,3 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#endif #endif
#endif /* __arch64__ */ #endif /* __arch64__ */
...@@ -21,12 +21,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -21,12 +21,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
does not define it automatically. does not define it automatically.
Ones defined so far include m68k and many others */ Ones defined so far include m68k and many others */
/* Data type of load average, as read out of kmem. */
#define LOAD_AVE_TYPE long
/* Convert that into an integer that is 100 for a load average of 1.0 */
#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
/* Define VIRT_ADDR_VARIES if the virtual addresses of /* Define VIRT_ADDR_VARIES if the virtual addresses of
pure and impure space as loaded can vary, and even their pure and impure space as loaded can vary, and even their
relative order cannot be relied on. relative order cannot be relied on.
...@@ -46,4 +40,3 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -46,4 +40,3 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
If you've just fixed a problem in an existing configuration file, If you've just fixed a problem in an existing configuration file,
you should also check `etc/MACHINES' to make sure its descriptions you should also check `etc/MACHINES' to make sure its descriptions
of known problems in that configuration should be updated. */ of known problems in that configuration should be updated. */
...@@ -20,14 +20,4 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -20,14 +20,4 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* #define vax -- appears to be done automatically */ /* #define vax -- appears to be done automatically */
/* USG systems I know of running on Vaxes do not actually
support the load average, so disable it for them. */
/* Data type of load average, as read out of kmem. */
#define LOAD_AVE_TYPE double
/* Convert that into an integer that is 100 for a load average of 1.0 */
#define LOAD_AVE_CVT(x) ((int) ((x) * 100.0))
#define HAVE_FTIME #define HAVE_FTIME
...@@ -41,12 +41,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -41,12 +41,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define HAVE_SOCKETS if system supports 4.2-compatible sockets. */ /* Define HAVE_SOCKETS if system supports 4.2-compatible sockets. */
#define HAVE_SOCKETS #define HAVE_SOCKETS
/* The file containing the kernel's symbol table is called /unix. */
#define KERNEL_FILE "/unix"
/* The kernel symbol where the load average is found is named avenrun. */
#define LDAV_SYMBOL "avenrun"
/* Special items needed to make Emacs run on this system. */ /* Special items needed to make Emacs run on this system. */
...@@ -86,4 +80,3 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -86,4 +80,3 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
Emacs currently calls xrealloc on the results of get_current_dir name, Emacs currently calls xrealloc on the results of get_current_dir name,
to avoid a crash just use the Emacs implementation for that function. */ to avoid a crash just use the Emacs implementation for that function. */
#define BROKEN_GET_CURRENT_DIR_NAME 1 #define BROKEN_GET_CURRENT_DIR_NAME 1
...@@ -37,10 +37,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -37,10 +37,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#define TABDLY OXTABS #define TABDLY OXTABS
#define TAB3 OXTABS #define TAB3 OXTABS
/* These aren't needed, since we have getloadavg. */
#undef KERNEL_FILE
#undef LDAV_SYMBOL
#define NO_TERMIO #define NO_TERMIO
/* If the system's imake configuration file defines `NeedWidePrototypes' /* If the system's imake configuration file defines `NeedWidePrototypes'
...@@ -72,12 +68,5 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -72,12 +68,5 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
a file that someone else has modified in his Emacs. */ a file that someone else has modified in his Emacs. */
#define CLASH_DETECTION #define CLASH_DETECTION
/* The file containing the kernel's symbol table is called /vmunix. */
#define KERNEL_FILE "/vmunix"
/* The kernel symbol where the load average is found is named _avenrun. */
#define LDAV_SYMBOL "_avenrun"
/* Send signals to subprocesses by "typing" special chars at them. */ /* Send signals to subprocesses by "typing" special chars at them. */
#define SIGNALS_VIA_CHARACTERS #define SIGNALS_VIA_CHARACTERS
...@@ -47,9 +47,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -47,9 +47,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
a file that someone else has modified in his Emacs. */ a file that someone else has modified in his Emacs. */
#define CLASH_DETECTION #define CLASH_DETECTION
/* The symbol in the kernel where the load average is found
depends on the cpu type, so we let the m- files define LDAV_SYMBOL. */
/* Special hacks needed to make Emacs run on this system. */ /* Special hacks needed to make Emacs run on this system. */
/* In hpux, the symbol SIGIO is defined, but the feature /* In hpux, the symbol SIGIO is defined, but the feature
...@@ -91,9 +88,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -91,9 +88,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#undef random #undef random
#undef HAVE_RANDOM #undef HAVE_RANDOM
/* AlainF 20-Jul-1996 says this is right. */
#define KERNEL_FILE "/stand/vmunix"
/* Rainer Malzbender <rainer@displaytech.com> says definining /* Rainer Malzbender <rainer@displaytech.com> says definining
HAVE_XRMSETDATABASE allows Emacs to compile on HP-UX 10.20 using GCC. */ HAVE_XRMSETDATABASE allows Emacs to compile on HP-UX 10.20 using GCC. */
...@@ -119,18 +113,3 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -119,18 +113,3 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#define DATA_SEG_BITS 0x40000000 #define DATA_SEG_BITS 0x40000000
#define DATA_START 0x40000000 #define DATA_START 0x40000000
/* Data type of load average, as read out of kmem. */
#define LOAD_AVE_TYPE double
/* Convert that into an integer that is 100 for a load average of 1.0 */
#define LOAD_AVE_CVT(x) ((int) (x * 100.0))
/* The kernel symbol where the load average is found is named _avenrun.
At this time there are two major flavors of hp-ux (there is the s800
and s300 (s200) flavors). The differences are thusly moved to the
corresponding machine description file. */
/* No underscore please. */
#define LDAV_SYMBOL "avenrun"
...@@ -49,14 +49,4 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -49,14 +49,4 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
pty_name[sizeof(pty_name) - 1] = 0; \ pty_name[sizeof(pty_name) - 1] = 0; \
} }
/* Data type of load average, as read out of kmem. */
#define LOAD_AVE_TYPE long
/* Convert that into an integer that is 100 for a load average of 1.0 */
/* This is totally uncalibrated. */
#define LOAD_AVE_CVT(x) ((int) (((double) (x)) * 100.0 / FSCALE))
#define FSCALE 256.0
#define PENDING_OUTPUT_COUNT(FILE) ((FILE)->__ptr - (FILE)->__base) #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->__ptr - (FILE)->__base)
...@@ -30,12 +30,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -30,12 +30,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
It sets the Lisp variable system-type. */ It sets the Lisp variable system-type. */
#define SYSTEM_TYPE "usg-unix-v" #define SYSTEM_TYPE "usg-unix-v"
/* The file containing the kernel's symbol table is called /unix. */
#define KERNEL_FILE "/unix"
/* The kernel symbol where the load average is found is named avenrun. */
#define LDAV_SYMBOL "avenrun"
/* setjmp and longjmp can safely replace _setjmp and _longjmp, /* setjmp and longjmp can safely replace _setjmp and _longjmp,
but they will run slower. */ but they will run slower. */
#define _setjmp setjmp #define _setjmp setjmp
...@@ -105,4 +99,3 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -105,4 +99,3 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* This definition was suggested for next release. So give it a try. */ /* This definition was suggested for next release. So give it a try. */
#define HAVE_SOCKETS #define HAVE_SOCKETS
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment