projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2002-04-19 12:25:06 by simonmar]
[ghc-hetmet.git]
/
ghc
/
rts
/
Linker.c
diff --git
a/ghc/rts/Linker.c
b/ghc/rts/Linker.c
index
7fbeee0
..
597da14
100644
(file)
--- 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.87 2002/04/10 11:43:45 stolz Exp $
*
* (c) The GHC Team, 2000, 2001
*
*
* (c) The GHC Team, 2000, 2001
*
@@
-216,6
+216,7
@@
typedef struct _RtsSymbolVal {
SymX(divExactIntegerzh_fast) \
SymX(divModIntegerzh_fast) \
SymX(forkzh_fast) \
SymX(divExactIntegerzh_fast) \
SymX(divModIntegerzh_fast) \
SymX(forkzh_fast) \
+ SymX(forkProcesszh_fast) \
SymX(freeHaskellFunctionPtr) \
SymX(freeStablePtr) \
SymX(gcdIntegerzh_fast) \
SymX(freeHaskellFunctionPtr) \
SymX(freeStablePtr) \
SymX(gcdIntegerzh_fast) \
@@
-240,6
+241,7
@@
typedef struct _RtsSymbolVal {
SymX(minusIntegerzh_fast) \
SymX(mkApUpd0zh_fast) \
SymX(myThreadIdzh_fast) \
SymX(minusIntegerzh_fast) \
SymX(mkApUpd0zh_fast) \
SymX(myThreadIdzh_fast) \
+ SymX(labelThreadzh_fast) \
SymX(newArrayzh_fast) \
SymX(newBCOzh_fast) \
SymX(newByteArrayzh_fast) \
SymX(newArrayzh_fast) \
SymX(newBCOzh_fast) \
SymX(newByteArrayzh_fast) \
@@
-2144,9
+2146,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;
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_Sword addend = rtab[j].r_addend;
+ Elf32_Addr A = addend;
+# endif
Elf32_Addr P = ((Elf32_Addr)targ) + offset;
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. */
Elf32_Addr S;
# if defined(sparc_TARGET_ARCH)
/* This #ifdef only serves to avoid unused-var warnings. */