Changeset 566

Timestamp:

Aug 10, 2003, 5:24:21 PM (22 years ago)

Author:

zap

Message:

Fixed conflicts.

Location:

trunk/src/emx

Files:

• Makefile (modified) (4 diffs, 1 prop)
• include/ctype.h (modified) (2 diffs, 1 prop)
• include/sys/cdefs.h (modified) (1 diff, 1 prop)
• include/unidef.h (modified) (1 diff, 1 prop)
• src/emxbind/emxbind.c (modified) (1 diff, 1 prop)
• src/emxomf/emxomfar.c (modified) (1 diff, 1 prop)
• src/emxomf/emxomfld.c (modified) (1 diff, 1 prop)
• src/ld/ld.c (modified) (1 diff, 1 prop)
• src/lib/startup/dllinit.c (modified) (3 diffs, 1 prop)

trunk/src/emx/Makefile

@@ -15 +15 @@
 #
 # For a brief description of how build system works please read build.txt
+#
+# Bootstrapping sequence using EMX gcc compiler:
+#
+# 1. Backup include/ctype.h and rename include/ctype.h-bootstrap to
+#    include/ctype.h
+# 2. Run 'make os2', put the resulting library os2.a to emx/lib as _os2.a,
+#    and convert it to .lib with emxomf: 'emxomf _os2.a'
+# 3. Now compile everything you wish this way: 'make LIBS=-l_os2'
+#
 
 # Build type control variables. You can set them right from command line,
@@ -67 +76 @@
 CC = gcc -c -Zmt
 # The C compiler flags
-CFLAGS.INC  = -Iinclude -Isrc/include
+CFLAGS.INC  += -Iinclude -Isrc/include
 CFLAGS      = -Wall -mstack-arg-probe $(CFLAGS.INC) $(CFLAGS.$(MODE)) $(CFLAGS.KIND)
 # The additional C compiler flags for different build modes
@@ -86 +95 @@
 LD = gcc
 # Linker flags
-LDFLAGS     = $(LDFLAGS.$(MODE)) $(LDFLAGS.KIND) -Zmap -Zstack 1024
+LDFLAGS     = $(LDFLAGS.$(MODE)) $(LDFLAGS.KIND) -Zmap -Zstack 1024 $(LIBS)
 LDFLAGS.DLL = $(LDFLAGS) -Zdll
 # Linker flags for different build modes
@@ -167 +176 @@
 EMXOMF = `test -f '$.$(TOOLFMT)/emxomf$E' && echo '$.$(TOOLFMT)/'`emxomf$E
 DO.EMXOMF = $(EMXOMF) $(strip $1 -o) $@ $(if $<,$<, $(subst /omf/,/aout/,$(@:.obj=.o)) )
+
+# How to copy some file to installation directory
+# In optimize mode we have to strip the libraries after copying
+INSTALL=$(call CP,$1,$2)
+ifeq ($(MODE),opt)
+INSTALL += $(if $(filter-out %.a,$2),$(NL)strip --strip-debug $2)
+INSTALL += $(if $(filter-out %.lib,$2),$(NL)emxomf -s $2)
+endif
 
 # How to filter just the object files from $^

trunk/src/emx/include/ctype.h

@@ -1 @@
-/*
-    Locale support implementation through OS/2 Unicode API.
-    Copyright (c) 2003 InnoTek Systemberatung GmbH
-
-    For conditions of distribution and use, see the file COPYING.
-
-    Character type querying.
-*/
+/* ctype.h (emx+gcc) */
 
 #ifndef _CTYPE_H
@@ -15 +8 @@
 #endif
 
-#include <sys/locale.h>
+extern unsigned char _ctype[];
 
-static inline int isalnum (int _c)
-{ return __locale_ctype.cflags [_c & 0xff] & (__UPPER|__LOWER|__DIGIT); }
+#define _UPPER  0x01
+#define _LOWER  0x02
+#define _DIGIT  0x04
+#define _XDIGIT 0x08
+#define _CNTRL  0x10
+#define _SPACE  0x20
+#define _PUNCT  0x40
+#define _PRINT  0x80
 
-static inline int isalpha (int _c)
-{ return __locale_ctype.cflags [_c & 0xff] & (__UPPER|__LOWER); }
+extern inline int isalnum (int _c)
+  { return (_ctype+1)[_c] & (_UPPER|_LOWER|_DIGIT); }
+extern inline int isalpha (int _c)
+  { return (_ctype+1)[_c] & (_UPPER|_LOWER); }
+extern inline int iscntrl (int _c)
+  { return (_ctype+1)[_c] & (_CNTRL); }
+extern inline int isdigit (int _c)
+  { return (_ctype+1)[_c] & (_DIGIT); }
+extern inline int isgraph (int _c)
+  { return (_ctype+1)[_c] & (_PUNCT|_UPPER|_LOWER|_DIGIT); }
+extern inline int islower (int _c)
+  { return (_ctype+1)[_c] & (_LOWER); }
+extern inline int isprint (int _c)
+  { return (_ctype+1)[_c] & (_PRINT); }
+extern inline int ispunct (int _c)
+  { return (_ctype+1)[_c] & (_PUNCT); }
+extern inline int isspace (int _c)
+  { return (_ctype+1)[_c] & (_SPACE); }
+extern inline int isupper (int _c)
+  { return (_ctype+1)[_c] & (_UPPER); }
+extern inline int isxdigit (int _c)
+  { return (_ctype+1)[_c] & (_XDIGIT); }
 
-static inline int iscntrl (int _c)
-{ return __locale_ctype.cflags [_c & 0xff] & (__CNTRL); }
-
-static inline int isdigit (int _c)
-{ return __locale_ctype.cflags [_c & 0xff] & (__DIGIT); }
-
-static inline int isgraph (int _c)
-{ return __locale_ctype.cflags [_c & 0xff] & (__PUNCT|__UPPER|__LOWER|__DIGIT); }
-
-static inline int islower (int _c)
-{ return __locale_ctype.cflags [_c & 0xff] & (__LOWER); }
-
-static inline int isprint (int _c)
-{ return __locale_ctype.cflags [_c & 0xff] & (__PRINT); }
-
-static inline int ispunct (int _c)
-{ return __locale_ctype.cflags [_c & 0xff] & (__PUNCT); }
-
-static inline int isspace (int _c)
-{ return __locale_ctype.cflags [_c & 0xff] & (__SPACE); }
-
-static inline int isupper (int _c)
-{ return __locale_ctype.cflags [_c & 0xff] & (__UPPER); }
-
-static inline int isxdigit (int _c)
-{ return __locale_ctype.cflags [_c & 0xff] & (__XDIGIT); }
-
-static inline int toupper (int _c)
-{ return __locale_ctype.upcase [_c & 0xff]; }
-
-static inline int tolower (int _c)
-{ return __locale_ctype.locase [_c & 0xff]; }
-
-#if !defined (__STRICT_ANSI__) && !defined (_POSIX_SOURCE)
-
-#define isascii(c) (!((c) & 0x80))
-#define toascii(c) ((c) & 0x7f)
-
+#if !defined (_CTYPE_FUN)
+extern __inline__ int _toupper (int _c) { return (_c-'a'+'A'); }
+extern __inline__ int _tolower (int _c) { return (_c-'A'+'a'); }
+extern __inline__ int toupper(int _c)
+  {return (islower(_c) ? _toupper(_c) : _c);}
+extern __inline__ int tolower(int _c)
+  {return (isupper(_c) ? _tolower(_c) : _c);}
 #endif
 

trunk/src/emx/include/sys/cdefs.h

@@ -399 +399 @@
 #define __TCPPROTO(args) __P(args)
 
+/* For backward compatibility with GCC/EMX */
+#ifndef _System
+#define _System
+#endif
+
 #endif /* !_SYS_CDEFS_H_ */

trunk/src/emx/include/unidef.h

@@ -38 +38 @@
 #endif
 #ifndef APIENTRY
-#define APIENTRY _System
+# ifdef _System
+#  define APIENTRY _System
+# else
+#  define APIENTRY
+# endif
 #endif
 

trunk/src/emx/src/emxbind/emxbind.c

@@ -471 +471 @@
       file_name (out_fname, (dll_flag ? "dll" : "exe"),
                  (opt_o != NULL ? opt_o : inp_fname));
-      if (strcasecmp (inp_fname, out_fname) == 0)
+      if (stricmp (inp_fname, out_fname) == 0)
         error ("The input and output files have the same name");
       break;

trunk/src/emx/src/emxomf/emxomfar.c

@@ -382 +382 @@
           _remext (bak_fname);
           _defext (bak_fname, "bak");
-          if (strcasecmp (lib_fname, bak_fname) == 0)
+          if (stricmp (lib_fname, bak_fname) == 0)
             {
               fprintf (stderr, "Cannot update backup file\n");

trunk/src/emx/src/emxomf/emxomfld.c

@@ -164 +164 @@
 
 /* To avoid including os2.h... */
-#ifdef _System
-unsigned _System DosCopy (char *, char *, unsigned);
-#else
-unsigned DosCopy (char *, char *, unsigned);
+#ifndef _System
+#define _System
 #endif
-
+extern int _System DosCopy (char *, char *, int);
 
 /* Tell the user how to run this program. */

trunk/src/emx/src/ld/ld.c

@@ -46 +46 @@
 #endif
 
-/* old gcc will warn on __attribute__((system)) but still will compile */
-extern int __attribute__((system)) DosCopy (char *, char *, int);
+#ifndef _System
+#define _System
+#endif
+extern int _System DosCopy (char *, char *, int);
 
 /* We need .data of every module aligned to at least 16 bound

trunk/src/emx/src/lib/startup/dllinit.c

@@ -8 +8 @@
 extern void __ctordtorInit (void);
 extern void __ctordtorTerm (void);
+extern void __ehInit (void);
+#pragma weak __ehInit
+extern void __ehTerm (void);
+#pragma weak __ehTerm
+
+#ifndef _System
+# define _System
+#endif
 
 /**
- * This is the typical DLL startup code. __ehInitDLL and __ehTermDLL is called
- * are for exception handler stuff in gcc, the two functions will be linked if
- * there is exception handler info in the module. (Btw. if these calls wasn't
+ * This is the typical DLL startup code. __ehInit and __ehTerm is called
+ * are for exception handler stuff in gcc, the two functions will be linked if 
+ * there is exception handler info in the module. (Btw. if these calls wasn't 
  * made we would fail to catch exceptions in C++ code.)
  * @returns 1 on success.
@@ -34 +42 @@
        * trouble. Before too long we should put back this code.
        */
-      if (__ehInitDLL)
-        __ehInitDLL ();
+      if (__ehInit)
+        __ehInit ();
 #endif
       __ctordtorInit ();
@@ -42 +50 @@
       __ctordtorTerm ();
 #if 0 /* weaks aren't working at the moment */
-      if (__ehTermDLL)
-        __ehTermDLL ();
+      if (__ehTerm)
+        __ehTerm ();
 #endif
       return 1;