diff --git a/src/sys/include/ubixos/ld.h b/src/sys/include/ubixos/ld.h index a636d51..1011408 100644 --- a/src/sys/include/ubixos/ld.h +++ b/src/sys/include/ubixos/ld.h @@ -34,12 +34,15 @@ #define LD_START 0x500000 -uInt32 ldEnable(uInt32); +uInt32 ldEnable(); #endif /*** $Log$ + Revision 1.8 2004/06/16 17:32:14 reddawg + Removed Dead LD Code now part of ld.so + Revision 1.7 2004/06/16 17:04:13 reddawg ld.so: rest of the commit diff --git a/src/sys/kernel/exec.c b/src/sys/kernel/exec.c index 6b2ca52..7c8052b 100644 --- a/src/sys/kernel/exec.c +++ b/src/sys/kernel/exec.c @@ -333,7 +333,6 @@ uInt32 *tmp = 0x0; uInt32 ldAddr = 0x0; char *newLoc = 0x0; - char *linker = 0x0; fileDescriptor *tmpFd = 0x0; elfHeader *binaryHeader = 0x0; @@ -412,7 +411,7 @@ fread(newLoc,programHeader[i].phFilesz,1,tmpFd); } else if (programHeader[i].phType == 3) { - ldAddr = ldEnable(tmpFd); + ldAddr = ldEnable(); } } diff --git a/src/sys/kernel/ld.c b/src/sys/kernel/ld.c index 79acece..5c7e61f 100644 --- a/src/sys/kernel/ld.c +++ b/src/sys/kernel/ld.c @@ -37,7 +37,7 @@ #include #include -uInt32 ldEnable(uInt32 tmpFd) { +uInt32 ldEnable() { int i = 0x0; int x = 0x0; int rel = 0x0; @@ -182,6 +182,9 @@ /*** $Log$ + Revision 1.16 2004/06/17 01:52:54 reddawg + Maybe? + Revision 1.15 2004/06/17 01:23:23 reddawg Do This