Index: Makefile =================================================================== RCS file: /usr/local/cvsroot/uClibc/Makefile,v retrieving revision 1.1.1.1 retrieving revision 1.3 diff -u -r1.1.1.1 -r1.3 --- Makefile 2001/08/28 16:19:07 1.1.1.1 +++ Makefile 2001/08/31 15:39:13 1.3 @@ -27,7 +27,8 @@ # #-------------------------------------------------------- -TOPDIR=./ +.EXPORT_ALL_VARIABLES: +TOPDIR = $(shell pwd)/ include Rules.mak DIRS = extra ldso libc libcrypt libresolv libutil libm @@ -61,12 +62,17 @@ @echo headers: dummy - @rm -f include/asm include/linux include/bits + # it seems makefiles need the ./lib directory -- ilatypov + test -d lib || mkdir lib + @rm -f include/asm include/asm-$(TARGET_ARCH){,nommu} \ + include/linux include/bits @if [ $(TARGET_ARCH) = "powerpc" ];then \ ln -fs $(KERNEL_SOURCE)/include/asm-ppc include/asm; \ else \ if [ $(HAS_MMU) != "true" ]; then \ ln -fs $(KERNEL_SOURCE)/include/asm-$(TARGET_ARCH)nommu include/asm;\ + cp -a include/asm include/asm-$(TARGET_ARCH)nommu; \ + ln -fs $(KERNEL_SOURCE)/include/asm-$(TARGET_ARCH) include/asm-$(TARGET_ARCH); \ else \ ln -fs $(KERNEL_SOURCE)/include/asm-$(TARGET_ARCH) include/asm; \ fi; \ @@ -86,8 +92,9 @@ sleep 10; \ fi; @ln -fs $(KERNEL_SOURCE)/include/linux include/linux - @ln -fs ../libc/sysdeps/linux/$(TARGET_ARCH)/bits include/bits - (cd include/bits; ln -sf ../../../../../uClibc_config.h uClibc_config.h) + @ln -fs $(TOPDIR)uClibc_config.h \ + libc/sysdeps/linux/$(TARGET_ARCH)/bits/ + @ln -fs $(TOPDIR)libc/sysdeps/linux/$(TARGET_ARCH)/bits include/bits $(MAKE) -C libc/sysdeps/linux/$(TARGET_ARCH) headers uClibc_config.h: Makefile Config @@ -172,17 +179,33 @@ tags: ctags -R -install: install_dev install_runtime install_gcc +install: fresh_install install_dev install_runtime install_gcc +fresh_install: + rm -rf $(PREFIX)$(DEVEL_PREFIX) + rm -rf $(PREFIX)$(SYSTEM_DEVEL_PREFIX)bin # Installs header files and development library links. install_dev: - install -d $(PREFIX)$(DEVEL_PREFIX)/lib - install -m 644 lib/*.[ao] $(PREFIX)$(DEVEL_PREFIX)/lib/ - install -d $(PREFIX)$(DEVEL_PREFIX)/include - install -d $(PREFIX)$(DEVEL_PREFIX)/usr/lib - find include/ -name '*.h' -depth -follow -exec install \ - -D -m 644 {} $(PREFIX)$(DEVEL_PREFIX)/'{}' ';' + install -d $(PREFIX)$(DEVEL_PREFIX)lib + install -m 644 lib/*.[ao] $(PREFIX)$(DEVEL_PREFIX)lib/ + install -d $(PREFIX)$(DEVEL_PREFIX)include + install -d $(PREFIX)$(DEVEL_PREFIX)usr/lib + @# I want to leave asm* and linux* symlinks, but copy + @# the bits directory. It had to be a symlink before + @# make install because the libc/sysdeps/linux/$(TARGET_ARCH)/bits + @# directory was to be populated with few entries. + @# find include/ -name '*.h' -depth -follow -exec install \ + -D -m 644 {} $(PREFIX)$(DEVEL_PREFIX)'{}' ';' + cp -a include $(PREFIX)$(DEVEL_PREFIX) + rm -f $(PREFIX)$(DEVEL_PREFIX)include/bits # remove symlink + cp -a libc/sysdeps/linux/$(TARGET_ARCH)/bits \ + $(PREFIX)$(DEVEL_PREFIX)include/ + rm -f $(PREFIX)$(DEVEL_PREFIX)include/bits/uClibc_config.h + cp -a uClibc_config.h $(PREFIX)$(DEVEL_PREFIX)include/bits/ + @# For any symlink in libc/sysdeps/linux/$(TARGET_ARCH)/bits + @# take the file pointed to by the link and copy it to + @# $(PREFIX)$(DEVEL_PREFIX)include/bits. Not done yet. ifeq ($(strip $(HAVE_SHARED)),true) find lib/ -type l -name '*.so' -exec cp -a {} $(PREFIX)$(DEVEL_PREFIX)/lib ';' endif @@ -245,7 +268,9 @@ endif distclean clean: - @rm -rf tmp lib include/bits/uClibc_config.h uClibc_config.h + @rm -rf tmp lib include/asm include/asm-$(TARGET_ARCH){,nommu} \ + libc/sysdeps/linux/$(TARGET_ARCH)/bits/uClibc_config.h \ + include/bits uClibc_config.h - find include -type l -exec rm -f {} \; - find . \( -name \*.o -o -name \*.a -o -name \*.so -o -name core -o -name .\#\* \) -exec rm -f {} \; $(MAKE) -C test clean @@ -254,6 +279,7 @@ $(MAKE) -C libc/sysdeps/linux/common clean $(MAKE) -C libc/sysdeps/linux/$(TARGET_ARCH) clean $(MAKE) -C extra/gcc-uClibc clean + mv Config extra/Configs/Config.$(TARGET_ARCH) dist release: distclean cd ..; \ Index: Rules.mak =================================================================== RCS file: /usr/local/cvsroot/uClibc/Rules.mak,v retrieving revision 1.1.1.1 retrieving revision 1.4 diff -u -r1.1.1.1 -r1.4 --- Rules.mak 2001/08/28 16:19:07 1.1.1.1 +++ Rules.mak 2001/10/03 19:26:29 1.4 @@ -22,6 +22,7 @@ # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +.EXPORT_ALL_VARIABLES: include $(TOPDIR)Config MAJOR_VERSION=0 @@ -36,7 +37,8 @@ BUILDTIME = $(shell TZ=UTC date --utc "+%Y.%m.%d-%H:%M%z") -GCCINCDIR = $(shell $(CC) -print-search-dirs | sed -ne "s/install: \(.*\)/\1include/gp") +# GCCINCDIR = $(shell $(CC) -print-search-dirs | sed -ne "s/install: \(.*\)/\1include/gp") +GCCINCDIR = $(shell $(CC) -print-libgcc-file-name | sed -ne "s/\(.*\)libgcc.a/\1include/gp") # use '-Os' optimization if available, else use -O2, allow Config to override ifndef OPTIMIZATION @@ -46,26 +48,34 @@ ARFLAGS=r -CCFLAGS=$(WARNINGS) $(OPTIMIZATION) -fno-builtin -nostdinc $(CPUFLAGS) -I$(TOPDIR)include -I$(GCCINCDIR) -I. -D_LIBC -TARGET_CCFLAGS=--uclibc-use-build-dir $(WARNINGS) $(OPTIMIZATION) $(CPUFLAGS) +# CCFLAGS=$(WARNINGS) $(OPTIMIZATION) -fno-builtin -nostdinc $(CPUFLAGS) -I$(TOPDIR)include -I$(GCCINCDIR) -I. -D_LIBC +CCFLAGS := $(CFLAGS) $(WARNINGS) -I$(TOPDIR)include -I. -D_LIBC -CFLAGS=$(ARCH_CFLAGS) $(CCFLAGS) $(DEFS) $(ARCH_CFLAGS2) +# TARGET_CCFLAGS=--uclibc-use-build-dir $(WARNINGS) $(OPTIMIZATION) $(CPUFLAGS) +TARGET_CCFLAGS = --uclibc-use-build-dir $(CCFLAGS) + +# CFLAGS=$(ARCH_CFLAGS) $(CCFLAGS) $(DEFS) $(ARCH_CFLAGS2) +CFLAGS := $(CCFLAGS) + TARGET_CC= $(TOPDIR)extra/gcc-uClibc/$(TARGET_ARCH)-uclibc-gcc -TARGET_CFLAGS=$(ARCH_CFLAGS) $(TARGET_CCFLAGS) $(DEFS) $(ARCH_CFLAGS2) + +# TARGET_CFLAGS=$(ARCH_CFLAGS) $(TARGET_CCFLAGS) $(DEFS) $(ARCH_CFLAGS2) +TARGET_CFLAGS := $(CFLAGS) + NATIVE_ARCH = $(shell uname -m | sed -e 's/i.86/i386/' -e 's/sparc.*/sparc/' \ -e 's/arm.*/arm/g' -e 's/m68k.*/m68k/' -e 's/ppc/powerpc/g') ifeq ($(strip $(DODEBUG)),true) CFLAGS += -g TARGET_CFLAGS += -g - LDFLAGS = -nostdlib -Wl,-warn-common - TARGET_LDFLAGS = --uclibc-use-build-dir -Wl,-warn-common + LDFLAGS += -nostdlib -Wl,-warn-common + TARGET_LDFLAGS := --uclibc-use-build-dir $(LDFLAGS) STRIPTOOL = /bin/true -Since_we_are_debugging else CFLAGS += -DNDEBUG #-fomit-frame-pointer TARGET_CFLAGS += -DNDEBUG #-fomit-frame-pointer - LDFLAGS = -s -nostdlib -Wl,-warn-common - TARGET_LDFLAGS = --uclibc-use-build-dir -s -Wl,-warn-common + LDFLAGS += -s -nostdlib -Wl,-warn-common + TARGET_LDFLAGS := --uclibc-use-build-dir $(LDFLAGS) endif ifeq ($(strip $(DOPIC)),true) CFLAGS += -fPIC Index: makeflags =================================================================== RCS file: makeflags diff -N makeflags --- /dev/null Tue May 5 16:32:27 1998 +++ makeflags Fri Oct 26 10:32:41 2001 @@ -0,0 +1 @@ +export MAKE := flags davidm - make Index: extra/Configs/Config.i386 =================================================================== RCS file: /usr/local/cvsroot/uClibc/extra/Configs/Config.i386,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- extra/Configs/Config.i386 2001/08/28 16:19:07 1.1.1.1 +++ extra/Configs/Config.i386 2001/10/03 19:28:39 1.2 @@ -24,6 +24,9 @@ # other sundry sources. Files within this library are copyright by their # respective copyright holders. +.EXPOR_ALL_VARIABLES: +include $(TOPDIR)makeflags + # What arch do you want to compile for... #TARGET_ARCH=arm TARGET_ARCH=i386 @@ -57,7 +60,7 @@ # can't do that. Similarly, if you compile uClibc vs Linux 2.4.x kernel headers, # but then run on Linux 2.0.x, lchown will be compiled into uClibc, but won't # work at all. You have been warned. -KERNEL_SOURCE=/usr/src/linux +KERNEL_SOURCE=$(HOME)/linux # Set this to `false' if your CPU doesn't have a memory management unit (MMU). # Set it to `true' otherwise. @@ -66,15 +69,15 @@ # Set this to `false' if you don't have/need basic floating point support # support in libc (strtod, printf, scanf). Set it to `true' otherwise. # Note: If not true, Rules.mak disables libm as well. -HAS_FLOATING_POINT = true +HAS_FLOATING_POINT = false # Set this to `false' if you don't have/need float functions in libm. # Set it to `true' otherwise, and make sure HAS_FLOATING_POINT is true as well. -HAS_LIBM_FLOAT = true +HAS_LIBM_FLOAT = false # Set this to `false' if you don't have/need double functions in libm. # Set it to `true' otherwise, and make sure HAS_FLOATING_POINT is true as well. -HAS_LIBM_DOUBLE = true +HAS_LIBM_DOUBLE = false # Set this to `false' if you don't have/need long double functions in libm. # Set it to `true' otherwise, and make sure HAS_FLOATING_POINT is true as well. Index: extra/Configs/Config.m68k =================================================================== RCS file: /usr/local/cvsroot/uClibc/extra/Configs/Config.m68k,v retrieving revision 1.1.1.1 retrieving revision 1.3 diff -u -r1.1.1.1 -r1.3 --- extra/Configs/Config.m68k 2001/08/28 16:19:07 1.1.1.1 +++ extra/Configs/Config.m68k 2001/08/31 15:40:29 1.3 @@ -24,6 +24,9 @@ # other sundry sources. Files within this library are copyright by their # respective copyright holders. +.EXPORT_ALL_VARIABLES: +include $(TOPDIR)makeflags + # What arch do you want to compile for... #TARGET_ARCH=arm #TARGET_ARCH=i386 @@ -36,11 +39,11 @@ # to something more interesting... NATIVE_CC = gcc #CROSS = m68k-elf- -CC = $(CROSS)gcc -AR = $(CROSS)ar -LD = $(CROSS)ld -NM = $(CROSS)nm -STRIPTOOL = $(CROSS)strip +#CC = $(CROSS)gcc +#AR = $(CROSS)ar +#LD = $(CROSS)ld +#NM = $(CROSS)nm +#STRIPTOOL = $(CROSS)strip #STRIPTOOL = /bin/true # Set the following to `true' to make a debuggable build, and `false' for @@ -57,7 +60,11 @@ # can't do that. Similarly, if you compile uClibc vs Linux 2.4.x kernel headers, # but then run on Linux 2.0.x, lchown will be compiled into uClibc, but won't # work at all. You have been warned. -KERNEL_SOURCE=/usr/src/linux +ifdef KERNEL_DIR + KERNEL_SOURCE = $(KERNEL_DIR) +else + KERNEL_SOURCE = $(shell cd $(TOPDIR)/..; pwd)/uClinux-2.4.x/ +endif # Set this to `false' if your CPU doesn't have a memory management unit (MMU). # Set it to `true' otherwise. @@ -182,7 +189,7 @@ # This value is used by the 'make install' Makefile target. Since this # directory is compiled into the uclibc cross compiler spoofer, you # have to recompile if you change this value... -DEVEL_PREFIX = /opt/uClinux/$(TARGET_ARCH)-elf +DEVEL_PREFIX = $(TARGET_ARCH)-elf/ # SYSTEM_DEVEL_PREFIX is the directory prefix used when installing # usr/bin/arch-uclibc-gcc, usr/bin/arch-uclibc-ld, etc. This is only @@ -195,5 +202,5 @@ # directory, the define PREFIX during the install step, # i.e., 'make PREFIX=/var/tmp/uClibc install'. #PREFIX = $(TOPDIR)/_install -PREFIX = +PREFIX = $(shell cd $(TOPDIR)/..; pwd)/install/ Index: extra/gcc-uClibc/Makefile =================================================================== RCS file: /usr/local/cvsroot/uClibc/extra/gcc-uClibc/Makefile,v retrieving revision 1.1.1.1 retrieving revision 1.4 diff -u -r1.1.1.1 -r1.4 --- extra/gcc-uClibc/Makefile 2001/08/28 16:19:07 1.1.1.1 +++ extra/gcc-uClibc/Makefile 2001/10/03 19:26:32 1.4 @@ -2,9 +2,11 @@ include $(TOPDIR)Rules.mak UCLIBC_DIR = $(shell (cd ../.. ; /bin/pwd)) -GCC_BIN = $(shell which $(CC)) +# GCC_BIN = $(shell which $(CC)) +GCC_BIN = $(shell which $(shell (set -- $(CC) ; echo $$1))) LD_BIN = $(shell which $(LD)) GCC_LIB = $(shell $(CC) -print-libgcc-file-name ) +#GCC_LIB = $(LIBGCCDIR)libgcc.a #GCCINCDIR inherited from Rules.mak all: gcc-uClibc ld-uClibc @@ -15,6 +17,8 @@ @echo "#define UCLIBC_DEVEL_PREFIX " \"$(DEVEL_PREFIX)\" >> gcc-uClibc.h @echo "#define UCLIBC_BUILD_DIR " \"$(UCLIBC_DIR)/\" >> gcc-uClibc.h @echo "#define GCC_BIN " \"$(GCC_BIN)\" >> gcc-uClibc.h + @echo "#define GCC_MACHINE_FLAG " \"$(GCC_MACHINE_FLAG)\" >> \ + gcc-uClibc.h @echo "#define GCC_LIB " \"$(GCC_LIB)\" >> gcc-uClibc.h @echo "#define GCC_INCDIR " \"-I$(GCCINCDIR)/\" >> gcc-uClibc.h @echo "#define TARGET_ARCH " \"$(TARGET_ARCH)\" >> gcc-uClibc.h @@ -32,18 +36,19 @@ chmod a+x $(TARGET_ARCH)-uclibc-ld install: all - install -d $(PREFIX)$(DEVEL_PREFIX)/bin; - install -d $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin; - install -m 755 $(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/ - install -m 755 $(TARGET_ARCH)-uclibc-ld $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/ - ln -fs $(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-cc - ln -fs $(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(DEVEL_PREFIX)/bin/gcc - ln -fs $(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(DEVEL_PREFIX)/bin/cc - ln -fs $(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-ld $(PREFIX)$(DEVEL_PREFIX)/bin/ld + install -d $(PREFIX)$(DEVEL_PREFIX)bin; + install -d $(PREFIX)$(SYSTEM_DEVEL_PREFIX)bin; + install -m 755 $(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(SYSTEM_DEVEL_PREFIX)bin/ + install -m 755 $(TARGET_ARCH)-uclibc-ld $(PREFIX)$(SYSTEM_DEVEL_PREFIX)bin/ + ln -fs $(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(SYSTEM_DEVEL_PREFIX)bin/$(TARGET_ARCH)-uclibc-cc + ln -fs $(PREFIX)$(SYSTEM_DEVEL_PREFIX)bin/$(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(DEVEL_PREFIX)bin/gcc + ln -fs $(PREFIX)$(SYSTEM_DEVEL_PREFIX)bin/$(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(DEVEL_PREFIX)bin/cc + ln -fs $(PREFIX)$(SYSTEM_DEVEL_PREFIX)bin/$(TARGET_ARCH)-uclibc-ld $(PREFIX)$(DEVEL_PREFIX)bin/ld for app in addr2line ar as cpp gasp nm objcopy \ objdump ranlib size strings strip; do \ - ln -fs `which $(CROSS)$${app}` $(PREFIX)$(DEVEL_PREFIX)/bin/$${app}; \ - ln -fs `which $(CROSS)$${app}` $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-$${app}; \ + tool="`which $(CROSS)$${app}`" ; \ + test ".$${tool}" = "." || ln -fs "$${tool}" $(PREFIX)$(DEVEL_PREFIX)bin/$${app}; \ + test ".$${tool}" = "." || ln -fs "$${tool}" $(PREFIX)$(SYSTEM_DEVEL_PREFIX)bin/$(TARGET_ARCH)-uclibc-$${app}; \ done clean: Index: extra/gcc-uClibc/gcc-uClibc.c =================================================================== RCS file: /usr/local/cvsroot/uClibc/extra/gcc-uClibc/gcc-uClibc.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- extra/gcc-uClibc/gcc-uClibc.c 2001/08/28 16:19:07 1.1.1.1 +++ extra/gcc-uClibc/gcc-uClibc.c 2001/08/28 16:30:00 1.2 @@ -202,6 +202,7 @@ i = 0; gcc_argv[i++] = GCC_BIN; + gcc_argv[i++] = GCC_MACHINE_FLAG; for ( j = 1 ; j < argc ; j++ ) { if (strcmp("--uclibc-use-build-dir",argv[j]) == 0) { use_build_dir = 1; Index: include/ctype.h =================================================================== RCS file: /usr/local/cvsroot/uClibc/include/ctype.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- include/ctype.h 2001/08/28 16:19:07 1.1.1.1 +++ include/ctype.h 2001/08/28 16:31:11 1.2 @@ -33,24 +33,31 @@ #if defined(__USE_CTYPE_MACROS) && !defined __UCLIBC_HAS_LOCALE__ /* macro definitions */ -#define isalnum(c) (isalpha(c) || isdigit(c)) -#define isalpha(c) (isupper(c) || islower(c)) -#define isascii(c) (c > 0 && c <= 0x7f) -#define iscntrl(c) ((c >= 0) && ((c <= 0x1F) || (c == 0x7f))) -#define isdigit(c) (c >= '0' && c <= '9') -#define isgraph(c) (c != ' ' && isprint(c)) -#define islower(c) (c >= 'a' && c <= 'z') -#define isprint(c) (c >= ' ' && c <= '~') -#define ispunct(c) ((c > ' ' && c <= '~') && !isalnum(c)) -#define isspace(c) (c == ' ' || c == '\f' || c == '\n' || c == '\r' ||\ - c == '\t' || c == '\v') -#define isupper(c) (c >= 'A' && c <= 'Z') -#define isxdigit(c) (isxupper(c) || isxlower(c)) -#define isxlower(c) (isdigit(c) || (c >= 'a' && c <= 'f')) -#define isxupper(c) (isdigit(c) || (c >= 'A' && c <= 'F')) +#define isalnum(c) ({ int __c = c; isalpha(__c) || isdigit(__c); }) +#define isalpha(c) ({ int __c = c; isupper(__c) || islower(__c); }) +#define isascii(c) ({ int __c = c; __c > 0 && __c <= 0x7f; }) +#define iscntrl(c) ({ int __c = c; \ + (__c >= 0) && ((__c <= 0x1F) || (__c == 0x7f)); }) +#define isdigit(c) ({ int __c = c; __c >= '0' && __c <= '9'; }) +#define isgraph(c) ({ int __c = c; __c != ' ' && isprint(__c); }) +#define islower(c) ({ int __c = c; __c >= 'a' && __c <= 'z'; }) +#define isprint(c) ({ int __c = c; __c >= ' ' && __c <= '~'; }) +#define ispunct(c) ({ int __c = c; \ + (__c > ' ' && __c <= '~') && !isalnum(__c); }) +#define isspace(c) ({ int __c = c; \ + __c == ' ' || __c == '\f' || __c == '\n' || __c == '\r' || \ + __c == '\t' || __c == '\v'; }) +#define isupper(c) ({ int __c = c; __c >= 'A' && __c <= 'Z'; }) +#define isxdigit(c) ({ int __c = c; isxupper(__c) || isxlower(__c); }) +#define isxlower(c) ({ int __c = c; \ + isdigit(__c) || (__c >= 'a' && __c <= 'f'); }) +#define isxupper(c) ({ int __c = c; \ + isdigit(__c) || (__c >= 'A' && __c <= 'F'); }) #define toascii(c) (c & 0x7f) -#define tolower(c) (isupper(c) ? ( c - 'A' + 'a') : (c)) -#define toupper(c) (islower(c) ? (c - 'a' + 'A') : (c)) +#define tolower(c) ({ int __c = c; \ + isupper(__c) ? ( __c - 'A' + 'a') : (__c); }) +#define toupper(c) ({ int __c = c; \ + islower(__c) ? (__c - 'a' + 'A') : (__c); }) #endif Index: include/time.h =================================================================== RCS file: /usr/local/cvsroot/uClibc/include/time.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- include/time.h 2001/08/28 16:19:07 1.1.1.1 +++ include/time.h 2001/08/31 15:43:12 1.2 @@ -25,6 +25,8 @@ #include #include +#include +#include #ifndef _TIME_T #define _TIME_T @@ -48,9 +50,6 @@ #define NULL ((void *) 0) #endif #endif - -#define CLOCKS_PER_SEC 100 -#define CLK_TCK 100 /* That must be the same as HZ ???? */ struct tm { int tm_sec; Index: include/sys/syslog.h =================================================================== RCS file: /usr/local/cvsroot/uClibc/include/sys/syslog.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- include/sys/syslog.h 2001/08/28 16:19:07 1.1.1.1 +++ include/sys/syslog.h 2001/08/28 16:31:50 1.2 @@ -41,7 +41,7 @@ #include -#define _PATH_LOG "/dev/log" +#define _PATH_LOG "/var/syslog" /* * priorities/facilities are encoded into a single 32-bit quantity, where the Index: ldso/d-link/Makefile =================================================================== RCS file: /usr/local/cvsroot/uClibc/ldso/d-link/Makefile,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- ldso/d-link/Makefile 2001/08/28 16:19:07 1.1.1.1 +++ ldso/d-link/Makefile 2001/10/03 19:22:58 1.2 @@ -52,7 +52,7 @@ echo "#define _dl_static_progname \""$(UCLIBC_LDSO)"\"" > ld.so.h $(COBJS): %.o : %.c - $(TARGET_CC) $(TARGET_CFLAGS) -I. -I./$(TARGET_ARCH) -I../libdl -c $< -o $@ + $(TARGET_CC) -I. $(TARGET_CFLAGS) -I./$(TARGET_ARCH) -I../libdl -c $< -o $@ $(STRIPTOOL) -x -R .note -R .comment $*.o clean:: Index: libc/Makefile =================================================================== RCS file: /usr/local/cvsroot/uClibc/libc/Makefile,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- libc/Makefile 2001/08/28 16:19:07 1.1.1.1 +++ libc/Makefile 2001/08/28 16:32:41 1.2 @@ -43,7 +43,7 @@ shared: $(TOPDIR)lib/$(LIBNAME) @rm -rf tmp @mkdir tmp - @(cd tmp; CC=$(CC) LD=$(LD) NM=$(NM) AR=$(AR) /bin/sh ../../extra/scripts/get-needed-libgcc-objects.sh) + @(cd tmp; CC="$(CC)" LD="$(LD)" NM="$(NM)" AR="$(AR)" /bin/sh ../../extra/scripts/get-needed-libgcc-objects.sh) if [ -s ./tmp/libgcc-need.a ] ; then \ $(CC) -g $(LDFLAGS) -shared -o $(SHARED_FULLNAME) \ -Wl,-soname,$(SHARED_MAJORNAME) -Wl,--whole-archive \ Index: libc/stdlib/malloc-simple/alloc.c =================================================================== RCS file: /usr/local/cvsroot/uClibc/libc/stdlib/malloc-simple/alloc.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- libc/stdlib/malloc-simple/alloc.c 2001/08/28 16:19:07 1.1.1.1 +++ libc/stdlib/malloc-simple/alloc.c 2001/09/05 23:25:12 1.2 @@ -93,7 +93,8 @@ void free(void *ptr) { - munmap(ptr, 0); + if (ptr) + munmap(ptr, 0); } #endif Index: libc/sysdeps/linux/m68k/Makefile =================================================================== RCS file: /usr/local/cvsroot/uClibc/libc/sysdeps/linux/m68k/Makefile,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- libc/sysdeps/linux/m68k/Makefile 2001/08/28 16:19:08 1.1.1.1 +++ libc/sysdeps/linux/m68k/Makefile 2001/08/28 16:32:50 1.2 @@ -60,7 +60,7 @@ $(STRIPTOOL) -x -R .note -R .comment $*.o headers: - @(TOPDIR=$(TOPDIR) CC=$(CC) /bin/sh $(TOPDIR)/extra/scripts/gen_bits_syscall_h.sh > bits/syscall.h ) + @(TOPDIR="$(TOPDIR)" CC="$(CC)" /bin/sh $(TOPDIR)/extra/scripts/gen_bits_syscall_h.sh > bits/syscall.h ) ifeq ($(strip $(HAVE_ELF)),false) echo "Working around compiler bug in the m68k-pic-coff toolchain" cd $(TOPDIR)/include;ln -fs ../libc/sysdeps/linux/m68k/float.h . @@ -69,6 +69,7 @@ clean: rm -f *.[oa] *~ core + rm -f bits/syscall.h ifeq ($(strip $(HAVE_ELF)),false) rm -f $(TOPDIR)/include/float.h endif