Changeset 94 for trunk/src/emx/include

Timestamp:

May 5, 2003, 8:48:59 PM (22 years ago)

Author:

zap

Message:

This is the start of work on making EMX C runtime EMX-independent ;-)
The first signs of a GNU Make-based build system.
Fixed a lot of .s files to comply with new GAS syntax.
Added a lot of submakefiles for every sub-library.
Replaced EM's getopt.h with the one from libiberty (which supports
getopt_long). The old getopt.h has moved to include/emx, so if
some tool needs it (and you don't want to fix it to use the new getopt),
replace #include <getopt.h> with #include <emx/getopt.h>. Did so in
most EMX tools.

Location:

trunk/src/emx/include

Files:

• a_out.h (modified) (1 diff, 1 prop)
• emx/asm386.h (modified) (1 diff, 1 prop)
• emx/getopt.h (added)
• getopt.h (modified) (1 diff, 1 prop)
• os2.h (modified) (1 diff, 1 prop)

trunk/src/emx/include/a_out.h

@@ -132 +132 @@
 /* Copied from aout64.h of BFD */
 #define N_WEAKU 0x0d            /* Weak undefined symbol.  */
+#define N_WEAKA 0x0e            /* Weak absolute symbol.  */
+#define N_WEAKT 0x0f            /* Weak text symbol.  */
+#define N_WEAKD 0x10            /* Weak data symbol.  */
+#define N_WEAKB 0x11            /* Weak bss symbol.  */
 /* emx */
 #define N_IMP1  0x68            /* Import definition symbol */

trunk/src/emx/include/emx/asm386.h

@@ -3 +3 @@
 #include <sys/errno.h>
 
-#define _xam fxam; fstsww %ax; andb $0x45, %ah
+#define _xam fxam; fstsw %ax; andb $0x45, %ah
 
 #define j_nan cmpb $0x01, %ah; je

trunk/src/emx/include/getopt.h

@@ -1 @@
-/* getopt (emx+gcc) */
+/* Declarations for getopt.
+   Copyright (C) 1989,90,91,92,93,94,96,97 Free Software Foundation, Inc.
+
+   NOTE: The canonical source of this file is maintained with the GNU C Library.
+   Bugs can be reported to bug-glibc@gnu.org.
+
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by the
+   Free Software Foundation; either version 2, or (at your option) any
+   later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */
 
 #ifndef _GETOPT_H
-#define _GETOPT_H
+#define _GETOPT_H 1
 
-#if defined (__cplusplus)
+#ifdef  __cplusplus
 extern "C" {
 #endif
 
-extern char *optarg;       /* argument of current option                    */
-extern int optind;         /* index of next argument; default=0: initialize */
-extern int opterr;         /* 0=disable error messages; default=1: enable   */
-extern int optopt;         /* option character which caused the error       */
-extern char *optswchar;    /* characters introducing options; default="-"   */
+/* For communication from `getopt' to the caller.
+   When `getopt' finds an option that takes an argument,
+   the argument value is returned here.
+   Also, when `ordering' is RETURN_IN_ORDER,
+   each non-option ARGV-element is returned here.  */
 
-extern enum _optmode
+extern char *optarg;
+
+/* Index in ARGV of the next element to be scanned.
+   This is used for communication to and from the caller
+   and for communication between successive calls to `getopt'.
+
+   On entry to `getopt', zero means this is the first call; initialize.
+
+   When `getopt' returns -1, this is the index of the first of the
+   non-option elements that the caller should itself scan.
+
+   Otherwise, `optind' communicates from one call to the next
+   how much of ARGV has been scanned so far.  */
+
+extern int optind;
+
+/* Callers store zero here to inhibit the error message `getopt' prints
+   for unrecognized options.  */
+
+extern int opterr;
+
+/* Set to an option character which was unrecognized.  */
+
+extern int optopt;
+
+/* Describe the long-named options requested by the application.
+   The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector
+   of `struct option' terminated by an element containing a name which is
+   zero.
+
+   The field `has_arg' is:
+   no_argument          (or 0) if the option does not take an argument,
+   required_argument    (or 1) if the option requires an argument,
+   optional_argument    (or 2) if the option takes an optional argument.
+
+   If the field `flag' is not NULL, it points to a variable that is set
+   to the value given in the field `val' when the option is found, but
+   left unchanged if the option is not found.
+
+   To have a long-named option do something other than set an `int' to
+   a compiled-in constant, such as set a value from `optarg', set the
+   option's `flag' field to zero and its `val' field to a nonzero
+   value (the equivalent single-letter option character, if there is
+   one).  For long options that have a zero `flag' field, `getopt'
+   returns the contents of the `val' field.  */
+
+struct option
 {
-  GETOPT_UNIX,             /* options at start of argument list (default)   */
-  GETOPT_ANY,              /* move non-options to the end                   */
-  GETOPT_KEEP              /* return options in order                       */
-} optmode;
+#if defined (__STDC__) && __STDC__
+  const char *name;
+#else
+  char *name;
+#endif
+  /* has_arg can't be an enum because some compilers complain about
+     type mismatches in all the code that assumes it is an int.  */
+  int has_arg;
+  int *flag;
+  int val;
+};
 
+/* Names for the values of the `has_arg' field of `struct option'.  */
 
-/* Note: The 2nd argument is not const as GETOPT_ANY reorders the
-   array pointed to. */
+#define no_argument             0
+#define required_argument       1
+#define optional_argument       2
 
-int getopt (int, char **, __const__ char *);
+#if defined (__STDC__) && __STDC__
+#ifdef __GNU_LIBRARY__
+/* Many other libraries have conflicting prototypes for getopt, with
+   differences in the consts, in stdlib.h.  To avoid compilation
+   errors, only prototype getopt for the GNU C library.  */
+extern int getopt (int argc, char *const *argv, const char *shortopts);
+#else /* not __GNU_LIBRARY__ */
+extern int getopt ();
+#endif /* __GNU_LIBRARY__ */
+extern int getopt_long (int argc, char *const *argv, const char *shortopts,
+                        const struct option *longopts, int *longind);
+extern int getopt_long_only (int argc, char *const *argv,
+                             const char *shortopts,
+                             const struct option *longopts, int *longind);
 
-#if defined (__cplusplus)
+/* Internal only.  Users should not call this directly.  */
+extern int _getopt_internal (int argc, char *const *argv,
+                             const char *shortopts,
+                             const struct option *longopts, int *longind,
+                             int long_only);
+#else /* not __STDC__ */
+extern int getopt ();
+extern int getopt_long ();
+extern int getopt_long_only ();
+
+extern int _getopt_internal ();
+#endif /* __STDC__ */
+
+#ifdef  __cplusplus
 }
 #endif
 
-#endif /* not _GETOPT_H */
+#endif /* getopt.h */

trunk/src/emx/include/os2.h

@@ -8 +8 @@
 #endif
 
+#ifndef _Cdecl
 #define _Cdecl
+#endif
+#ifndef _Far16
 #define _Far16
+#endif
+#ifndef _Optlink
 #define _Optlink
+#endif
+#ifndef _Pascal
 #define _Pascal
+#endif
+#ifndef _Seg16
 #define _Seg16
+#endif
+#ifndef _System
 #define _System
+#endif
 
 #if defined (USE_OS2_TOOLKIT_HEADERS)