diff --git a/src/bin/ld/Makefile b/src/bin/ld/Makefile index ed49852..fbb3395 100644 --- a/src/bin/ld/Makefile +++ b/src/bin/ld/Makefile @@ -15,7 +15,7 @@ REMOVE = rm -f #Objects -OBJS = main.o findlibrary.o findfunc.o addlibrary.o +OBJS = main.o findlibrary.o findfunc.o addlibrary.o entry.o #Startup File STARTUP = ../../lib/ubix/startup.o diff --git a/src/bin/ld/entry.S b/src/bin/ld/entry.S new file mode 100644 index 0000000..6dd34e6 --- /dev/null +++ b/src/bin/ld/entry.S @@ -0,0 +1,44 @@ +/***************************************************************************************** + Copyright (c) 2002-2004 The UbixOS Project + All rights reserved. + + Redistribution and use in source and binary forms, with or without modification, are + permitted provided that the following conditions are met: + + Redistributions of source code must retain the above copyright notice, this list of + conditions, the following disclaimer and the list of authors. Redistributions in binary + form must reproduce the above copyright notice, this list of conditions, the following + disclaimer and the list of authors in the documentation and/or other materials provided + with the distribution. Neither the name of the UbixOS Project nor the names of its + contributors may be used to endorse or promote products derived from this software + without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY + EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + $Id$ + +*****************************************************************************************/ + +.globl _ld +.text +.code32 + +_ld: + call ld + add $8,%esp + push %eax + ret + +/*** + $Log$ + END + ***/ + diff --git a/src/bin/ld/main.c b/src/bin/ld/main.c index 5ccb425..0d73af5 100644 --- a/src/bin/ld/main.c +++ b/src/bin/ld/main.c @@ -1,5 +1,5 @@ /***************************************************************************************** - Copyright (c) 2002 The UbixOS Project + Copyright (c) 2002-2004 The UbixOS Project All rights reserved. Redistribution and use in source and binary forms, with or without modification, are @@ -32,16 +32,6 @@ #include #include "ld.h" -void _ld(); -asm( - ".globl _ld \n" - "_ld: \n" - " call ld \n" - " add $8,%esp\n" - " push %eax \n" - " ret \n" - ); - ldLibrary *libs = 0x0; elfHeader *binaryHeader = 0x0; @@ -124,6 +114,9 @@ /*** $Log$ + Revision 1.8 2004/06/17 02:58:49 reddawg + Cleaned Out Dead Code + Revision 1.7 2004/06/17 01:09:24 reddawg TCA: cvs update make and give me output