385abae
Description: <short summary of the patch>
385abae
 TODO: Put a short summary on the line above and replace this paragraph
385abae
 with a longer explanation of this change. Complete the meta-information
385abae
 with other relevant fields (see below for details). To make it easier, the
385abae
 information below has been extracted from the changelog. Adjust it or drop
385abae
 it.
385abae
 .
385abae
 gcl (2.6.12-60) unstable; urgency=medium
385abae
 .
385abae
   * list_order.17
385abae
Author: Camm Maguire <camm@debian.org>
385abae
385abae
---
385abae
The information above should follow the Patch Tagging Guidelines, please
385abae
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
385abae
are templates for supplementary fields that you might want to add:
385abae
385abae
Origin: <vendor|upstream|other>, <url of original patch>
385abae
Bug: <url in upstream bugtracker>
385abae
Bug-Debian: https://bugs.debian.org/<bugnumber>
385abae
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
385abae
Forwarded: <no|not-needed|url proving that it has been forwarded>
385abae
Reviewed-By: <name and email of someone who approved the patch>
385abae
Last-Update: 2018-01-23
385abae
385abae
--- gcl-2.6.12.orig/cmpnew/gcl_cmpmain.lsp
385abae
+++ gcl-2.6.12/cmpnew/gcl_cmpmain.lsp
385abae
@@ -483,6 +483,12 @@ Cannot compile ~a.~%"
385abae
 
385abae
 (defvar *use-buggy* nil)
385abae
 
385abae
+(defun remove-flag (flag flags)
385abae
+  (let ((i (search flag flags)))
385abae
+    (if i
385abae
+	(concatenate 'string (subseq flags 0 i) (remove-flag flag (subseq flags (+ i (length flag)))))
385abae
+      flags)))
385abae
+
385abae
 (defun  compiler-command (&rest args &aux na )
385abae
   (declare (special *c-debug*))
385abae
   (let ((dirlist (pathname-directory (first args)))
385abae
@@ -493,7 +499,7 @@ Cannot compile ~a.~%"
385abae
     (setq na  (namestring
385abae
 	       (make-pathname :name name :type (pathname-type(first args)))))
385abae
    (format nil  "~a ~a -I~a ~a ~a -c ~a -o ~a ~a"
385abae
-	   *cc*
385abae
+	   (if *prof-p* (remove-flag "-fomit-frame-pointer" *cc*) *cc*)
385abae
 	   (if *prof-p* " -pg " "")
385abae
 	   (concatenate 'string si::*system-directory* "../h")
385abae
 	   (if (and (boundp '*c-debug*) *c-debug*) " -g " "")
385abae
--- gcl-2.6.12.orig/o/makefile
385abae
+++ gcl-2.6.12/o/makefile
385abae
@@ -34,7 +34,7 @@ boot.o: boot.c $(DECL) boot.h
385abae
 	$(CC) -c $(CFLAGS) $(DEFS) -fPIC $*.c $(AUX_INFO) 
385abae
 
385abae
 gprof.o: gprof.c $(DECL)
385abae
-	$(CC) -c $(CFLAGS) $(DEFS) -pg $*.c $(AUX_INFO)
385abae
+	$(CC) -c $(filter-out -fomit-frame-pointer,$(CFLAGS)) $(DEFS) -pg $*.c $(AUX_INFO)
385abae
 
385abae
 prelink.o: prelink.c $(DECL)
385abae
 	$(CC) -c $(filter-out -pg,$(CFLAGS)) -fPIE $(DEFS) $*.c $(AUX_INFO)