From 9cdfafd2cd9eaa88f2b9aa58632e97551bf060f1 Mon Sep 17 00:00:00 2001 From: Camm Maguire Date: Sun, 13 Nov 2022 12:55:14 +0000 Subject: [PATCH] TODO: Put a short summary on the line above and replace this paragraph with a longer explanation of this change. Complete the meta-information with other relevant fields (see below for details). To make it easier, the information below has been extracted from the changelog. Adjust it or drop it. gcl (2.6.12-60) unstable; urgency=medium * list_order.17 Gbp-Pq: Name list_order.18 --- cmpnew/gcl_cmpmain.lsp | 8 +++++++- o/makefile | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/cmpnew/gcl_cmpmain.lsp b/cmpnew/gcl_cmpmain.lsp index 5c41c2c..d820537 100755 --- a/cmpnew/gcl_cmpmain.lsp +++ b/cmpnew/gcl_cmpmain.lsp @@ -483,6 +483,12 @@ Cannot compile ~a.~%" (defvar *use-buggy* nil) +(defun remove-flag (flag flags) + (let ((i (search flag flags))) + (if i + (concatenate 'string (subseq flags 0 i) (remove-flag flag (subseq flags (+ i (length flag))))) + flags))) + (defun compiler-command (&rest args &aux na ) (declare (special *c-debug*)) (let ((dirlist (pathname-directory (first args))) @@ -493,7 +499,7 @@ Cannot compile ~a.~%" (setq na (namestring (make-pathname :name name :type (pathname-type(first args))))) (format nil "~a ~a -I~a ~a ~a -c ~a -o ~a ~a" - *cc* + (if *prof-p* (remove-flag "-fomit-frame-pointer" *cc*) *cc*) (if *prof-p* " -pg " "") (concatenate 'string si::*system-directory* "../h") (if (and (boundp '*c-debug*) *c-debug*) " -g " "") diff --git a/o/makefile b/o/makefile index 1e5436b..4a023a3 100644 --- a/o/makefile +++ b/o/makefile @@ -34,7 +34,7 @@ boot.o: boot.c $(DECL) boot.h $(CC) -c $(CFLAGS) $(DEFS) -fPIC $*.c $(AUX_INFO) gprof.o: gprof.c $(DECL) - $(CC) -c $(CFLAGS) $(DEFS) -pg $*.c $(AUX_INFO) + $(CC) -c $(filter-out -fomit-frame-pointer,$(CFLAGS)) $(DEFS) -pg $*.c $(AUX_INFO) prelink.o: prelink.c $(DECL) $(CC) -c $(filter-out -pg,$(CFLAGS)) -fPIE $(DEFS) $*.c $(AUX_INFO) -- 2.30.2