From f824769e4522fbf075c653c0c367c821ed7df08d Mon Sep 17 00:00:00 2001 From: gerd <gerd> Date: Thu, 29 May 2003 12:35:05 +0000 Subject: [PATCH] Building with cgc. * src/lisp/Config.FreeBSD (NM): Use linux-nm. * src/code/gc.lisp: Use bytes_allocated for cgc because get_bytes_allocated_{lower,higher} is only implemented for gencgc. --- code/gc.lisp | 18 ++++++++++-------- lisp/Config.FreeBSD | 2 +- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/code/gc.lisp b/code/gc.lisp index 9e33dca47..35b436a7d 100644 --- a/code/gc.lisp +++ b/code/gc.lisp @@ -5,7 +5,7 @@ ;;; Carnegie Mellon University, and has been placed in the public domain. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/gc.lisp,v 1.34 2003/04/11 15:17:45 pmai Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/gc.lisp,v 1.35 2003/05/29 12:35:05 gerd Exp $") ;;; ;;; ********************************************************************** ;;; @@ -57,15 +57,17 @@ ;; #+(or cgc gencgc) ;; (c-var-frob dynamic-usage "bytes_allocated") -#+(or cgc gencgc) +#+gencgc (progn -(alien:def-alien-routine get_bytes_allocated_lower c-call:int) -(alien:def-alien-routine get_bytes_allocated_upper c-call:int) + (alien:def-alien-routine get_bytes_allocated_lower c-call:int) + (alien:def-alien-routine get_bytes_allocated_upper c-call:int) -(defun dynamic-usage () - (dfixnum:dfixnum-pair-integer - (get_bytes_allocated_upper) (get_bytes_allocated_lower))) -) + (defun dynamic-usage () + (dfixnum:dfixnum-pair-integer + (get_bytes_allocated_upper) (get_bytes_allocated_lower)))) + +#+cgc +(c-var-frob dynamic-usage "bytes_allocated") (defun static-space-usage () (- (* lisp::*static-space-free-pointer* vm:word-bytes) diff --git a/lisp/Config.FreeBSD b/lisp/Config.FreeBSD index 3a884e451..3070b0e29 100644 --- a/lisp/Config.FreeBSD +++ b/lisp/Config.FreeBSD @@ -9,7 +9,7 @@ LD = ld CPP = cpp CFLAGS = -Wstrict-prototypes -Wall -O2 -g -DWANT_CGC -m486 ASFLAGS = -g -DWANT_CGC -NM = nm -gp +NM = $(PATH1)/linux-nm UNDEFSYMPATTERN = -Xlinker -u -Xlinker & ASSEM_SRC = x86-assem.S ARCH_SRC = x86-arch.c -- GitLab