Changeset 2112 for trunk

Timestamp:

Jun 29, 2005, 5:29:31 AM (20 years ago)

Author:

bird

Message:

added memrawchr and strchrnul from glibc, enabling us to shop .S files from glibc at the same time.

Location:

trunk/src/emx

Files:

• ChangeLog.LIBC (modified) (1 diff, 1 prop)
• CompileOne.sh (modified) (2 diffs, 1 prop)
• Makefile.gmk (modified) (1 diff, 1 prop)
• include/string.h (modified) (2 diffs, 1 prop)
• src/lib/lgpl/include/config.h (modified) (1 diff, 1 prop)
• src/lib/lgpl/sysdeps/i386/rawmemchr.S (modified) (2 diffs, 1 prop)
• src/lib/lgpl/sysdeps/i386/strchrnul.S (modified) (3 diffs, 1 prop)
• src/lib/lgpl/sysdeps/i386/sysdep.h (modified) (1 diff, 1 prop)
• src/lib/lgpl/sysdeps/os2/sysdep.h (added)
• src/lib/lgpl/sysdeps/sysdeps.smak (modified) (1 diff, 1 prop)
• src/lib/libc.def (modified) (1 diff, 1 prop)
• src/lib/libc.smak (modified) (2 diffs, 1 prop)
• src/lib/libc06b4.def (modified) (1 diff, 1 prop)
• src/lib/mkstd.awk (modified) (1 diff, 1 prop)

trunk/src/emx/ChangeLog.LIBC

@@ -8 +8 @@
     - libc:
         o Added _NSIG and making NSIG and _NSIG equal to SIGRTMAX + 1.
+        o Added memrawchr and strchrnul from glibc, enabling us to shop .S
+          files from glibc at the same time.
 
 2005-06-27: knut st. osmundsen <bird-gccos2-spam@anduin.net>

trunk/src/emx/CompileOne.sh

@@ -14 +14 @@
     gcc -c -O3 -o $TMP/compileO3.o -fmessage-length=0 -x assembler-with-cpp \
      -DIN_INNOTEK_LIBC -D_NFILES=20 -DHAVE_CONFIG_H \
-     -I$SRCDIR -I$ROOTDIR/include -I$ROOTDIR/src/include -I$ROOTDIR/src/lib/bsd/include -I$OUTDIR/emx -I$ROOTDIR/src/lib/lgpl/include $1 \
+     -I$ROOTDIR/include -I$ROOTDIR/src/include -I$ROOTDIR/src/lib/bsd/include -I$OUTDIR/emx \
+     -I$ROOTDIR/src/lib/lgpl/sysdeps/os2 -I$ROOTDIR/src/lib/lgpl/ -I$ROOTDIR/src/lib/lgpl/include -I$ROOTDIR/src/lib/lgpl/sysdeps/generic \
+     -I$SRCDIR $1 \
  && gcc -c -O3 -o $TMP/compileLg.o -fmessage-length=0 -x assembler-with-cpp \
      -DIN_INNOTEK_LIBC -D_NFILES=20 -DHAVE_CONFIG_H -DDEBUG_LOGGING -D__LIBC_STRICT \
-     -I$SRCDIR -I$ROOTDIR/include -I$ROOTDIR/src/include -I$ROOTDIR/src/lib/bsd/include -I$OUTDIR/emx -I$ROOTDIR/src/lib/lgpl/include $1 \
+     -I$ROOTDIR/include -I$ROOTDIR/src/include -I$ROOTDIR/src/lib/bsd/include -I$OUTDIR/emx \
+     -I$ROOTDIR/src/lib/lgpl/sysdeps/os2 -I$ROOTDIR/src/lib/lgpl/ -I$ROOTDIR/src/lib/lgpl/include -I$ROOTDIR/src/lib/lgpl/sysdeps/generic \
+     -I$SRCDIR $1 \
  && echo succesfully built $1 \
  && nm -sS $TMP/compileO3.o
@@ -24 +28 @@
        gcc -c -O3 -o $TMP/compileO3.o -fmessage-length=0 -std=gnu99 -Wundef -Wall -Wmissing-prototypes -pedantic -Wno-long-long \
         -DIN_INNOTEK_LIBC -D_NFILES=20 -DHAVE_CONFIG_H \
-        -I$SRCDIR -I$ROOTDIR/include -I$ROOTDIR/src/include -I$ROOTDIR/src/lib/bsd/include -I$OUTDIR/emx -I$ROOTDIR/src/lib/lgpl/include $1 \
+        -I$ROOTDIR/include -I$ROOTDIR/src/include -I$ROOTDIR/src/lib/bsd/include -I$OUTDIR/emx \
+        -I$ROOTDIR/src/lib/lgpl/sysdeps/os2 -I$ROOTDIR/src/lib/lgpl/ -I$ROOTDIR/src/lib/lgpl/include -I$ROOTDIR/src/lib/lgpl/sysdeps/generic \
+        -I$SRCDIR $1 \
     && gcc -c -O3 -o $TMP/compileLg.o -fmessage-length=0 -std=gnu99 -Wundef -Wall -Wmissing-prototypes -pedantic -Wno-long-long \
         -DIN_INNOTEK_LIBC -D_NFILES=20 -DHAVE_CONFIG_H -DDEBUG_LOGGING -D__LIBC_STRICT \
-        -I$SRCDIR -I$ROOTDIR/include -I$ROOTDIR/src/include -I$ROOTDIR/src/lib/bsd/include -I$OUTDIR/emx -I$ROOTDIR/src/lib/lgpl/include $1 \
+        -I$SRCDIR -I$ROOTDIR/include -I$ROOTDIR/src/include -I$ROOTDIR/src/lib/bsd/include -I$OUTDIR/emx \
+        -I$ROOTDIR/src/lib/lgpl/sysdeps/os2 -I$ROOTDIR/src/lib/lgpl/ -I$ROOTDIR/src/lib/lgpl/include -I$ROOTDIR/src/lib/lgpl/sysdeps/generic \
+        -I$SRCDIR $1 \
     && echo succesfully built $1
 fi

trunk/src/emx/Makefile.gmk

@@ -97 +97 @@
 endif
 CFLAGS.INC  += -Isrc/include
-CFLAGS.INC  += -Isrc/lib/bsd/include
 CFLAGS      = -Wall -Wundef -Wmissing-prototypes -mstack-arg-probe $(CFLAGS.INC) $(CFLAGS.$(MODE)) $(CFLAGS.KIND)
 # The additional C compiler flags for different build modes

trunk/src/emx/include/string.h

@@ -170 +170 @@
 #define  memrchr(pach, ch, cch)     _memrchr(pach, ch, cch)
 int      strverscmp(const char *, const char *);
+char    *strchrnul(const char *, int);
+void    *rawmemchr(const void *, int);
+
 
 size_t   __strnlen(const char *, size_t);
@@ -178 +181 @@
 #define  __memrchr(pach, ch, cch)   _memrchr(pach, ch, cch)
 int      __strverscmp(const char *, const char *);
+char    *__strchrnul(const char *, int);
+void    *__rawmemchr(const void *, int);
 
 #endif

trunk/src/emx/src/lib/lgpl/include/config.h

@@ -100 +100 @@
 #endif
 
+#undef HAVE_ASM_SET_DIRECTIVE
+#define ASM_GLOBAL_DIRECTIVE        .globl
+#undef ASM_TYPE_DIRECTIVE_PREFIX
+#undef HAVE_GNU_LD
+#undef HAVE_ELF
+#undef HAVE_ASM_WEAK_DIRECTIVE
+#undef HAVE_ASM_WEAKEXT_DIRECTIVE
+
+#define DO_VERSIONING 0
+#ifndef __BOUNDED_POINTERS__
+#define __BOUNDED_POINTERS__ 0
+#endif
+
 #include "libc-alias.h"
 #endif

trunk/src/emx/src/lib/lgpl/sysdeps/i386/rawmemchr.S

@@ -39 +39 @@
 
         .text
-ENTRY (BP_SYM (__rawmemchr))
+ENTRY (BP_SYM (_STD (rawmemchr)))
         ENTER
 
@@ -225 +225 @@
         LEAVE
         RET_PTR
-END (BP_SYM (__rawmemchr))
-
-libc_hidden_def (BP_SYM (__rawmemchr))
-weak_alias (BP_SYM (__rawmemchr), BP_SYM (rawmemchr))
+END (BP_SYM (_STD (rawmemchr)))
+
+/*libc_hidden_def (BP_SYM (__rawmemchr)) */
+/*w e a k _ a l i a s (BP_SYM (__rawmemchr), BP_SYM (rawmemchr)) */

trunk/src/emx/src/lib/lgpl/sysdeps/i386/strchrnul.S

@@ -26 +26 @@
 #include "bp-sym.h"
 #include "bp-asm.h"
+#ifndef _LIBC_SYMBOLS_H
+#error
+#endif
 
 #define PARMS   LINKAGE+4       /* space for 1 saved reg */
@@ -33 +36 @@
 
         .text
-ENTRY (BP_SYM (__strchrnul))
+ENTRY (BP_SYM (_STD (strchrnul)))
         ENTER
 
@@ -282 +285 @@
         LEAVE
         RET_PTR
-END (BP_SYM (__strchrnul))
-
-weak_alias (BP_SYM (__strchrnul), BP_SYM (strchrnul))
+END (BP_SYM (_STD (strchrnul)))
+
+/*w e a k _ a l i a s (BP_SYM (__strchrnul), BP_SYM (strchrnul)) */

trunk/src/emx/src/lib/lgpl/sysdeps/i386/sysdep.h

@@ -109 +109 @@
 #define mcount          _mcount
 #endif
+#ifdef __EMX__
+#define mcount __mcount
+#endif
 
 #define PSEUDO(name, syscall_name, args)                                      \

trunk/src/emx/src/lib/lgpl/sysdeps/sysdeps.smak

@@ -1 @@
-libc.TSRC += $(wildcard src/lib/lgpl/sysdeps/os2/*.c)
+libc.TSRC += $(wildcard src/lib/lgpl/sysdeps/os2/*.c) \
+        $(wildcard src/lib/lgpl/sysdeps/i386/*.S)

trunk/src/emx/src/lib/libc.def

@@ -1741 +1741 @@
     "___isinfl" @1743
     "__std_isinf" @1744
+    ; 06r1
+    "__std_rawmemchr" @1745
+    "__std_strchrnul" @1746

trunk/src/emx/src/lib/libc.smak

@@ -30 +30 @@
 .TSRC   := $(libc.TSRC.$(CPU)) $(libc.TSRC)
 .TDEP   := $(libc.TDEP.$(CPU)) $(libc.TDEP)
-.TCF    := -I$. -Isrc/lib/bsd/locale -Isrc/lib/lgpl/include \
-        -DIN_INNOTEK_LIBC -D__DBINTERFACE_PRIVATE -D__NETBSD_SYSCALLS -DPOSIX_MISTAKE -DHAVE_CONFIG_H -D_BSD_NAMESPACE_POLLUTION
+.TCF    := \
+ -DIN_INNOTEK_LIBC \
+ -D__DBINTERFACE_PRIVATE \
+ -D__NETBSD_SYSCALLS \
+ -DPOSIX_MISTAKE \
+ -DHAVE_CONFIG_H \
+ -D_BSD_NAMESPACE_POLLUTION \
+ -I$.   \
+ -Isrc/lib/bsd/include \
+ -Isrc/lib/bsd/locale \
+ -Isrc/lib/lgpl \
+ -Isrc/lib/lgpl/sysdeps/os2 \
+ -Isrc/lib/lgpl/sysdeps/i386 \
+ -Isrc/lib/lgpl/sysdeps/generic \
+ -Isrc/lib/lgpl/include
+.TSF    += $(.TCF)
 .INSDIR = lib/
 .TKEEP  := 1
@@ -403 +417 @@
 # files for _STD() macros invocations. Fortunately, gawk rulez forever thus
 # this happens in just a fraction of second.
-$.stmp-libc-std: $(wildcard src/lib/*/*.c src/lib/*/386/*.s src/lib/bsd/*/*.c src/lib/bsd/*/glue/*.c src/lib/lgpl/*/*.c src/lib/msun/*/*.c src/lib/msun/*/*.S)
+$.stmp-libc-std: $(wildcard src/lib/*/*.c src/lib/*/386/*.s src/lib/msun/*/*.c src/lib/msun/*/*.S \
+                            src/lib/bsd/*/*.c src/lib/bsd/*/glue/*.c src/lib/lgpl/*/*.c \
+                                                        src/lib/lgpl/sysdeps/i386/*.S src/lib/lgpl/sysdeps/i386/*.c src/lib/lgpl/sysdeps/i386/i486/*.S)
         gawk -f src/lib/mkstd.awk $^ >__tmp__
         $(call UPDATE,__tmp__,$.libc-std.h)

trunk/src/emx/src/lib/libc06b4.def

@@ -1 +1 @@
 ; $Id$
 ;
-; Legacy LIBC Exports Ordinals.
+; LIBC06b4 forwarder DLL.
 ;
 ; Exports and ordinals listed here are treated as legacy stuff

trunk/src/emx/src/lib/mkstd.awk

@@ -46 +46 @@
 }
 
-/_STD\( *[_0-9A-Za-z]+ *\)/{
-  while (match($0, "_STD\\( *[_0-9A-Za-z ]+ *\\)"))
+/_STD *\( *[_0-9A-Za-z]+ *\)/{
+  while (match($0, "_STD *\\( *[_0-9A-Za-z ]+ *\\)"))
   {
-    std_fun[gensub("_STD\\( *([_0-9A-Za-z]+) *\\).*", "\\1", "", substr($0,RSTART,RLENGTH))]=1;
+    std_fun[gensub("_STD *\\( *([_0-9A-Za-z]+) *\\).*", "\\1", "", substr($0,RSTART,RLENGTH))]=1;
     $0 = substr($0, 1, RSTART-1) substr($0, RSTART+RLENGTH);
   }