WebSVN – Kolibri OS – Path Comparison – / – /programs/develop/libraries/menuetlibc Rev 5029 and /programs/develop/libraries/menuetlibc Rev 5098

Regard whitespace Rev 5029 → Rev 5098

/programs/develop/libraries/menuetlibc/programs/binclock/Makefile
File deleted

/programs/develop/libraries/menuetlibc/programs/binclock/main.c
File deleted
\ No newline at end of file

/programs/develop/libraries/menuetlibc/programs/ld-dll.old/kernel.c
File deleted

/programs/develop/libraries/menuetlibc/programs/ld-dll.old/ld-dll.map
File deleted

/programs/develop/libraries/menuetlibc/programs/ld-dll.old/main.c
File deleted

/programs/develop/libraries/menuetlibc/programs/ld-dll.old/dll_list.c
File deleted

/programs/develop/libraries/menuetlibc/programs/ld-dll.old/load.map
File deleted

/programs/develop/libraries/menuetlibc/programs/ld-dll.old/loader.h
File deleted

/programs/develop/libraries/menuetlibc/programs/ld-dll.old/Makefile
File deleted

/programs/develop/libraries/menuetlibc/programs/multiview/Makefile
File deleted

/programs/develop/libraries/menuetlibc/programs/multiview/test.jpg
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/programs/develop/libraries/menuetlibc/programs/multiview/main.c
File deleted

/programs/develop/libraries/menuetlibc/programs/contemp/Makefile
File deleted

/programs/develop/libraries/menuetlibc/programs/contemp/main.c
File deleted

/programs/develop/libraries/menuetlibc/programs/rwtest/Makefile
File deleted

/programs/develop/libraries/menuetlibc/programs/rwtest/test.c
File deleted

/programs/develop/libraries/menuetlibc/programs/ld-dll/main.c
File deleted

/programs/develop/libraries/menuetlibc/programs/ld-dll/dll_list.c
File deleted

/programs/develop/libraries/menuetlibc/programs/ld-dll/Makefile
File deleted

/programs/develop/libraries/menuetlibc/programs/ld-dll/ld-dll.h
File deleted

/programs/develop/libraries/menuetlibc/programs/ld-dll/dll_desc.h
File deleted

/programs/develop/libraries/menuetlibc/programs/ld-dll/kernel.c
File deleted

/programs/develop/libraries/menuetlibc/programs/plaympg/Makefile
File deleted

/programs/develop/libraries/menuetlibc/programs/plaympg/main.c
File deleted

/programs/develop/libraries/menuetlibc/programs/Makefile
File deleted

/programs/develop/libraries/menuetlibc/programs/htmlview/textstreamparser.cpp
File deleted

/programs/develop/libraries/menuetlibc/programs/htmlview/parser.h
File deleted

/programs/develop/libraries/menuetlibc/programs/htmlview/html.cpp
File deleted

/programs/develop/libraries/menuetlibc/programs/htmlview/pagebuffer.cpp
File deleted

/programs/develop/libraries/menuetlibc/programs/htmlview/copying
File deleted

/programs/develop/libraries/menuetlibc/programs/htmlview/filestreamparser.cpp
File deleted

/programs/develop/libraries/menuetlibc/programs/htmlview/html.h
File deleted

/programs/develop/libraries/menuetlibc/programs/htmlview/parser.cpp
File deleted

/programs/develop/libraries/menuetlibc/programs/htmlview/Makefile
File deleted

/programs/develop/libraries/menuetlibc/Makefile
11,7 → 11,6
make -C src depend
make -C src
make -C stub
make -C programs

genconfig:
ifdef ON_MINGW
24,5 → 23,4
make -C src clean
make -C linuxtools clean
make -C stub clean
make -C programs clean
$(RM) mkversion$(EXESUFFIX)

/programs/develop/libraries/menuetlibc/Tupfile.lua
0,0 → 1,6
if tup.getconfig("TUP_PLATFORM") == "win32"
-- on win32 '#' is not a special character, but backslash and quotes would be printed as is
then tup.rule('echo #define NEEDS_UNDERSCORES > %o', {"config.h"})
-- on unix '#' should be escaped
else tup.rule('echo "#define NEEDS_UNDERSCORES" > %o', {"config.h"})
end

 /programs/develop/libraries/menuetlibc/include/libm/math.h
 ,7 → 167,7
 extern double j1 __P((double));
 extern double jn __P((int, double));
 extern double lgamma __P((double));
-extern double nan __P((void));
+extern double nan __P((const char*));
 extern double y0 __P((double));
 extern double y1 __P((double));
 extern double yn __P((int, double));
 ,7 → 187,7
 extern double pow10 __P((double));
 extern double pow2 __P((double));
 extern double powi __P((double, int));
-extern void   sincos __P((double *, double *, double));
+extern void   sincos __P((double, double *, double *));
 extern double remainder __P((double, double));
 extern double scalb __P((double, double));
 ,7 → 263,7
 extern float j1f __P((float));
 extern float jnf __P((int, float));
 extern float lgammaf __P((float));
-extern float nanf __P((void));
+extern float nanf __P((const char*));
 extern float y0f __P((float));
 extern float y1f __P((float));
 extern float ynf __P((int, float));

 /programs/develop/libraries/menuetlibc/include/math.h
 ,7 → 74,7
 double  pow10(double _x);
 double  pow2(double _x);
 double  powi(double, int);
-void    sincos(double *, double *, double);
+void    sincos(double, double *, double *);
 /* These are in libm.a (Cygnus).  You must link -lm to get these */
 /* See libm/math.h for comments */
 ,7 → 100,7
 extern double j1(double);
 extern double jn(int, double);
 extern double lgamma(double);
-extern double nan(void);
+extern double nan(const char*);
 extern double y0(double);
 extern double y1(double);
 extern double yn(int, double);
 ,7 → 152,7
 extern float j1f(float);
 extern float jnf(int, float);
 extern float lgammaf(float);
-extern float nanf(void);
+extern float nanf(const char*);
 extern float y0f(float);
 extern float y1f(float);
 extern float ynf(int, float);

 /programs/develop/libraries/menuetlibc/include/scripts/menuetos_app_v01.ld
 ,6 → 5,7
  .text 0x000000 :
  {
   code = . ; _code = . ;
+  *(.A)
   *(.text)
   *(.fixup)
   *(.gnu.warning)
 ,6 → 44,24
  {
   *(.bss)
  }
- end = . ; _end = . ;
+ end = . ; _end = . ; ___memsize = . ;
+  /DISCARD/ :
+  {
+    *(.debug$S)
+    *(.debug$T)
+    *(.debug$F)
+    *(.drectve)
+    *(.note.GNU-stack)
+    *(.eh_frame)
+    *(.comment)
+    *(.debug_abbrev)
+    *(.debug_info)
+    *(.debug_line)
+    *(.debug_frame)
+    *(.debug_loc)
+    *(.debug_pubnames)
+    *(.debug_aranges)
+    *(.debug_ranges)
 }
+}

 /programs/develop/libraries/menuetlibc/include/string.h
 ,8 → 49,8
 #include <sys/movedata.h>
 int     bcmp(const void *_ptr1, const void *_ptr2, int _length);
-void *  bcopy(const void *_a, void *_b, size_t _len);
-void *  bzero(void *ptr, size_t _len);
+void    bcopy(const void *_a, void *_b, size_t _len);
+void    bzero(void *ptr, size_t _len);
 int     ffs(int _mask);
 char *  index(const char *_string, int _c);
 void *  memccpy(void *_to, const void *_from, int c, size_t n);

 /programs/develop/libraries/menuetlibc/src/libc/Tupfile.lua
 ,0 → 1,85
+if tup.getconfig("NO_GCC") ~= "" then return end
+FOLDERS = {
+  "ansi/assert",
+  "ansi/ctype",
+  "ansi/errno",
+  "ansi/locale",
+  "ansi/math",
+  "ansi/setjmp",
+  "ansi/stdio",
+  "ansi/stdlib",
+  "ansi/string",
+  "ansi/time",
+  "ansif",
+  "compat/bsd",
+  "compat/io",
+  "compat/math",
+  "compat/mman",
+  "compat/mntent",
+  "compat/search",
+  "compat/signal",
+  "compat/stdio",
+  "compat/stdlib",
+  "compat/string",
+  "compat/sys/resource",
+  "compat/sys/stat",
+  "compat/sys/vfs",
+  "compat/termios",
+  "compat/time",
+  "compat/unistd",
+  "compat/v1",
+  "crt0",
+  "dos/compat",
+  "dos/dir",
+  "dos/dos",
+  "dos/dos_emu",
+  "dos/errno",
+  "dos/io",
+  "dos/process",
+  "dos/sys/timeb",
+  "fsext",
+  "menuetos",
+  "net",
+  "pc_hw/cpu",
+  "pc_hw/endian",
+  "pc_hw/farptr",
+  "pc_hw/fpu",
+  "pc_hw/hwint",
+  "pc_hw/kb",
+  "pc_hw/mem",
+  "pc_hw/sound",
+  "pc_hw/timer",
+  "posix/dirent",
+  "posix/fcntl",
+  "posix/fnmatch",
+  "posix/glob",
+  "posix/grp",
+-- "posix/regex", -- not compilable
+  "posix/pwd",
+  "posix/setjmp",
+  "posix/signal",
+  "posix/stdio",
+  "posix/sys/stat",
+  "posix/sys/times",
+  "posix/sys/wait",
+  "posix/unistd",
+  "posix/utime",
+  "posix/utsname",
+  "termios",
+}
+CFLAGS="-Os -fno-stack-check -fno-stack-protector -mno-stack-arg-probe -fno-ident -fomit-frame-pointer -fno-asynchronous-unwind-tables -mpreferred-stack-boundary=2"
+OBJS={}
+for i,v in ipairs(FOLDERS) do
+  tup.append_table(OBJS,
+    tup.foreach_rule({v .. "/*.c", extra_inputs = {"../../config.h"}},
+      'kos32-gcc -c -I../../include -D__DEV_CONFIG_H=\\"../../config.h\\" ' .. CFLAGS .. " -o %o %f",
+      v .. "/%B.o")
+  )
+  tup.append_table(OBJS,
+    tup.foreach_rule({v .. "/*.s", extra_inputs = {"../../config.h"}},
+      'kos32-cpp -I../../include -D__DEV_CONFIG_H=\\"../../config.h\\" %f | kos32-as -o %o',
+      v .. "/%B.o")
+  )
+end
+tup.rule(OBJS, "kos32-ar rcs %o %f", {"../../lib/libc.a", "../../<libc>"})

/programs/develop/libraries/menuetlibc/src/libc/ansi/stdio/fprintf.c
1,5 → 1,6
/* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */
#include <stdio.h>
#include <stdarg.h>
#include <libc/file.h>

int

 /programs/develop/libraries/menuetlibc/src/libc/compat/bsd/bcopy.c
 ,8 → 3,8
 #undef bcopy
-void *
+void
 bcopy(const void *a, void *b, size_t len)
 {
-  return memmove(b, a, len);
+  memmove(b, a, len);
 }

 /programs/develop/libraries/menuetlibc/src/libc/compat/bsd/bzero.c
 ,8 → 3,8
 #undef bzero
-void *
+void
 bzero(void *a, size_t b)
 {
-  return memset(a,0,b);
+  memset(a,0,b);
 }

 /programs/develop/libraries/menuetlibc/src/libc/compat/math/sincos.s
 ,18 → 6,18
 MK_C_SYM(sincos)
-        /* void sincos(double *cosine, double *sine, double x); */
+        /* void sincos(double x, double *sine, double *cosine); */
-        movl    16(%esp), %ecx
+        movl    8(%esp), %ecx
-        movl    4(%esp), %eax           /* Point to cosine. */
-        movl    8(%esp), %edx           /* Point to sine. */
+        movl    16(%esp), %eax          /* Point to cosine. */
+        movl    12(%esp), %edx          /* Point to sine. */
         andl    $0x7FF00000, %ecx       /* Examine exponent of x. */
         cmpl    $0x43E00000, %ecx       /* |x| >= 2^63 */
         jae     bigarg
-        fldl    12(%esp)
+        fldl    4(%esp)
         fsincos
         fstpl   (%eax)                  /* cos */
         fstpl   (%edx)                  /* sin */

/programs/develop/libraries/menuetlibc/src/libc/dos/dos_emu/fslayer.c
File deleted

/programs/develop/libraries/menuetlibc/src/libcpp/Tupfile.lua
0,0 → 1,6
if tup.getconfig('NO_GCC') ~= "" then return end
CFLAGS = "-Os -fno-stack-check -fno-stack-protector -mno-stack-arg-probe -fno-ident -fomit-frame-pointer -fno-asynchronous-unwind-tables -mpreferred-stack-boundary=2"
OBJS = tup.foreach_rule({"*.cpp", extra_inputs = {"../../config.h"}},
'kos32-gcc -c -I../../include -D__DEV_CONFIG_H=\\"../../config.h\\" ' .. CFLAGS .. " -o %o %f",
"%B.o")
tup.rule(OBJS, "kos32-ar rcs %o %f", {"../../lib/libcpp.a", "../../<libcpp>"})

/programs/develop/libraries/menuetlibc/src/libm/ef_sinh.s
File deleted

 /programs/develop/libraries/menuetlibc/src/libm/Tupfile.lua
 ,0 → 1,9
+if tup.getconfig('NO_GCC') ~= "" then return end
+CFLAGS="-D_USE_LIBM_MATH_H -Os -fno-stack-check -fno-stack-protector -mno-stack-arg-probe -fno-ident -fomit-frame-pointer -fno-asynchronous-unwind-tables -mpreferred-stack-boundary=2"
+OBJS = tup.foreach_rule({"*.c", extra_inputs = {"../../config.h"}},
+  'kos32-gcc -c -I../../include -D__DEV_CONFIG_H=\\"../../config.h\\" ' .. CFLAGS .. ' -o %o %f',
+  "%B.o")
+OBJS += tup.foreach_rule({"*.s", extra_inputs = {"../../config.h"}},
+  'kos32-cpp -I../../include -D__DEV_CONFIG_H=\\"../../config.h\\" %f | kos32-as -o %o',
+  "%B.o")
+tup.rule(OBJS, "kos32-ar rcs %o %f", {"../../lib/libm.a", "../../<libm>"})

 /programs/develop/libraries/menuetlibc/src/libm/k_standa.c
 ,6 → 28,8
 #undef fflush
 #endif  /* !defined(_USE_WRITE) */
+inline int fputs(const char* str, FILE* f) { return -1; }
 #ifdef __STDC__
 static const double zero = 0.0; /* used as const */
 #else

/programs/develop/libraries/menuetlibc/stub/Tupfile.lua
0,0 → 1,2
if tup.getconfig("NO_FASM") ~= "" then return end
tup.rule("crt0_coff.asm", "fasm %f %o", "crt0.o")

 /programs/develop/libraries/menuetlibc/stub/crt0_coff.asm
 ,6 → 7,7
 EXTRN ___menuet__app_param_area
 EXTRN ___menuet__app_path_area
 EXTRN ___crt1_startup
+EXTRN ___memsize
 start:
 public ___menuet__app_header
 public ___menuet__memsize
 ,7 → 23,7
 ; dd _edata
  dd 0
 ___menuet__memsize:
- dd 0x400000
+ dd ___memsize
  dd app_stack
  dd ___menuet__app_param_area
  dd ___menuet__app_path_area
 ,5 → 55,6
 end if
 section '.bss' readable writeable
-rd 0x20000
+;rd 0x20000
+rb 0x10000
 app_stack:

Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 5029 → Rev 5098