Merge pull request #441 from k-okada/fix_blhc

Author: k-okada

lisp/comp/comp.l

@@ -212,12 +212,14 @@
 	    initcodes		;initialize codes in "eusmain"
 	    flets
 	    unwind-frames	;frames need to unwound when jumps
+	    symstr
 	    )))
+(defvar *compiler-symid* 0)
 
 (eval-when (load eval)
 (defmethod compiler
  (:genlabel (head &optional (suffix ""))
-   (concatenate string (string (gensym head)) suffix))
+   (format nil "~A~A~A~A" symstr head (incf *compiler-symid*) suffix))
  (:gencname-tail 
   (&rest lnames)
   ;; NOTE: Deprecated. Use lisp::gencname-tail instead. (2017/10/19 furushchev)
@@ -1226,6 +1228,7 @@
 		 (verbose *verbose*)
 		 (entry (lisp::gencname-tail (pathname-name file)))
 		 (o))
+   (setq symstr (subseq entry 0 8))
    (if (and (integerp c-optimize)
 	    (> c-optimize 0)
 	    ;; (not (member :gcc *features*))
@@ -1429,7 +1432,8 @@
   (setq trans (instantiate  translator)
 	idtable (instance identifier-table :init)
         scope 0
-	closure-level 0)
+	closure-level 0
+	symstr "")
   self)
    ) ; defmethod
 )    ; eval-when

lisp/image/jpeg/makefile

@@ -28,6 +28,8 @@ endif
 else
 CC += -fPIC
 endif
+else
+CC += -fPIC
 endif
 ifeq ($(ARCHDIR), Darwin)
 CC += -I/opt/local/lib/jpeg6b/include -I/opt/local/include
@@ -42,7 +44,7 @@ LIBDIR=$(EUSDIR)/$(ARCH)/lib
 OBJDIR=$(EUSDIR)/$(ARCH)/obj
 OBJFILES= $(OBJDIR)/jpegmemcd.o $(OBJDIR)/jmemsrc.o $(OBJDIR)/jmemdst.o
 $(LIBDIR)/jpegmemcd.$(LSFX):	$(OBJFILES)
-	$(LD) $(LDFLAGS) -o $(LIBDIR)/jpegmemcd.$(LSFX) $(OBJDIR)/jpegmemcd.o $(OBJDIR)/jmemsrc.o $(OBJDIR)/jmemdst.o -ljpeg
+	$(LD) -fPIC $(LDFLAGS) -o $(LIBDIR)/jpegmemcd.$(LSFX) $(OBJDIR)/jpegmemcd.o $(OBJDIR)/jmemsrc.o $(OBJDIR)/jmemdst.o -ljpeg
 
 $(OBJDIR)/jpegmemcd.o:	jpegmemcd.c
 	$(CC) $(CFLAGS) -c -o $@ $^