<short summary of the 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-28) unstable; urgency=medium

  * Version_2_6_13pre35; restore hppa build

Gbp-Pq: Name Version_2_6_13pre36

diff --git a/o/makefile b/o/makefile
index 7494e3f4d6a76a28a0aa58939d326ff1c2714fe0..57db00ea508d9b54793fcd858dc01f04afa3b74c 100644 (file)
--- 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) 
 
 prelink.o: prelink.c $(DECL)
-       $(CC) -fPIE -c $(CFLAGS) $(DEFS) $*.c $(AUX_INFO) 
+       $(CC) -fPIE -c $(filter-out -pg,$(CFLAGS)) $(DEFS) $*.c $(AUX_INFO)
 
 %.o: %.c $(DECL)
        $(CC) -c $(CFLAGS) $(DEFS) $*.c $(AUX_INFO) 

diff --git a/o/sfasli.c b/o/sfasli.c
index 171c51ae920f801b1ef1a47b135230fc63decd24..bced5424c79da2de50ce8c269d60f9e4e41ef07f 100755 (executable)
--- a/o/sfasli.c
+++ b/o/sfasli.c
@@ -111,46 +111,17 @@ LFD(build_symbol_table)(void) {
 
 }
 
-extern int mcount();
-extern int _mcount();
-extern int __divdi3();
-extern int __moddi3();
-extern int __udivdi3();
-extern int __umoddi3();
-extern void sincos(double,double *,double *);
-extern int __divsi3();
-extern int __modsi3();
-extern int __udivsi3();
-extern int __umodsi3();
-extern int $$divI();
-extern int $$divU();
-extern int $$remI();
-extern int $$remU();
-extern int __divq();
-extern int __divqu();
-extern int __remq();
-extern int __remqu();
-
-#ifndef DARWIN
 #ifndef _WIN32
 int
 use_symbols(double d,...) {
 
-  sincos(d,&d,&d);
-
-#ifdef GCL_GPROF
-  _mcount();
-#endif
-  
-  return (int)d;
+#ifndef DARWIN
+  extern void sincos(double,double *,double *);
 
-}
-#endif
+  sincos(d,&d,&d);
 #else
-int
-use_symbols(double d,...) {
-
   d=sin(d)+cos(d);
+#endif
 
   return (int)d;