diff --git a/src/bin/edit/main.c b/src/bin/edit/main.c index d844a67..ef25557 100644 --- a/src/bin/edit/main.c +++ b/src/bin/edit/main.c @@ -33,7 +33,7 @@ int main(int argc,char **argv) { extern char **environ; FILE *out; - int offset; + int offset = 0xFF; printf("UbixOS Text Editor\n"); printf("V1.0\n"); #ifdef DEBUG diff --git a/src/bin/ld/addlibrary.c b/src/bin/ld/addlibrary.c index 53c359d..2eb22c9 100644 --- a/src/bin/ld/addlibrary.c +++ b/src/bin/ld/addlibrary.c @@ -27,7 +27,7 @@ //if ((tmpLib->output = (char *)malloc((linkerFd->size+0x4000))) == 0x0) { //if ((tmpLib->output = (char *)malloc(0x111000)) == 0x0) { //HELP - if ((tmpLib->output = (char *)getPage((0x10F000/0x1000),2)) == 0x0) { + if ((tmpLib->output = (char *)getPage((0x104000/0x1000),2)) == 0x0) { printf("malloc failed: tmpLib->output\n"); exit(0x1); } diff --git a/src/bin/rtld-elf/Makefile b/src/bin/rtld-elf/Makefile index d4624c3..f8dbd7e 100644 --- a/src/bin/rtld-elf/Makefile +++ b/src/bin/rtld-elf/Makefile @@ -45,13 +45,13 @@ $(CXX) -Wall -O $(CFLAGS) $(INCLUDES) -S -o $@ $< .c.o: - $(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $< + $(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $< .c.s: - $(CC) -Wall -O $(CFLAGS) $(INCLUDES) -S -o $@ $< + $(CC) $(CFLAGS) $(INCLUDES) -S -o $@ $< .S.o: - $(CC) -Wall $(CLFAGS) $(INCLUDES) -c -o $@ $< + $(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $< # Clean Up The junk clean: diff --git a/src/bin/rtld-elf/map_object.c b/src/bin/rtld-elf/map_object.c index 8d5f24a..6734cc2 100644 --- a/src/bin/rtld-elf/map_object.c +++ b/src/bin/rtld-elf/map_object.c @@ -53,6 +53,7 @@ Obj_Entry * map_object(int fd, const char *path, const struct stat *sb) { + Elf_Dyn *dynp = 0x0; Obj_Entry *obj; Elf_Ehdr *hdr; int i; @@ -99,6 +100,8 @@ nsegs = -1; phdyn = phphdr = phinterp = phtls = NULL; segs = alloca(sizeof(segs[0]) * hdr->e_phnum); +dbg("SDF: %i",hdr->e_phnum); + while (phdr < phlimit) { switch (phdr->p_type) { @@ -225,6 +228,8 @@ obj->vaddrbase = base_vaddr; obj->relocbase = mapbase - base_vaddr; obj->dynamic = (const Elf_Dyn *) (obj->relocbase + phdyn->p_vaddr); + dynp = (Elf_Dyn *) (obj->relocbase + phdyn->p_vaddr); + dbg("TEST: [0x%X:0x%X:0x%X]",dynp->d_tag,phdyn->p_vaddr,(u_int32_t)mapbase); if (hdr->e_entry != 0) obj->entry = (caddr_t) (obj->relocbase + hdr->e_entry); if (phphdr != NULL) { diff --git a/src/bin/rtld-elf/reloc.c b/src/bin/rtld-elf/reloc.c index ba9be47..16b0669 100644 --- a/src/bin/rtld-elf/reloc.c +++ b/src/bin/rtld-elf/reloc.c @@ -125,6 +125,7 @@ * limited amounts of stack available so we cannot use alloca(). */ cache = mmap(NULL, bytes, PROT_READ|PROT_WRITE, MAP_ANON, -1, 0); + if (cache == MAP_FAILED) cache = NULL; @@ -338,6 +339,7 @@ */ tls_static_space = tls_last_offset + RTLD_STATIC_TLS_EXTRA; tls = allocate_tls(objs, NULL, 2*sizeof(Elf_Addr), sizeof(Elf_Addr)); +dbg("tls: [0x%X]",(u_int32_t)tls); i386_set_gsbase(tls); } diff --git a/src/bin/rtld-elf/rtld.c b/src/bin/rtld-elf/rtld.c index 81d5268..8cc9ffe 100644 --- a/src/bin/rtld-elf/rtld.c +++ b/src/bin/rtld-elf/rtld.c @@ -287,6 +287,9 @@ /* Initialize and relocate ourselves. */ assert(aux_info[AT_BASE] != NULL); + if ((u_int32_t)aux_info[AT_BASE]->a_un.a_ptr != 0x1000000) + while (1); + init_rtld((caddr_t) aux_info[AT_BASE]->a_un.a_ptr); __progname = obj_rtld.path; @@ -312,6 +315,7 @@ if (ld_debug != NULL && *ld_debug != '\0') debug = 1; + dbg("%s is initialized, base address = %p", __progname, (caddr_t) aux_info[AT_BASE]->a_un.a_ptr); dbg("RTLD dynamic = %p", obj_rtld.dynamic); @@ -386,10 +390,12 @@ if (load_preload_objects() == -1) die(); preload_tail = obj_tail; +debug = 1; - dbg("loading needed objects"); - if (load_needed_objects(obj_main) == -1) - die(); + + dbg("loading needed objects"); + if (load_needed_objects(obj_main) == -1) + die(); /* Make a list of all objects loaded at startup. */ for (obj = obj_list; obj != NULL; obj = obj->next) { @@ -418,11 +424,11 @@ } allocate_initial_tls(obj_list); +//while (1); -debug = 1; - if (relocate_objects(obj_main, - ld_bind_now != NULL && *ld_bind_now != '\0', &obj_rtld) == -1) - die(); + if (relocate_objects(obj_main, ld_bind_now != NULL && *ld_bind_now != '\0', &obj_rtld) == -1) + die(); + dbg("doing copy relocations"); if (do_copy_relocations(obj_main) == -1) @@ -708,8 +714,7 @@ default: if (!early) { - dbg("Ignoring d_tag %ld = %#lx", (long)dynp->d_tag, - (long)dynp->d_tag); + dbg("Ignoring d_tag %ld = %#lx", (long)dynp->d_tag, (long)dynp->d_tag); } break; } @@ -1066,16 +1071,12 @@ #ifdef PIC objtmp.relocbase = mapbase; #endif -debug = 1; -while (1); -dbg("SDF"); if (RTLD_IS_DYNAMIC()) { objtmp.dynamic = rtld_dynamic(&objtmp); digest_dynamic(&objtmp, 1); assert(objtmp.needed == NULL); assert(!objtmp.textrel); -while (1); /* * Temporarily put the dynamic linker entry into the object list, so * that symbols can be found. @@ -1170,32 +1171,33 @@ * each of them. Returns 0 on success. Generates an error message and * returns -1 on failure. */ -static int -load_needed_objects(Obj_Entry *first) -{ - Obj_Entry *obj; +static int load_needed_objects(Obj_Entry *first) { + Obj_Entry *obj; - for (obj = first; obj != NULL; obj = obj->next) { - Needed_Entry *needed; + for (obj = first; obj != NULL; obj = obj->next) { + Needed_Entry *needed; - for (needed = obj->needed; needed != NULL; needed = needed->next) { - const char *name = obj->strtab + needed->name; - char *path = find_library(name, obj); + for (needed = obj->needed; needed != NULL; needed = needed->next) { + const char *name = obj->strtab + needed->name; + char *path = find_library(name, obj); - needed->obj = NULL; - if (path == NULL && !ld_tracing) - return -1; -printf("\n\nPATH: [%s]\n",path); - if (path) { - needed->obj = load_object(path); - if (needed->obj == NULL && !ld_tracing) - return -1; /* XXX - cleanup */ - } - } + needed->obj = NULL; + + if (path == NULL && !ld_tracing) + return -1; + + printf("\n\nPATH: [%s]\n",path); + + if (path) { + needed->obj = load_object(path); + if (needed->obj == NULL && !ld_tracing) + return(-1); /* XXX - cleanup */ + } + } } - return 0; -} + return 0; + } static int load_preload_objects(void) @@ -1289,8 +1291,9 @@ } } dbg("loading \"%s\"", path); - printf("\n\n loading \"%s\"\n", path); + obj = map_object(fd, path, &sb); + printf("\nmapped object\n"); close(fd); if (obj == NULL) { @@ -1299,7 +1302,9 @@ } obj->path = path; + digest_dynamic(obj, 0); +//while(1); *obj_tail = obj; obj_tail = &obj->next; @@ -1508,6 +1513,7 @@ /* Process the PLT relocations. */ if (reloc_plt(obj) == -1) return -1; + /* Relocate the jump slots if we are doing immediate binding. */ if (obj->bind_now || bind_now) if (reloc_jmpslots(obj) == -1) diff --git a/src/contrib/gdtoa/arith.h b/src/contrib/gdtoa/arith.h new file mode 100644 index 0000000..76539f8 --- /dev/null +++ b/src/contrib/gdtoa/arith.h @@ -0,0 +1,2 @@ +#define IEEE_8087 +#define Arith_Kind_ASL 1 diff --git a/src/lib/csu/Makefile b/src/lib/csu/Makefile index 00aecd9..a30cf87 100644 --- a/src/lib/csu/Makefile +++ b/src/lib/csu/Makefile @@ -10,7 +10,7 @@ INCLUDES = -I../libc/include -I../../include.new #Objects -OBJS = crtn.o crti.o crt1.o +OBJS = crtn.o crti.o crt1.o #crtbegin.o crtend.o all: $(OBJS) diff --git a/src/lib/libc/Makefile b/src/lib/libc/Makefile index ee3758b..6415f8e 100644 --- a/src/lib/libc/Makefile +++ b/src/lib/libc/Makefile @@ -46,7 +46,8 @@ (cd gdtoa;make) (cd db;make) (cd compat-43;make) - $(CC) -nostdlib -shared -Wl,-soname,libc.so -o $(OUTPUT) $(OBJS) $(SUBS) + $(CC) -nostdlib -shared -Wl,-x -o $(OUTPUT) -Wl,-soname,$(OUTPUT) `lorder $(OBJS) $(SUBS) | tsort -q` + (rm pic.a;ar cq pic.a ./i386/*/*.o ./stdio/*.o ./stdlib/*.o ./uthread/*.o ./string/*.o ./sys/*.o ./xdr/*.o ./yp/*.o ./locale/*.o ./gen/*.o ; ranlib ./pic.a) pic.a: $(OBJS) (make clean) diff --git a/src/lib/libc/compat-43/Makefile b/src/lib/libc/compat-43/Makefile index b3f8ab7..09da793 100644 --- a/src/lib/libc/compat-43/Makefile +++ b/src/lib/libc/compat-43/Makefile @@ -7,7 +7,7 @@ #include ../Makefile.inc include ../libc.inc -INCLUDES += -I../locale/ +#INCLUDES += -I../locale/ #Objects OBJS = creat.o gethostid.o getwd.o killpg.o sethostid.o setpgrp.o setrgid.o setruid.o sigcompat.o @@ -16,19 +16,19 @@ # Compile the source files .cc.o: - $(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c -o $@ $< + $(CXX) $(CFLAGS) $(INCLUDES) -c -o $@ $< .cc.s: - $(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $< + $(CXX) $(CFLAGS) $(INCLUDES) -S -o $@ $< .c.o: $(CC) $(CFLAGS) $(INCLUDES) -c $< .c.s: - $(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $< + $(CC) $(CFLAGS) $(INCLUDES) -S -o $@ $< .S.o: - $(CC) $(CFLAGS) -Wall -nostdlib -c -o $@ $< + $(CC) $(CFLAGS) -c -o $@ $< # Clean up the junk clean: diff --git a/src/lib/libc/db/btree/Makefile b/src/lib/libc/db/btree/Makefile index d6422b1..ff0835a 100644 --- a/src/lib/libc/db/btree/Makefile +++ b/src/lib/libc/db/btree/Makefile @@ -2,11 +2,12 @@ # The System Makefile (C) 2002 The UbixOS Project # Include Global 'Source' Options -include ../../../../Makefile.inc -include ../../../Makefile.inc -include ../Makefile.inc +#include ../../../../Makefile.inc +#include ../../../Makefile.inc +#include ../Makefile.inc +include ../../libc.inc -INCLUDES += -I../ -I../../include +#INCLUDES += -I../ -I../../include #Objects OBJS = bt_close.o bt_conv.o bt_debug.o bt_delete.o bt_get.o bt_open.o bt_overflow.o bt_page.o bt_put.o bt_search.o bt_seq.o bt_split.o bt_utils.o @@ -15,19 +16,19 @@ # Compile the source files .cc.o: - $(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c -o $@ $< + $(CXX) $(CFLAGS) $(INCLUDES) -c -o $@ $< .cc.s: - $(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $< + $(CXX) $(CFLAGS) $(INCLUDES) -S -o $@ $< .c.o: - $(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c $< + $(CC) $(CFLAGS) $(INCLUDES) -c $< .c.s: - $(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $< + $(CC) $(CFLAGS) $(INCLUDES) -S -o $@ $< .S.o: - $(CC) $(CFLAGS) -Wall -nostdlib $(INCLUDES) -c -o $@ $< + $(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $< # Clean up the junk clean: diff --git a/src/lib/libc/db/db/Makefile b/src/lib/libc/db/db/Makefile index e4c49a4..9cb4509 100644 --- a/src/lib/libc/db/db/Makefile +++ b/src/lib/libc/db/db/Makefile @@ -2,9 +2,10 @@ # The System Makefile (C) 2002 The UbixOS Project # Include Global 'Source' Options -include ../../../../Makefile.inc -include ../../../Makefile.inc -include ../Makefile.inc +#include ../../../../Makefile.inc +#include ../../../Makefile.inc +#include ../Makefile.inc +include ../../libc.inc INCLUDES += -I../ @@ -15,19 +16,19 @@ # Compile the source files .cc.o: - $(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c -o $@ $< + $(CXX) $(CFLAGS) $(INCLUDES) -c -o $@ $< .cc.s: - $(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $< + $(CXX) $(CFLAGS) $(INCLUDES) -S -o $@ $< .c.o: - $(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c $< + $(CC) $(CFLAGS) $(INCLUDES) -c $< .c.s: - $(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $< + $(CC) $(CFLAGS) $(INCLUDES) -S -o $@ $< .S.o: - $(CC) $(CFLAGS) -Wall -nostdlib $(INCLUDES) -c -o $@ $< + $(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $< # Clean up the junk clean: diff --git a/src/lib/libc/db/hash/Makefile b/src/lib/libc/db/hash/Makefile index 5f42d0f..db1c4e8 100644 --- a/src/lib/libc/db/hash/Makefile +++ b/src/lib/libc/db/hash/Makefile @@ -2,11 +2,12 @@ # The System Makefile (C) 2002 The UbixOS Project # Include Global 'Source' Options -include ../../../../Makefile.inc -include ../../../Makefile.inc -include ../Makefile.inc +#include ../../../../Makefile.inc +#include ../../../Makefile.inc +#include ../Makefile.inc +include ../../libc.inc -INCLUDES += -I../ -I../../include +INCLUDES += -I../ #-I../../include #Objects OBJS = hash.o hash_bigkey.o hash_buf.o hash_func.o hash_log2.o hash_page.o ndbm.o @@ -15,19 +16,19 @@ # Compile the source files .cc.o: - $(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c -o $@ $< + $(CXX) $(CFLAGS) $(INCLUDES) -c -o $@ $< .cc.s: - $(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $< + $(CXX) $(CFLAGS) $(INCLUDES) -S -o $@ $< .c.o: - $(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c $< + $(CC) $(CFLAGS) $(INCLUDES) -c $< .c.s: - $(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $< + $(CC) $(CFLAGS) $(INCLUDES) -S -o $@ $< .S.o: - $(CC) $(CFLAGS) -Wall -nostdlib $(INCLUDES) -c -o $@ $< + $(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $< # Clean up the junk clean: diff --git a/src/lib/libc/db/mpool/Makefile b/src/lib/libc/db/mpool/Makefile index 03af949..afb0fbd 100644 --- a/src/lib/libc/db/mpool/Makefile +++ b/src/lib/libc/db/mpool/Makefile @@ -2,11 +2,12 @@ # The System Makefile (C) 2002 The UbixOS Project # Include Global 'Source' Options -include ../../../../Makefile.inc -include ../../../Makefile.inc -include ../Makefile.inc +#include ../../../../Makefile.inc +#include ../../../Makefile.inc +#include ../Makefile.inc +include ../../libc.inc -INCLUDES += -I../ -I../../include +INCLUDES += -I../ #-I../../include #Objects OBJS = mpool.o @@ -15,19 +16,19 @@ # Compile the source files .cc.o: - $(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c -o $@ $< + $(CXX) $(CFLAGS) $(INCLUDES) -c -o $@ $< .cc.s: - $(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $< + $(CXX) $(CFLAGS) $(INCLUDES) -S -o $@ $< .c.o: - $(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c $< + $(CC) $(CFLAGS) $(INCLUDES) -c $< .c.s: - $(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $< + $(CC) $(CFLAGS) $(INCLUDES) -S -o $@ $< .S.o: - $(CC) $(CFLAGS) -Wall -nostdlib $(INCLUDES) -c -o $@ $< + $(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $< # Clean up the junk clean: diff --git a/src/lib/libc/db/recno/Makefile b/src/lib/libc/db/recno/Makefile index e1636d0..0868c76 100644 --- a/src/lib/libc/db/recno/Makefile +++ b/src/lib/libc/db/recno/Makefile @@ -2,11 +2,12 @@ # The System Makefile (C) 2002 The UbixOS Project # Include Global 'Source' Options -include ../../../../Makefile.inc -include ../../../Makefile.inc -include ../Makefile.inc +#include ../../../../Makefile.inc +#include ../../../Makefile.inc +#include ../Makefile.inc +include ../../libc.inc -INCLUDES += -I../ -I../../include +INCLUDES += -I../ #-I../../include #Objects OBJS = rec_close.o rec_delete.o rec_get.o rec_open.o rec_put.o rec_search.o rec_seq.o rec_utils.o @@ -15,19 +16,19 @@ # Compile the source files .cc.o: - $(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c -o $@ $< + $(CXX) $(CFLAGS) $(INCLUDES) -c -o $@ $< .cc.s: - $(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $< + $(CXX) $(CFLAGS) $(INCLUDES) -S -o $@ $< .c.o: - $(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c $< + $(CC) $(CFLAGS) $(INCLUDES) -c $< .c.s: - $(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $< + $(CC) $(CFLAGS) $(INCLUDES) -S -o $@ $< .S.o: - $(CC) $(CFLAGS) -Wall -nostdlib $(INCLUDES) -c -o $@ $< + $(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $< # Clean up the junk clean: diff --git a/src/lib/libc/gdtoa/Makefile b/src/lib/libc/gdtoa/Makefile index 11f8811..ed2cdb5 100644 --- a/src/lib/libc/gdtoa/Makefile +++ b/src/lib/libc/gdtoa/Makefile @@ -2,32 +2,34 @@ # The System Makefile (C) 2002 The UbixOS Project # Include Global 'Source' Options -include ../../../Makefile.inc -include ../../Makefile.inc -include ../Makefile.inc +#include ../../../Makefile.inc +#include ../../Makefile.inc +#include ../Makefile.inc +include ../libc.inc INCLUDES += -I../locale/ -I../../../contrib/gdtoa -I../i386 +CFLAGS = -fpic -DPIC -O2 -fno-strict-aliasing -pipe -D__DBINTERFACE_PRIVATE -DINET6 -DPOSIX_MISTAKE -DBROKEN_DES -DPORTMAP -DDES_BUILTIN -DYP -DHESIOD #Objects -OBJS = _hdtoa.o _ldtoa.o arithchk.o dmisc.o dtoa.o g_Qfmt.o g__fmt.o g_ddfmt.o g_dfmt.o g_ffmt.o g_xLfmt.o g_xfmt.o gdtoa.o gethex.o glue.o gmisc.o hd_init.o hexnan.o machdep_ldisx.o misc.o smisc.o strtoIQ.o strtoId.o strtoIdd.o strtoIf.o strtoIg.o strtoIx.o strtoIxL.o strtod.o strtodI.o strtodg.o strtof.o strtopQ.o strtopd.o strtopdd.o strtopf.o strtopx.o strtopxL.o strtorQ.o strtord.o strtordd.o strtorf.o strtorx.o strtorxL.o sum.o ulp.o +OBJS = _hdtoa.o _ldtoa.o dmisc.o dtoa.o g_Qfmt.o g__fmt.o g_ddfmt.o g_dfmt.o g_ffmt.o g_xLfmt.o g_xfmt.o gdtoa.o gethex.o glue.o gmisc.o hd_init.o hexnan.o machdep_ldisx.o misc.o smisc.o strtoIQ.o strtoId.o strtoIdd.o strtoIf.o strtoIg.o strtoIx.o strtoIxL.o strtod.o strtodI.o strtodg.o strtof.o strtopQ.o strtopd.o strtopdd.o strtopf.o strtopx.o strtopxL.o strtorQ.o strtord.o strtordd.o strtorf.o strtorx.o strtorxL.o sum.o ulp.o #arithchk.o all: $(OBJS) # Compile the source files .cc.o: - $(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c -o $@ $< + $(CXX) $(CFLAGS) $(INCLUDES) -c -o $@ $< .cc.s: - $(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $< + $(CXX) $(CFLAGS) $(INCLUDES) -S -o $@ $< .c.o: - $(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c $< + $(CC) $(CFLAGS) $(INCLUDES) -c $< .c.s: - $(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $< + $(CC) $(CFLAGS) $(INCLUDES) -S -o $@ $< .S.o: - $(CC) $(CFLAGS) -Wall -nostdlib -c -o $@ $< + $(CC) $(CFLAGS) -c -o $@ $< # Clean up the junk clean: diff --git a/src/lib/libc/gen/Makefile b/src/lib/libc/gen/Makefile index 336f58a..72a77fa 100644 --- a/src/lib/libc/gen/Makefile +++ b/src/lib/libc/gen/Makefile @@ -7,7 +7,7 @@ #include ../Makefile.inc include ../libc.inc -INCLUDES += -I../locale/ -I../i386 +#INCLUDES += -I../locale/ -I../i386 #Objects ldexpo OBJS = __xuname.o _pthread_stubs.o _rand48.o _spinlock_stub.o _thread_init.o alarm.o arc4random.o assert.o basename.o check_utility_compat.o clock.o closedir.o confstr.o crypt.o ctermid.o daemon.o devname.o dirname.o disklabel.o dlfcn.o dlfunc.o drand48.o erand48.o err.o errlst.o errno.o exec.o fmtcheck.o fmtmsg.o fnmatch.o fpclassify.o frexp.o fstab.o ftok.o fts.o ftw.o getbootfile.o getbsize.o getcap.o getcwd.o getdomainname.o getgrent.o getgrouplist.o gethostname.o getloadavg.o getlogin.o getmntinfo.o getnetgrent.o getobjformat.o getosreldate.o getpagesize.o getpeereid.o getprogname.o getpwent.o getttyent.o getusershell.o getvfsbyname.o glob.o initgroups.o isatty.o isinf.o isnan.o jrand48.o lcong48.o lockf.o lrand48.o mrand48.o nftw.o nice.o nlist.o nrand48.o opendir.o pause.o pmadvise.o popen.o posixshm.o pselect.o psignal.o pw_scan.o pwcache.o raise.o readdir.o readpassphrase.o rewinddir.o scandir.o seed48.o seekdir.o sem.o semctl.o setdomainname.o sethostname.o setjmperr.o setmode.o setproctitle.o setprogname.o siginterrupt.o siglist.o signal.o sigsetops.o sleep.o srand48.o statvfs.o stringlist.o strtofflags.o swapcontext.o sysconf.o sysctl.o sysctlbyname.o sysctlnametomib.o syslog.o telldir.o termios.o time.o times.o timezone.o tls.o ttyname.o ttyslot.o ualarm.o ulimit.o uname.o unvis.o usleep.o utime.o valloc.o vis.o wait.o wait3.o waitpid.o wordexp.o @@ -16,19 +16,19 @@ # Compile the source files .cc.o: - $(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c -o $@ $< + $(CXX) $(CFLAGS) $(INCLUDES) -c -o $@ $< .cc.s: - $(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $< + $(CXX) $(CFLAGS) $(INCLUDES) -S -o $@ $< .c.o: $(CC) $(CFLAGS) $(INCLUDES) -c $< .c.s: - $(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $< + $(CC) $(CFLAGS) $(INCLUDES) -S -o $@ $< .S.o: - $(CC) $(CFLAGS) -Wall -nostdlib -c -o $@ $< + $(CC) $(CFLAGS) -c -o $@ $< # Clean up the junk clean: diff --git a/src/lib/libc/gmon/Makefile b/src/lib/libc/gmon/Makefile index 3933a54..ddf68cb 100644 --- a/src/lib/libc/gmon/Makefile +++ b/src/lib/libc/gmon/Makefile @@ -2,11 +2,12 @@ # The System Makefile (C) 2002 The UbixOS Project # Include Global 'Source' Options -include ../../../Makefile.inc -include ../../Makefile.inc -include ../Makefile.inc +#include ../../../Makefile.inc +#include ../../Makefile.inc +#include ../Makefile.inc +include ../libc.inc -INCLUDES += -I../locale/ +#INCLUDES += -I../locale/ #Objects OBJS = gmon.o mcount.o @@ -15,19 +16,19 @@ # Compile the source files .cc.o: - $(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c -o $@ $< + $(CXX) $(CFLAGS) $(INCLUDES) -c -o $@ $< .cc.s: - $(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $< + $(CXX) $(CFLAGS) $(INCLUDES) -S -o $@ $< .c.o: - $(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c $< + $(CC) $(CFLAGS) $(INCLUDES) -c $< .c.s: - $(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $< + $(CC) $(CFLAGS) $(INCLUDES) -S -o $@ $< .S.o: - $(CC) $(CFLAGS) -Wall -nostdlib -c -o $@ $< + $(CC) $(CFLAGS) -c -o $@ $< # Clean up the junk clean: diff --git a/src/lib/libc/i386/gen/Makefile b/src/lib/libc/i386/gen/Makefile index 51eb340..4e2c159 100644 --- a/src/lib/libc/i386/gen/Makefile +++ b/src/lib/libc/i386/gen/Makefile @@ -8,6 +8,8 @@ INCLUDES += -I../ +CFLAGS += -fpic -DPIC + #Objects OBJS = _ctx_start.o _set_tp.o _setjmp.o alloca.o fabs.o flt_rounds.o infinity.o ldexp.o makecontext.o modf.o rfork_thread.o setjmp.o signalcontext.o sigsetjmp.o #Output @@ -17,19 +19,19 @@ # Compile the source files .cc.o: - $(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c -o $@ $< + $(CXX) $(CFLAGS) $(INCLUDES) -c -o $@ $< .cc.s: - $(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $< + $(CXX) $(CFLAGS) $(INCLUDES) -S -o $@ $< .c.o: - $(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c $< + $(CC) $(CFLAGS) $(INCLUDES) -c $< .c.s: - $(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $< + $(CC) $(CFLAGS) $(INCLUDES) -S -o $@ $< .S.o: - $(CC) $(CFLAGS) -Wall -nostdlib $(INCLUDES) -c -o $@ $< + $(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $< # Clean up the junk clean: diff --git a/src/lib/libc/i386/net/Makefile b/src/lib/libc/i386/net/Makefile index 7db5e35..f26052a 100644 --- a/src/lib/libc/i386/net/Makefile +++ b/src/lib/libc/i386/net/Makefile @@ -7,6 +7,7 @@ include ../Makefile.inc INCLUDES += -I../ +CFLAGS += -fpic -DPIC #Objects OBJS = htonl.o htons.o ntohl.o ntohs.o @@ -15,19 +16,19 @@ # Compile the source files .cc.o: - $(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c -o $@ $< + $(CXX) $(CFLAGS) $(INCLUDES) -c -o $@ $< .cc.s: - $(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $< + $(CXX) $(CFLAGS) $(INCLUDES) -S -o $@ $< .c.o: - $(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c $< + $(CC) $(CFLAGS) $(INCLUDES) -c $< .c.s: - $(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $< + $(CC) $(CFLAGS) $(INCLUDES) -S -o $@ $< .S.o: - $(CC) $(CFLAGS) -Wall -nostdlib $(INCLUDES) -c -o $@ $< + $(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $< # Clean up the junk clean: diff --git a/src/lib/libc/i386/stdlib/Makefile b/src/lib/libc/i386/stdlib/Makefile index 9a5976f..b0b2089 100644 --- a/src/lib/libc/i386/stdlib/Makefile +++ b/src/lib/libc/i386/stdlib/Makefile @@ -7,6 +7,7 @@ include ../Makefile.inc INCLUDES += -I../ +CFLAGS += -fpic -DPIC #Objects OBJS = abs.o div.o labs.o ldiv.o @@ -15,19 +16,19 @@ # Compile the source files .cc.o: - $(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c -o $@ $< + $(CXX) $(CFLAGS) $(INCLUDES) -c -o $@ $< .cc.s: - $(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $< + $(CXX) $(CFLAGS) $(INCLUDES) -S -o $@ $< .c.o: - $(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c $< + $(CC) $(CFLAGS) $(INCLUDES) -c $< .c.s: - $(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $< + $(CC) $(CFLAGS) $(INCLUDES) -S -o $@ $< .S.o: - $(CC) $(CFLAGS) -Wall -nostdlib $(INCLUDES) -c -o $@ $< + $(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $< # Clean up the junk clean: diff --git a/src/lib/libc/i386/string/Makefile b/src/lib/libc/i386/string/Makefile index 1040c3e..58da90f 100644 --- a/src/lib/libc/i386/string/Makefile +++ b/src/lib/libc/i386/string/Makefile @@ -17,19 +17,19 @@ # Compile the source files .cc.o: - $(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c -o $@ $< + $(CXX) $(CFLAGS) $(INCLUDES) -c -o $@ $< .cc.s: - $(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $< + $(CXX) $(CFLAGS) $(INCLUDES) -S -o $@ $< .c.o: - $(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c $< + $(CC) $(CFLAGS) $(INCLUDES) -c $< .c.s: - $(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $< + $(CC) $(CFLAGS) $(INCLUDES) -S -o $@ $< .S.o: - $(CC) $(CFLAGS) -Wall -nostdlib $(INCLUDES) -c -o $@ $< + $(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $< # Clean up the junk clean: diff --git a/src/lib/libc/i386/sys/Makefile b/src/lib/libc/i386/sys/Makefile index f50db56..0acd4ae 100644 --- a/src/lib/libc/i386/sys/Makefile +++ b/src/lib/libc/i386/sys/Makefile @@ -2,13 +2,15 @@ # The System Makefile (C) 2002 The UbixOS Project # Include Global 'Source' Options -include ../../../../Makefile.inc -include ../../../Makefile.inc -include ../Makefile.inc +#include ../../../../Makefile.inc +#include ../../../Makefile.inc +#include ../Makefile.inc +include ../../libc.inc -INCLUDES += -I../ +#INCLUDES += -I../ -CFLAGS += -fpic -DPIC +#CFLAGS += -fpic -DPIC +#CFLAGS = -fpic -DPIC -O2 -fno-strict-aliasing -pipe -D__DBINTERFACE_PRIVATE -DINET6 -DPOSIX_MISTAKE -DBROKEN_DES -DPORTMAP -DDES_BUILTIN -DYP -DHESIOD -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -nostdinc -nostdlib #Objects OBJS = Ovfork.o brk.o cerror.o exect.o getcontext.o i386_clr_watch.o i386_get_fsbase.o i386_get_gsbase.o i386_get_ioperm.o i386_get_ldt.o i386_set_fsbase.o i386_set_gsbase.o i386_set_ioperm.o i386_set_ldt.o i386_set_watch.o i386_vm86.o pipe.o ptrace.o reboot.o sbrk.o setlogin.o sigreturn.o syscall.o @@ -17,19 +19,19 @@ # Compile the source files .cc.o: - $(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c -o $@ $< + $(CXX) $(CFLAGS) $(INCLUDES) -c -o $@ $< .cc.s: - $(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $< + $(CXX) $(CFLAGS) $(INCLUDES) -S -o $@ $< .c.o: - $(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c $< + $(CC) $(CFLAGS) $(INCLUDES) -c $< .c.s: - $(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $< + $(CC) $(CFLAGS) $(INCLUDES) -S -o $@ $< .S.o: - $(CC) $(CFLAGS) -Wall -nostdlib $(INCLUDES) -c -o $@ $< + $(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $< # Clean up the junk clean: diff --git a/src/lib/libc/i386/sys/Ovfork.S b/src/lib/libc/i386/sys/Ovfork.S index a3ce2c9..d14565a 100644 --- a/src/lib/libc/i386/sys/Ovfork.S +++ b/src/lib/libc/i386/sys/Ovfork.S @@ -34,11 +34,7 @@ * SUCH DAMAGE. */ -#if defined(SYSLIBC_SCCS) && !defined(lint) - .asciz "@(#)Ovfork.s 5.1 (Berkeley) 4/23/90" -#endif /* SYSLIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/i386/sys/Ovfork.S,v 1.19 2002/03/23 02:10:28 obrien Exp $"); #include "SYS.h" diff --git a/src/lib/libc/i386/syscalls/Makefile b/src/lib/libc/i386/syscalls/Makefile index e1de3b2..57fac6a 100644 --- a/src/lib/libc/i386/syscalls/Makefile +++ b/src/lib/libc/i386/syscalls/Makefile @@ -8,6 +8,8 @@ INCLUDES += -I../ +CFLAGS += -fpic -DPIC + #Objects OBJS = __acl_aclcheck_fd.o __acl_aclcheck_file.o __acl_aclcheck_link.o __acl_delete_fd.o __acl_delete_file.o __acl_delete_link.o __acl_get_fd.o __acl_get_file.o __acl_get_link.o __acl_set_fd.o __acl_set_file.o __acl_set_link.o __getcwd.o __mac_execve.o __mac_get_fd.o __mac_get_file.o __mac_get_link.o __mac_get_pid.o __mac_get_proc.o __mac_set_fd.o __mac_set_file.o __mac_set_link.o __mac_set_proc.o __semctl.o __setugid.o __syscall.o __sysctl.o _exit.o _getlogin.o _umtx_lock.o _umtx_op.o _umtx_unlock.o accept.o access.o acct.o adjtime.o aio_cancel.o aio_error.o aio_read.o aio_return.o aio_suspend.o aio_waitcomplete.o aio_write.o audit.o auditctl.o auditon.o bind.o chdir.o chflags.o chmod.o chown.o chroot.o clock_getres.o clock_gettime.o clock_settime.o close.o connect.o dup.o dup2.o eaccess.o execve.o extattr_delete_fd.o extattr_delete_file.o extattr_delete_link.o extattr_get_fd.o extattr_get_file.o extattr_get_link.o extattr_list_fd.o extattr_list_file.o extattr_list_link.o extattr_set_fd.o extattr_set_file.o extattr_set_link.o extattrctl.o fchdir.o fchflags.o fchmod.o fchown.o fcntl.o fhopen.o fhstat.o fhstatfs.o flock.o fork.o fpathconf.o fstat.o fstatfs.o fsync.o futimes.o getaudit.o getaudit_addr.o getauid.o getdents.o getdirentries.o getdtablesize.o getegid.o geteuid.o getfh.o getfsstat.o getgid.o getgroups.o getitimer.o getpeername.o getpgid.o getpgrp.o getpid.o getppid.o getpriority.o getresgid.o getresuid.o getrlimit.o getrusage.o getsid.o getsockname.o getsockopt.o gettimeofday.o getuid.o ioctl.o issetugid.o jail.o jail_attach.o kenv.o kevent.o kill.o kldfind.o kldfirstmod.o kldload.o kldnext.o kldstat.o kldsym.o kldunload.o kldunloadf.o kqueue.o kse_create.o kse_exit.o kse_release.o kse_switchin.o kse_thr_interrupt.o kse_wakeup.o ksem_close.o ksem_destroy.o ksem_getvalue.o ksem_init.o ksem_open.o ksem_post.o ksem_timedwait.o ksem_trywait.o ksem_unlink.o ksem_wait.o ktrace.o lchflags.o lchmod.o lchown.o lgetfh.o link.o lio_listio.o listen.o lstat.o lutimes.o mac_syscall.o madvise.o mincore.o minherit.o mkdir.o mkfifo.o mknod.o mlock.o mlockall.o modfind.o modfnext.o modnext.o modstat.o mount.o mprotect.o msgctl.o msgget.o msgrcv.o msgsnd.o msgsys.o msync.o munlock.o munlockall.o munmap.o nanosleep.o netbsd_lchown.o netbsd_msync.o nfsclnt.o nfssvc.o nfstat.o nlstat.o nmount.o nstat.o ntp_adjtime.o ntp_gettime.o open.o pathconf.o poll.o preadv.o profil.o pwritev.o quotactl.o read.o readlink.o readv.o recvfrom.o recvmsg.o rename.o revoke.o rfork.o rmdir.o rtprio.o sched_get_priority_max.o sched_get_priority_min.o sched_getparam.o sched_getscheduler.o sched_rr_get_interval.o sched_setparam.o sched_setscheduler.o sched_yield.o select.o semget.o semop.o semsys.o sendfile.o sendmsg.o sendto.o setaudit.o setaudit_addr.o setauid.o setcontext.o setegid.o seteuid.o setgid.o setgroups.o setitimer.o setpgid.o setpriority.o setregid.o setresgid.o setresuid.o setreuid.o setrlimit.o setsid.o setsockopt.o settimeofday.o setuid.o shmat.o shmctl.o shmdt.o shmget.o shmsys.o shutdown.o sigaction.o sigaltstack.o sigpending.o sigprocmask.o sigsuspend.o sigtimedwait.o sigwait.o sigwaitinfo.o socket.o socketpair.o stat.o statfs.o swapcontext.o swapoff.o swapon.o symlink.o sync.o sysarch.o thr_create.o thr_exit.o thr_kill.o thr_new.o thr_self.o thr_suspend.o thr_wake.o umask.o undelete.o unlink.o unmount.o utimes.o utrace.o uuidgen.o vadvise.o wait4.o write.o writev.o @@ -15,19 +17,19 @@ # Compile the source files .cc.o: - $(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c -o $@ $< + $(CXX) $(CFLAGS) $(INCLUDES) -c -o $@ $< .cc.s: - $(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $< + $(CXX) $(CFLAGS) $(INCLUDES) -S -o $@ $< .c.o: - $(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c $< + $(CC) $(CFLAGS) $(INCLUDES) -c $< .c.s: - $(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $< + $(CC) $(CFLAGS) $(INCLUDES) -S -o $@ $< .S.o: - $(CC) $(CFLAGS) -Wall -nostdlib $(INCLUDES) -c -o $@ $< + $(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $< # Clean up the junk clean: diff --git a/src/lib/libc/inet/Makefile b/src/lib/libc/inet/Makefile index a3e463f..340bdf9 100644 --- a/src/lib/libc/inet/Makefile +++ b/src/lib/libc/inet/Makefile @@ -2,11 +2,12 @@ # The System Makefile (C) 2002 The UbixOS Project # Include Global 'Source' Options -include ../../../Makefile.inc -include ../../Makefile.inc -include ../Makefile.inc +#include ../../../Makefile.inc +#include ../../Makefile.inc +#include ../Makefile.inc +include ../libc.inc -INCLUDES += -I../locale/ +#INCLUDES += -I../locale/ #Objects OBJS = inet_addr.o inet_cidr_ntop.o inet_cidr_pton.o inet_lnaof.o inet_makeaddr.o inet_net_ntop.o inet_net_pton.o inet_neta.o inet_netof.o inet_network.o inet_ntoa.o inet_ntop.o inet_pton.o nsap_addr.o @@ -15,19 +16,19 @@ # Compile the source files .cc.o: - $(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c -o $@ $< + $(CXX) $(CFLAGS) $(INCLUDES) -c -o $@ $< .cc.s: - $(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $< + $(CXX) $(CFLAGS) $(INCLUDES) -S -o $@ $< .c.o: - $(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c $< + $(CC) $(CFLAGS) $(INCLUDES) -c $< .c.s: - $(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $< + $(CC) $(CFLAGS) $(INCLUDES) -S -o $@ $< .S.o: - $(CC) $(CFLAGS) -Wall -nostdlib -c -o $@ $< + $(CC) $(CFLAGS) -c -o $@ $< # Clean up the junk clean: diff --git a/src/lib/libc/isc/Makefile b/src/lib/libc/isc/Makefile index 334e653..aff1b25 100644 --- a/src/lib/libc/isc/Makefile +++ b/src/lib/libc/isc/Makefile @@ -2,11 +2,12 @@ # The System Makefile (C) 2002 The UbixOS Project # Include Global 'Source' Options -include ../../../Makefile.inc -include ../../Makefile.inc -include ../Makefile.inc +#include ../../../Makefile.inc +#include ../../Makefile.inc +#include ../Makefile.inc +include ../libc.inc -INCLUDES += -I../locale/ +#INCLUDES += -I../locale/ #Objects OBJS = ev_streams.o ev_timers.o @@ -15,19 +16,19 @@ # Compile the source files .cc.o: - $(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c -o $@ $< + $(CXX) $(CFLAGS) $(INCLUDES) -c -o $@ $< .cc.s: - $(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $< + $(CXX) $(CFLAGS) $(INCLUDES) -S -o $@ $< .c.o: - $(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c $< + $(CC) $(CFLAGS) $(INCLUDES) -c $< .c.s: - $(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $< + $(CC) $(CFLAGS) $(INCLUDES) -S -o $@ $< .S.o: - $(CC) $(CFLAGS) -Wall -nostdlib -c -o $@ $< + $(CC) $(CFLAGS) -c -o $@ $< # Clean up the junk clean: diff --git a/src/lib/libc/libc.inc b/src/lib/libc/libc.inc index 2ae059f..29e8a8a 100644 --- a/src/lib/libc/libc.inc +++ b/src/lib/libc/libc.inc @@ -10,5 +10,5 @@ CFLAGS_UTHREAD = -fpic -DPIC -O2 -fno-strict-aliasing -pipe -DPTHREAD_KERNEL -D_LOCK_DEBUG -D_PTHREADS_INVARIANTS .endif -INCLUDES = -I/usr/home/reddawg/source/ubix2/src/include.new -I/usr/home/reddawg/source/ubix2/src/lib/libc/include -I/home/reddawg/source/ubix2/src/lib/libc/i386 -I/home/reddawg/source/ubix2/src/contrib/gdtoa -I/home/reddawg/source/ubix2/src/lib/libc -I/home/reddawg/source/ubix2/src/lib/libc/resolv -I/home/reddawg/source/ubix2/src/lib/libc/locale -I/home/reddawg/source/ubix2/src/lib/libc/rpc +INCLUDES = -I/usr/home/reddawg/source/ubixos/src/include.new -I/usr/home/reddawg/source/ubixos/src/lib/libc/include -I/home/reddawg/source/ubixos/src/lib/libc/i386 -I/home/reddawg/source/ubixos/src/contrib/gdtoa -I/home/reddawg/source/ubixos/src/lib/libc -I/home/reddawg/source/ubixos/src/lib/libc/resolv -I/home/reddawg/source/ubixos/src/lib/libc/locale -I/home/reddawg/source/ubixos/src/lib/libc/rpc diff --git a/src/lib/libc/locale/Makefile b/src/lib/libc/locale/Makefile index f9a3a5e..6dada0b 100644 --- a/src/lib/libc/locale/Makefile +++ b/src/lib/libc/locale/Makefile @@ -2,11 +2,12 @@ # The System Makefile (C) 2002 The UbixOS Project # Include Global 'Source' Options -include ../../../Makefile.inc -include ../../Makefile.inc -include ../Makefile.inc +#include ../../../Makefile.inc +#include ../../Makefile.inc +#include ../Makefile.inc +include ../libc.inc -INCLUDES += -I../locale/ +#INCLUDES += -I../locale/ #Objects OBJS = big5.o btowc.o collate.o collcmp.o euc.o fix_grouping.o gb18030.o gb2312.o gbk.o isctype.o iswctype.o ldpart.o lmessages.o lmonetary.o lnumeric.o localeconv.o mblen.o mbrlen.o mbrtowc.o mbsinit.o mbsnrtowcs.o mbsrtowcs.o mbstowcs.o mbtowc.o mskanji.o nextwctype.o nl_langinfo.o nomacros.o none.o rpmatch.o rune.o runetype.o setlocale.o setrunelocale.o table.o tolower.o toupper.o utf8.o wcrtomb.o wcsftime.o wcsnrtombs.o wcsrtombs.o wcstod.o wcstof.o wcstoimax.o wcstol.o wcstold.o wcstoll.o wcstombs.o wcstoul.o wcstoull.o wcstoumax.o wctob.o wctomb.o wctrans.o wctype.o wcwidth.o @@ -15,19 +16,19 @@ # Compile the source files .cc.o: - $(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c -o $@ $< + $(CXX) $(CFLAGS) $(INCLUDES) -c -o $@ $< .cc.s: - $(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $< + $(CXX) $(CFLAGS) $(INCLUDES) -S -o $@ $< .c.o: - $(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c $< + $(CC) $(CFLAGS) $(INCLUDES) -c $< .c.s: - $(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $< + $(CC) $(CFLAGS) $(INCLUDES) -S -o $@ $< .S.o: - $(CC) $(CFLAGS) -Wall -nostdlib -c -o $@ $< + $(CC) $(CFLAGS) -c -o $@ $< # Clean up the junk clean: diff --git a/src/lib/libc/nameser/Makefile b/src/lib/libc/nameser/Makefile index fb9f3c7..4162649 100644 --- a/src/lib/libc/nameser/Makefile +++ b/src/lib/libc/nameser/Makefile @@ -2,11 +2,12 @@ # The System Makefile (C) 2002 The UbixOS Project # Include Global 'Source' Options -include ../../../Makefile.inc -include ../../Makefile.inc -include ../Makefile.inc +#include ../../../Makefile.inc +#include ../../Makefile.inc +#include ../Makefile.inc +include ../libc.inc -INCLUDES += -I../locale/ +#INCLUDES += -I../locale/ #Objects OBJS = ns_name.o ns_netint.o ns_parse.o ns_print.o ns_samedomain.o ns_ttl.o @@ -15,19 +16,19 @@ # Compile the source files .cc.o: - $(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c -o $@ $< + $(CXX) $(CFLAGS) $(INCLUDES) -c -o $@ $< .cc.s: - $(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $< + $(CXX) $(CFLAGS) $(INCLUDES) -S -o $@ $< .c.o: - $(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c $< + $(CC) $(CFLAGS) $(INCLUDES) -c $< .c.s: - $(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $< + $(CC) $(CFLAGS) $(INCLUDES) -S -o $@ $< .S.o: - $(CC) $(CFLAGS) -Wall -nostdlib -c -o $@ $< + $(CC) $(CFLAGS) -c -o $@ $< # Clean up the junk clean: diff --git a/src/lib/libc/net/Makefile b/src/lib/libc/net/Makefile index ad8ae9c..d06b029 100644 --- a/src/lib/libc/net/Makefile +++ b/src/lib/libc/net/Makefile @@ -6,6 +6,8 @@ include ../../Makefile.inc include ../Makefile.inc +#include ../libc.inc + INCLUDES += -I../locale/ -I../resolv #Objects @@ -15,19 +17,19 @@ # Compile the source files .cc.o: - $(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c -o $@ $< + $(CXX) $(CFLAGS) $(INCLUDES) -c -o $@ $< .cc.s: - $(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $< + $(CXX) $(CFLAGS) $(INCLUDES) -S -o $@ $< .c.o: - $(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c $< + $(CC) $(CFLAGS) $(INCLUDES) -c $< .c.s: - $(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $< + $(CC) $(CFLAGS) $(INCLUDES) -S -o $@ $< .S.o: - $(CC) $(CFLAGS) -Wall -nostdlib -c -o $@ $< + $(CC) $(CFLAGS) -c -o $@ $< # Clean up the junk clean: diff --git a/src/lib/libc/nls/Makefile b/src/lib/libc/nls/Makefile index 1e5be2c..1471319 100644 --- a/src/lib/libc/nls/Makefile +++ b/src/lib/libc/nls/Makefile @@ -2,11 +2,12 @@ # The System Makefile (C) 2002 The UbixOS Project # Include Global 'Source' Options -include ../../../Makefile.inc -include ../../Makefile.inc -include ../Makefile.inc +#include ../../../Makefile.inc +#include ../../Makefile.inc +#include ../Makefile.inc +include ../libc.inc -INCLUDES += -I../locale/ +#INCLUDES += -I../locale/ #Objects OBJS = msgcat.o @@ -15,19 +16,19 @@ # Compile the source files .cc.o: - $(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c -o $@ $< + $(CXX) $(CFLAGS) $(INCLUDES) -c -o $@ $< .cc.s: - $(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $< + $(CXX) $(CFLAGS) $(INCLUDES) -S -o $@ $< .c.o: - $(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c $< + $(CC) $(CFLAGS) $(INCLUDES) -c $< .c.s: - $(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $< + $(CC) $(CFLAGS) $(INCLUDES) -S -o $@ $< .S.o: - $(CC) $(CFLAGS) -Wall -nostdlib -c -o $@ $< + $(CC) $(CFLAGS) -c -o $@ $< # Clean up the junk clean: diff --git a/src/lib/libc/posix1e/Makefile b/src/lib/libc/posix1e/Makefile index c6f08fc..007edc4 100644 --- a/src/lib/libc/posix1e/Makefile +++ b/src/lib/libc/posix1e/Makefile @@ -2,11 +2,12 @@ # The System Makefile (C) 2002 The UbixOS Project # Include Global 'Source' Options -include ../../../Makefile.inc -include ../../Makefile.inc -include ../Makefile.inc +#include ../../../Makefile.inc +#include ../../Makefile.inc +#include ../Makefile.inc +include ../libc.inc -INCLUDES += -I../locale/ +#INCLUDES += -I../locale/ #Objects OBJS = acl_calc_mask.o acl_copy.o acl_delete.o acl_delete_entry.o acl_entry.o acl_free.o acl_from_text.o acl_get.o acl_init.o acl_perm.o acl_set.o acl_size.o acl_support.o acl_to_text.o acl_valid.o extattr.o mac.o mac_exec.o mac_get.o mac_set.o @@ -15,19 +16,19 @@ # Compile the source files .cc.o: - $(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c -o $@ $< + $(CXX) $(CFLAGS) $(INCLUDES) -c -o $@ $< .cc.s: - $(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $< + $(CXX) $(CFLAGS) $(INCLUDES) -S -o $@ $< .c.o: - $(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c $< + $(CC) $(CFLAGS) $(INCLUDES) -c $< .c.s: - $(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $< + $(CC) $(CFLAGS) $(INCLUDES) -S -o $@ $< .S.o: - $(CC) $(CFLAGS) -Wall -nostdlib -c -o $@ $< + $(CC) $(CFLAGS) -c -o $@ $< # Clean up the junk clean: diff --git a/src/lib/libc/quad/Makefile b/src/lib/libc/quad/Makefile index ad9537f..019f36b 100644 --- a/src/lib/libc/quad/Makefile +++ b/src/lib/libc/quad/Makefile @@ -2,9 +2,10 @@ # The System Makefile (C) 2002 The UbixOS Project # Include Global 'Source' Options -include ../../../Makefile.inc -include ../../Makefile.inc -include ../Makefile.inc +#include ../../../Makefile.inc +#include ../../Makefile.inc +#include ../Makefile.inc +include ../libc.inc #Objects #OBJS = anddi3.o adddi3.o qdivrem.o umoddi3.o udivdi3.o divdi3.o @@ -14,19 +15,19 @@ # Compile the source files .cc.o: - $(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c -o $@ $< + $(CXX) $(CFLAGS) $(INCLUDES) -c -o $@ $< .cc.s: - $(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $< + $(CXX) $(CFLAGS) $(INCLUDES) -S -o $@ $< .c.o: - $(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c $< + $(CC) $(CFLAGS) $(INCLUDES) -c $< .c.s: - $(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $< + $(CC) $(CFLAGS) $(INCLUDES) -S -o $@ $< .S.o: - $(CC) $(CFLAGS) -Wall -nostdlib -c -o $@ $< + $(CC) $(CFLAGS) -c -o $@ $< # Clean up the junk clean: diff --git a/src/lib/libc/regex/Makefile b/src/lib/libc/regex/Makefile index 54779f6..8e95378 100644 --- a/src/lib/libc/regex/Makefile +++ b/src/lib/libc/regex/Makefile @@ -2,11 +2,12 @@ # The System Makefile (C) 2002 The UbixOS Project # Include Global 'Source' Options -include ../../../Makefile.inc -include ../../Makefile.inc -include ../Makefile.inc +#include ../../../Makefile.inc +#include ../../Makefile.inc +#include ../Makefile.inc +include ../libc.inc -INCLUDES += -I../locale/ +#INCLUDES += -I../locale/ #Objects OBJS = regcomp.o regerror.o regexec.o regfree.o @@ -15,19 +16,19 @@ # Compile the source files .cc.o: - $(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c -o $@ $< + $(CXX) $(CFLAGS) $(INCLUDES) -c -o $@ $< .cc.s: - $(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $< + $(CXX) $(CFLAGS) $(INCLUDES) -S -o $@ $< .c.o: - $(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c $< + $(CC) $(CFLAGS) $(INCLUDES) -c $< .c.s: - $(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $< + $(CC) $(CFLAGS) $(INCLUDES) -S -o $@ $< .S.o: - $(CC) $(CFLAGS) -Wall -nostdlib -c -o $@ $< + $(CC) $(CFLAGS) -c -o $@ $< # Clean up the junk clean: diff --git a/src/lib/libc/resolv/Makefile b/src/lib/libc/resolv/Makefile index 526b16d..1ac0278 100644 --- a/src/lib/libc/resolv/Makefile +++ b/src/lib/libc/resolv/Makefile @@ -2,11 +2,12 @@ # The System Makefile (C) 2002 The UbixOS Project # Include Global 'Source' Options -include ../../../Makefile.inc -include ../../Makefile.inc -include ../Makefile.inc +#include ../../../Makefile.inc +#include ../../Makefile.inc +#include ../Makefile.inc +include ../libc.inc -INCLUDES += -I../locale/ +#INCLUDES += -I../locale/ #Objects OBJS = h_errno.o herror.o mtctxres.o res_comp.o res_data.o res_debug.o res_init.o res_mkquery.o res_query.o res_send.o res_state.o @@ -15,19 +16,19 @@ # Compile the source files .cc.o: - $(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c -o $@ $< + $(CXX) $(CFLAGS) $(INCLUDES) -c -o $@ $< .cc.s: - $(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $< + $(CXX) $(CFLAGS) $(INCLUDES) -S -o $@ $< .c.o: - $(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c $< + $(CC) $(CFLAGS) $(INCLUDES) -c $< .c.s: - $(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $< + $(CC) $(CFLAGS) $(INCLUDES) -S -o $@ $< .S.o: - $(CC) $(CFLAGS) -Wall -nostdlib -c -o $@ $< + $(CC) $(CFLAGS) -c -o $@ $< # Clean up the junk clean: diff --git a/src/lib/libc/rpc/Makefile b/src/lib/libc/rpc/Makefile index 34da6bf..5250f0c 100644 --- a/src/lib/libc/rpc/Makefile +++ b/src/lib/libc/rpc/Makefile @@ -2,12 +2,13 @@ # The System Makefile (C) 2002 The UbixOS Project # Include Global 'Source' Options -include ../../../Makefile.inc -include ../../Makefile.inc -include ../Makefile.inc +#include ../../../Makefile.inc +#include ../../Makefile.inc +#include ../Makefile.inc +include ../libc.inc -INCLUDES += -I../locale/ -CFLAGS += -DPORTMAP +#INCLUDES += -I../locale/ +#CFLAGS += -DPORTMAP #Objects OBJS = auth_des.o auth_none.o auth_time.o auth_unix.o authdes_prot.o authunix_prot.o bindresvport.o clnt_bcast.o clnt_dg.o clnt_generic.o clnt_perror.o clnt_raw.o clnt_simple.o clnt_vc.o crypt_client.o des_crypt.o des_soft.o getnetconfig.o getnetpath.o getpublickey.o getrpcent.o getrpcport.o key_call.o key_prot_xdr.o mt_misc.o netname.o netnamer.o pmap_clnt.o pmap_getmaps.o pmap_getport.o pmap_prot.o pmap_prot2.o pmap_rmt.o rpc_callmsg.o rpc_commondata.o rpc_dtablesize.o rpc_generic.o rpc_prot.o rpc_soc.o rpcb_clnt.o rpcb_prot.o rpcb_st_xdr.o rpcdname.o rtime.o svc.o svc_auth.o svc_auth_des.o svc_auth_unix.o svc_dg.o svc_generic.o svc_raw.o svc_run.o svc_simple.o svc_vc.o @@ -16,19 +17,19 @@ # Compile the source files .cc.o: - $(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c -o $@ $< + $(CXX) $(CFLAGS) $(INCLUDES) -c -o $@ $< .cc.s: - $(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $< + $(CXX) $(CFLAGS) $(INCLUDES) -S -o $@ $< .c.o: - $(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c $< + $(CC) $(CFLAGS) $(INCLUDES) -c $< .c.s: - $(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $< + $(CC) $(CFLAGS) $(INCLUDES) -S -o $@ $< .S.o: - $(CC) $(CFLAGS) -Wall -nostdlib -c -o $@ $< + $(CC) $(CFLAGS) -c -o $@ $< # Clean up the junk clean: diff --git a/src/lib/libc/stdio/Makefile b/src/lib/libc/stdio/Makefile index 0693673..d5dc6b6 100644 --- a/src/lib/libc/stdio/Makefile +++ b/src/lib/libc/stdio/Makefile @@ -13,19 +13,19 @@ # Compile the source files .cc.o: - $(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c -o $@ $< + $(CXX) $(CFLAGS) $(INCLUDES) -c -o $@ $< .cc.s: - $(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $< + $(CXX) $(CFLAGS) $(INCLUDES) -S -o $@ $< .c.o: $(CC) $(CFLAGS) $(INCLUDES) -c $< .c.s: - $(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $< + $(CC) $(CFLAGS) $(INCLUDES) -S -o $@ $< .S.o: - $(CC) $(CFLAGS) -Wall -nostdlib -c -o $@ $< + $(CC) $(CFLAGS) -c -o $@ $< # Clean up the junk clean: diff --git a/src/lib/libc/stdio/vfprintf.c b/src/lib/libc/stdio/vfprintf.c index 44b5b66..68cb4c8 100644 --- a/src/lib/libc/stdio/vfprintf.c +++ b/src/lib/libc/stdio/vfprintf.c @@ -476,7 +476,6 @@ __use_xprintf = 1; if (__use_xprintf > 0) return (__xvprintf(fp, fmt0, ap)); - #ifndef NO_FLOATING_POINT /* * We can decompose the printed representation of floating @@ -648,6 +647,7 @@ dtoaresult = NULL; decimal_point = localeconv()->decimal_point; #endif + /* sorry, fprintf(read_only_file, "") returns EOF, not 0 */ if (prepwrite(fp) != 0) return (EOF); diff --git a/src/lib/libc/stdlib/Makefile b/src/lib/libc/stdlib/Makefile index 05738ef..715af49 100644 --- a/src/lib/libc/stdlib/Makefile +++ b/src/lib/libc/stdlib/Makefile @@ -14,19 +14,19 @@ # Compile the source files .cc.o: - $(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c -o $@ $< + $(CXX) $(CFLAGS) $(INCLUDES) -c -o $@ $< .cc.s: - $(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $< + $(CXX) $(CFLAGS) $(INCLUDES) -S -o $@ $< .c.o: $(CC) $(CFLAGS) $(INCLUDES) -c $< .c.s: - $(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $< + $(CC) $(CFLAGS) $(INCLUDES) -S -o $@ $< .S.o: - $(CC) $(CFLAGS) -Wall -nostdlib -c -o $@ $< + $(CC) $(CFLAGS) -c -o $@ $< # Clean up the junk clean: diff --git a/src/lib/libc/stdlib/getenv.c b/src/lib/libc/stdlib/getenv.c index 104992d..8c890a4 100644 --- a/src/lib/libc/stdlib/getenv.c +++ b/src/lib/libc/stdlib/getenv.c @@ -69,7 +69,7 @@ char **p, *cp; /* HACK */ - *offset = (int)environ; + *offset = 0xFA; return(0x0); if (name == NULL || environ == NULL) diff --git a/src/lib/libc/stdtime/Makefile b/src/lib/libc/stdtime/Makefile index f59963e..b2c78f2 100644 --- a/src/lib/libc/stdtime/Makefile +++ b/src/lib/libc/stdtime/Makefile @@ -2,11 +2,12 @@ # The System Makefile (C) 2002 The UbixOS Project # Include Global 'Source' Options -include ../../../Makefile.inc -include ../../Makefile.inc -include ../Makefile.inc +#include ../../../Makefile.inc +#include ../../Makefile.inc +#include ../Makefile.inc +include ../libc.inc -INCLUDES += -I../locale +#INCLUDES += -I../locale #Objects OBJS = asctime.o difftime.o localtime.o strftime.o strptime.o time32.o timelocal.o @@ -15,19 +16,19 @@ # Compile the source files .cc.o: - $(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c -o $@ $< + $(CXX) $(CFLAGS) $(INCLUDES) -c -o $@ $< .cc.s: - $(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $< + $(CXX) $(CFLAGS) $(INCLUDES) -S -o $@ $< .c.o: - $(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c $< + $(CC) $(CFLAGS) $(INCLUDES) -c $< .c.s: - $(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $< + $(CC) $(CFLAGS) $(INCLUDES) -S -o $@ $< .S.o: - $(CC) $(CFLAGS) -Wall -nostdlib -c -o $@ $< + $(CC) $(CFLAGS) -c -o $@ $< # Clean up the junk clean: diff --git a/src/lib/libc/string/Makefile b/src/lib/libc/string/Makefile index e6e6590..8711123 100644 --- a/src/lib/libc/string/Makefile +++ b/src/lib/libc/string/Makefile @@ -7,7 +7,7 @@ #include ../Makefile.inc include ../libc.inc -INCLUDES += -I../locale/ +#INCLUDES += -I../locale/ #Objects OBJS = ffsl.o fls.o flsl.o memccpy.o memmem.o stpcpy.o strcasecmp.o strcasestr.o strcoll.o strcspn.o strdup.o strerror.o strlcat.o strlcpy.o strmode.o strncat.o strncpy.o strnstr.o strpbrk.o strsep.o strsignal.o strspn.o strstr.o strtok.o strxfrm.o wcscat.o wcscoll.o wcscpy.o wcscspn.o wcslcat.o wcslcpy.o wcsncat.o wcsncmp.o wcsncpy.o wcspbrk.o wcsrchr.o wcsspn.o wcsstr.o wcstok.o wcswidth.o wcsxfrm.o wmemcmp.o wmemcpy.o wmemmove.o wmemset.o @@ -16,19 +16,19 @@ # Compile the source files .cc.o: - $(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c -o $@ $< + $(CXX) $(CFLAGS) $(INCLUDES) -c -o $@ $< .cc.s: - $(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $< + $(CXX) $(CFLAGS) $(INCLUDES) -S -o $@ $< .c.o: $(CC) $(CFLAGS) $(INCLUDES) -c $< .c.s: - $(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $< + $(CC) $(CFLAGS) $(INCLUDES) -S -o $@ $< .S.o: - $(CC) $(CFLAGS) -Wall -nostdlib -c -o $@ $< + $(CC) $(CFLAGS) -c -o $@ $< # Clean up the junk clean: diff --git a/src/lib/libc/sys/Makefile b/src/lib/libc/sys/Makefile index 8aee358..4e78fe6 100644 --- a/src/lib/libc/sys/Makefile +++ b/src/lib/libc/sys/Makefile @@ -14,19 +14,19 @@ # Compile the source files .cc.o: - $(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c -o $@ $< + $(CXX) $(CFLAGS) $(INCLUDES) -c -o $@ $< .cc.s: - $(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $< + $(CXX) $(CFLAGS) $(INCLUDES) -S -o $@ $< .c.o: - $(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c $< + $(CC) $(CFLAGS) $(INCLUDES) -c $< .c.s: - $(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $< + $(CC) $(CFLAGS) $(INCLUDES) -S -o $@ $< .S.o: - $(CC) $(CFLAGS) -Wall -nostdlib -c -o $@ $< + $(CC) $(CFLAGS) -c -o $@ $< # Clean up the junk clean: diff --git a/src/lib/libc/uthread/Makefile b/src/lib/libc/uthread/Makefile index ac97f32..0d55fd1 100644 --- a/src/lib/libc/uthread/Makefile +++ b/src/lib/libc/uthread/Makefile @@ -18,19 +18,19 @@ # Compile the source files .cc.o: - $(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c -o $@ $< + $(CXX) $(CFLAGS) $(INCLUDES) -c -o $@ $< .cc.s: - $(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $< + $(CXX) $(CFLAGS) $(INCLUDES) -S -o $@ $< .c.o: $(CC) $(CFLAGS) $(INCLUDES) -c $< .c.s: - $(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $< + $(CC) $(CFLAGS) $(INCLUDES) -S -o $@ $< .S.o: - $(CC) $(CFLAGS) -Wall -nostdlib -c -o $@ $< + $(CC) $(CFLAGS) -c -o $@ $< # Clean up the junk clean: diff --git a/src/lib/libc/uuid/Makefile b/src/lib/libc/uuid/Makefile index d1ece1d..0478f78 100644 --- a/src/lib/libc/uuid/Makefile +++ b/src/lib/libc/uuid/Makefile @@ -2,9 +2,10 @@ # The System Makefile (C) 2002 The UbixOS Project # Include Global 'Source' Options -include ../../../Makefile.inc -include ../../Makefile.inc -include ../Makefile.inc +#include ../../../Makefile.inc +#include ../../Makefile.inc +#include ../Makefile.inc +include ../libc.inc #Objects OBJS = uuid_compare.o uuid_create.o uuid_create_nil.o uuid_equal.o uuid_from_string.o uuid_hash.o uuid_is_nil.o uuid_to_string.o @@ -13,19 +14,19 @@ # Compile the source files .cc.o: - $(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c -o $@ $< + $(CXX) $(CFLAGS) $(INCLUDES) -c -o $@ $< .cc.s: - $(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $< + $(CXX) $(CFLAGS) $(INCLUDES) -S -o $@ $< .c.o: - $(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c $< + $(CC) $(CFLAGS) $(INCLUDES) -c $< .c.s: - $(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $< + $(CC) $(CFLAGS) $(INCLUDES) -S -o $@ $< .S.o: - $(CC) $(CFLAGS) -Wall -nostdlib -c -o $@ $< + $(CC) $(CFLAGS) -c -o $@ $< # Clean up the junk clean: diff --git a/src/lib/libc/xdr/Makefile b/src/lib/libc/xdr/Makefile index 0a180f1..4a4b75d 100644 --- a/src/lib/libc/xdr/Makefile +++ b/src/lib/libc/xdr/Makefile @@ -2,11 +2,12 @@ # The System Makefile (C) 2002 The UbixOS Project # Include Global 'Source' Options -include ../../../Makefile.inc -include ../../Makefile.inc -include ../Makefile.inc +#include ../../../Makefile.inc +#include ../../Makefile.inc +#include ../Makefile.inc +include ../libc.inc -INCLUDES += -I../rpc +#INCLUDES += -I../rpc #Objects OBJS = crypt_clnt.o crypt_xdr.o xdr.o xdr_array.o xdr_float.o xdr_mem.o xdr_rec.o xdr_reference.o xdr_sizeof.o xdr_stdio.o @@ -15,19 +16,19 @@ # Compile the source files .cc.o: - $(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c -o $@ $< + $(CXX) $(CFLAGS) $(INCLUDES) -c -o $@ $< .cc.s: - $(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $< + $(CXX) $(CFLAGS) $(INCLUDES) -S -o $@ $< .c.o: - $(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c $< + $(CC) $(CFLAGS) $(INCLUDES) -c $< .c.s: - $(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $< + $(CC) $(CFLAGS) $(INCLUDES) -S -o $@ $< .S.o: - $(CC) $(CFLAGS) -Wall -nostdlib -c -o $@ $< + $(CC) $(CFLAGS) -c -o $@ $< # Clean up the junk clean: diff --git a/src/lib/libc/yp/Makefile b/src/lib/libc/yp/Makefile index 5d45ad4..31a1419 100644 --- a/src/lib/libc/yp/Makefile +++ b/src/lib/libc/yp/Makefile @@ -14,19 +14,19 @@ # Compile the source files .cc.o: - $(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c -o $@ $< + $(CXX) $(CFLAGS) $(INCLUDES) -c -o $@ $< .cc.s: - $(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $< + $(CXX) $(CFLAGS) $(INCLUDES) -S -o $@ $< .c.o: $(CC) $(CFLAGS) $(INCLUDES) -c $< .c.s: - $(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $< + $(CC) $(CFLAGS) $(INCLUDES) -S -o $@ $< .S.o: - $(CC) $(CFLAGS) -Wall -nostdlib -c -o $@ $< + $(CC) $(CFLAGS) -c -o $@ $< # Clean up the junk clean: diff --git a/src/sys/kernel/kern_descrip.c b/src/sys/kernel/kern_descrip.c index 6077c2d..1e69259 100644 --- a/src/sys/kernel/kern_descrip.c +++ b/src/sys/kernel/kern_descrip.c @@ -44,7 +44,8 @@ #endif if (td->o_files[uap->fd] == 0x0) { - kprintf("ERROR!!!\n"); + kprintf("ERROR: No %i\n",uap->fd); +while(1); return(-1); } diff --git a/src/sys/vmm/pagefault.c b/src/sys/vmm/pagefault.c index 2793a25..1655b4c 100644 --- a/src/sys/vmm/pagefault.c +++ b/src/sys/vmm/pagefault.c @@ -115,7 +115,7 @@ spinUnlock(&pageFaultSpinLock); /* Need To Create A Routine For Attempting To Access Non Mapped Memory */ kprintf("Segfault At Address: [0x%X][0x%X][%i][0x%X] Non Mapped\n",memAddr,esp,_current->id,eip); - kprintf("Out Of Stack Space: [0x%X]\n",memAddr & 0xFF0000); + //kprintf("Out Of Stack Space: [0x%X]\n",memAddr & 0xFF0000); spinUnlock(&pageFaultSpinLock); endTask(_current->id); } @@ -132,6 +132,9 @@ /*** $Log$ + Revision 1.1.1.1 2007/01/17 03:31:51 reddawg + UbixOS + Revision 1.6 2006/12/05 14:10:21 reddawg Workign Distro