From: panne <unknown>
Date: Mon, 1 Apr 2002 11:18:19 +0000 (+0000)
Subject: [project @ 2002-04-01 11:18:18 by panne]
X-Git-Tag: Approx_11550_changesets_converted~2195
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=a55ebc70b9874176d4892fbfb03935580a9c3837;p=ghc-hetmet.git

[project @ 2002-04-01 11:18:18 by panne]
"warning: unused variable"-police
---

diff --git a/ghc/rts/Linker.c b/ghc/rts/Linker.c
index 7fbeee0..1dd4b0f 100644
--- a/ghc/rts/Linker.c
+++ b/ghc/rts/Linker.c
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: Linker.c,v 1.85 2002/03/29 20:46:50 krasimir Exp $
+ * $Id: Linker.c,v 1.86 2002/04/01 11:18:18 panne Exp $
  *
  * (c) The GHC Team, 2000, 2001
  *
@@ -2144,9 +2144,11 @@ do_Elf32_Rela_relocations ( ObjectCode* oc, char* ehdrC,
    for (j = 0; j < nent; j++) {
       Elf32_Addr  offset = rtab[j].r_offset;
       Elf32_Word  info   = rtab[j].r_info;
+#     if defined(sparc_TARGET_ARCH) || defined(DEBUG)
       Elf32_Sword addend = rtab[j].r_addend;
+      Elf32_Addr  A  = addend;
+#     endif
       Elf32_Addr  P  = ((Elf32_Addr)targ) + offset;
-      Elf32_Addr  A  = addend; /* Do not delete this; it is used on sparc. */
       Elf32_Addr  S;
 #     if defined(sparc_TARGET_ARCH)
       /* This #ifdef only serves to avoid unused-var warnings. */
diff --git a/ghc/rts/Schedule.c b/ghc/rts/Schedule.c
index f40e457..8a47443 100644
--- a/ghc/rts/Schedule.c
+++ b/ghc/rts/Schedule.c
@@ -1,5 +1,5 @@
 /* ---------------------------------------------------------------------------
- * $Id: Schedule.c,v 1.134 2002/03/12 13:57:11 simonmar Exp $
+ * $Id: Schedule.c,v 1.135 2002/04/01 11:18:19 panne Exp $
  *
  * (c) The GHC Team, 1998-2000
  *
@@ -2248,8 +2248,6 @@ take_off_run_queue(StgTSO *tso) {
 void
 GetRoots(evac_fn evac)
 {
-  StgMainThread *m;
-
 #if defined(GRAN)
   {
     nat i;
@@ -3087,7 +3085,9 @@ raiseAsync(StgTSO *tso, StgClosure *exception)
      * top of the CATCH_FRAME ready to enter.
      */
     if (get_itbl(su)->type == CATCH_FRAME && exception != NULL) {
+#ifdef PROFILING
       StgCatchFrame *cf = (StgCatchFrame *)su;
+#endif
       StgClosure *raise;
 
       /* we've got an exception to raise, so let's pass it to the