Update DJGPP Makefiles and config.h. Bump version to 0.3.0.
svn path=/branches/YASM_0_3/; revision=1053
diff --git a/yasm/Mkfiles/Makefile.dj b/yasm/Mkfiles/Makefile.dj
index a16e7a9..0738a41 100644
--- a/yasm/Mkfiles/Makefile.dj
+++ b/yasm/Mkfiles/Makefile.dj
@@ -9,7 +9,7 @@
# How to compile:
# make -fMkfiles/Makefile.dj
-CFLAGS=-DHAVE_CONFIG_H -DWIN32 -IMkfiles/dj -I. -Ifrontends/yasm
+CFLAGS=-DHAVE_CONFIG_H -DWIN32 -IMkfiles/dj -O2 -I. -Ifrontends/yasm
CC=gcc
all: yasm
@@ -34,19 +34,30 @@
libyasm/xmalloc.o \
libyasm/xstrdup.o
-MODULES_ARCH_OBJS= \
+MODULES_ARCH_X86_OBJS= \
modules/arch/x86/x86arch.o \
modules/arch/x86/x86bc.o \
modules/arch/x86/x86expr.o \
x86id.o
+MODULES_ARCH_LC3B_OBJS= \
+ modules/arch/lc3b/lc3barch.o \
+ modules/arch/lc3b/lc3bbc.o \
+ lc3bid.o
+
+MODULES_ARCH_OBJS= \
+ $(MODULES_ARCH_X86_OBJS) \
+ $(MODULES_ARCH_LC3B_OBJS)
+
MODULES_DBGFMTS_OBJS= \
modules/dbgfmts/null/null-dbgfmt.o
MODULES_OBJFMTS_OBJS= \
modules/objfmts/dbg/dbg-objfmt.o \
modules/objfmts/bin/bin-objfmt.o \
- modules/objfmts/coff/coff-objfmt.o
+ modules/objfmts/coff/coff-objfmt.o \
+ modules/objfmts/elf/elf.o \
+ modules/objfmts/elf/elf-objfmt.o
MODULES_OPTIMIZERS_OBJS= \
modules/optimizers/basic/basic-optimizer.o
diff --git a/yasm/Mkfiles/Makefile.flat b/yasm/Mkfiles/Makefile.flat
index 57d332c..a90054b 100644
--- a/yasm/Mkfiles/Makefile.flat
+++ b/yasm/Mkfiles/Makefile.flat
@@ -37,19 +37,30 @@
libyasm/xmalloc.o \
libyasm/xstrdup.o
-MODULES_ARCH_OBJS= \
+MODULES_ARCH_X86_OBJS= \
modules/arch/x86/x86arch.o \
modules/arch/x86/x86bc.o \
modules/arch/x86/x86expr.o \
x86id.o
+MODULES_ARCH_LC3B_OBJS= \
+ modules/arch/lc3b/lc3barch.o \
+ modules/arch/lc3b/lc3bbc.o \
+ lc3bid.o
+
+MODULES_ARCH_OBJS= \
+ $(MODULES_ARCH_X86_OBJS) \
+ $(MODULES_ARCH_LC3B_OBJS)
+
MODULES_DBGFMTS_OBJS= \
modules/dbgfmts/null/null-dbgfmt.o
MODULES_OBJFMTS_OBJS= \
modules/objfmts/dbg/dbg-objfmt.o \
modules/objfmts/bin/bin-objfmt.o \
- modules/objfmts/coff/coff-objfmt.o
+ modules/objfmts/coff/coff-objfmt.o \
+ modules/objfmts/elf/elf.o \
+ modules/objfmts/elf/elf-objfmt.o
MODULES_OPTIMIZERS_OBJS= \
modules/optimizers/basic/basic-optimizer.o
diff --git a/yasm/Mkfiles/dj/config.h b/yasm/Mkfiles/dj/config.h
index 8ac0485..4a740b5 100644
--- a/yasm/Mkfiles/dj/config.h
+++ b/yasm/Mkfiles/dj/config.h
@@ -30,12 +30,18 @@
/* Define to 1 if you have the <assert.h> header file. */
/* #undef HAVE_ASSERT_H */
+/* Define to 1 if you have the `basename' function. */
+#define HAVE_BASENAME 1
+
/* Define to 1 if you have the `bcopy' function. */
/* #undef HAVE_BCOPY */
/* */
/* #undef HAVE_CATGETS */
+/* Define to 1 if you have the `closedir' function. */
+/* #undef HAVE_CLOSEDIR */
+
/* Define to 1 if you have the <ctype.h> header file. */
#define HAVE_CTYPE_H 1
@@ -98,7 +104,8 @@
/* Define if you have the <limits.h> header file. */
#define HAVE_LIMITS_H 1
-/* Define if your system has a working `malloc' function. */
+/* Define to 1 if your system has a GNU libc compatible `malloc' function, and
+ to 0 otherwise. */
#define HAVE_MALLOC 1
/* Define if you have the <malloc.h> header file. */
@@ -131,9 +138,15 @@
/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
/* #undef HAVE_NDIR_H */
+/* Define to 1 if you have the `opendir' function. */
+/* #undef HAVE_OPENDIR */
+
/* Define if libtool can extract symbol lists from object files. */
/* #undef HAVE_PRELOADED_SYMBOLS */
+/* Define to 1 if you have the `readdir' function. */
+/* #undefine HAVE_READDIR */
+
/* Define to 1 if you have the `rindex' function. */
/* #undef HAVE_RINDEX */
@@ -280,13 +293,13 @@
#define PACKAGE_NAME "yasm"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "yasm `date "+%Y%m%d"`"
+#define PACKAGE_STRING "yasm 0.3.0"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "yasm"
/* Define to the version of this package. */
-#define PACKAGE_VERSION "`date "+%Y%m%d"`"
+#define PACKAGE_VERSION "0.3.0"
/* Define if the C compiler supports function prototypes. */
#define PROTOTYPES 1
@@ -298,15 +311,11 @@
/* #undef USE_FORKWAITMSG */
/* Version number of package */
-#define VERSION "0.1.0"
+#define VERSION "0.3.0"
/* Define if using the dmalloc debugging malloc package */
/* #undef WITH_DMALLOC */
-/* Define if `lex' declares `yytext' as a `char *' by default, not a `char[]'.
- */
-#define YYTEXT_POINTER 1
-
/* Make sure we see all GNU extensions. */
/* #undef _GNU_SOURCE */
@@ -326,6 +335,9 @@
if it is not supported. */
/* #undef inline */
+/* Define to rpl_malloc if the replacement function should be used. */
+/* #undef malloc */
+
/* Define to `int' if <sys/types.h> doesn't define. */
/* #undef pid_t */
diff --git a/yasm/Mkfiles/dj/libyasm/config.h b/yasm/Mkfiles/dj/libyasm/config.h
deleted file mode 100644
index 8ac0485..0000000
--- a/yasm/Mkfiles/dj/libyasm/config.h
+++ /dev/null
@@ -1,336 +0,0 @@
-/* $IdPath$ */
-
-/* */
-/* #undef ENABLE_NLS */
-
-/* Define if you have the `abort' function. */
-#define HAVE_ABORT 1
-
-/* Define if you have <alloca.h> and it should be used (not on Ultrix). */
-/* #undef HAVE_ALLOCA_H */
-
-/* Define to 1 if you have the `argz_append' function. */
-/* #undef HAVE_ARGZ_APPEND */
-
-/* Define to 1 if you have the `argz_create_sep' function. */
-/* #undef HAVE_ARGZ_CREATE_SEP */
-
-/* Define if you have the <argz.h> header file. */
-/* #undef HAVE_ARGZ_H */
-
-/* Define to 1 if you have the `argz_insert' function. */
-/* #undef HAVE_ARGZ_INSERT */
-
-/* Define to 1 if you have the `argz_next' function. */
-/* #undef HAVE_ARGZ_NEXT */
-
-/* Define to 1 if you have the `argz_stringify' function. */
-/* #undef HAVE_ARGZ_STRINGIFY */
-
-/* Define to 1 if you have the <assert.h> header file. */
-/* #undef HAVE_ASSERT_H */
-
-/* Define to 1 if you have the `bcopy' function. */
-/* #undef HAVE_BCOPY */
-
-/* */
-/* #undef HAVE_CATGETS */
-
-/* Define to 1 if you have the <ctype.h> header file. */
-#define HAVE_CTYPE_H 1
-
-/* Define if the GNU dcgettext() function is already present or preinstalled.
- */
-/* #undef HAVE_DCGETTEXT */
-
-/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
- */
-/* #undef HAVE_DIRENT_H */
-
-/* Define if you have the GNU dld library. */
-/* #undef HAVE_DLD */
-
-/* Define to 1 if you have the <dld.h> header file. */
-/* #undef HAVE_DLD_H */
-
-/* Define to 1 if you have the `dlerror' function. */
-/* #undef HAVE_DLERROR */
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-/* #undef HAVE_DLFCN_H */
-
-/* Define to 1 if you have the <dl.h> header file. */
-/* #undef HAVE_DL_H */
-
-/* Define if you don't have `vprintf' but do have `_doprnt'. */
-/* #undef HAVE_DOPRNT */
-
-/* Define to 1 if you have the <errno.h> header file. */
-#define HAVE_ERRNO_H 1
-
-/* Define to 1 if the system has the type `error_t'. */
-/* #undef HAVE_ERROR_T */
-
-/* Define if you have the `fork' function. */
-/* #undef HAVE_FORK */
-
-/* */
-/* #undef HAVE_GETTEXT */
-
-/* Define if you have the GNU C Library */
-/* #undef HAVE_GNU_C_LIBRARY */
-
-/* Define if you have the iconv() function. */
-/* #undef HAVE_ICONV */
-
-/* Define to 1 if you have the `index' function. */
-/* #undef HAVE_INDEX */
-
-/* Define if you have the <inttypes.h> header file. */
-/* #undef HAVE_INTTYPES_H */
-
-/* */
-/* #undef HAVE_LC_MESSAGES */
-
-/* Define if you have the libdl library or equivalent. */
-/* #undef HAVE_LIBDL */
-
-/* Define if you have the <limits.h> header file. */
-#define HAVE_LIMITS_H 1
-
-/* Define if your system has a working `malloc' function. */
-#define HAVE_MALLOC 1
-
-/* Define if you have the <malloc.h> header file. */
-#define HAVE_MALLOC_H 1
-
-/* Define if you have the `memcpy' function. */
-#define HAVE_MEMCPY 1
-
-/* Define if you have the `memmove' function. */
-#define HAVE_MEMMOVE 1
-
-/* Define if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define if you have the `mergesort function. */
-/* #undef HAVE_MERGESORT */
-
-/* Define if you have the `msgctl' function. */
-/* #undef HAVE_MSGCTL */
-
-/* Define if you have the `msgget' function. */
-/* #undef HAVE_MSGGET */
-
-/* Define if you have the `msgrcv' function. */
-/* #undef HAVE_MSGRCV */
-
-/* Define if you have the `msgsnd' function. */
-/* #undef HAVE_MSGSND */
-
-/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
-/* #undef HAVE_NDIR_H */
-
-/* Define if libtool can extract symbol lists from object files. */
-/* #undef HAVE_PRELOADED_SYMBOLS */
-
-/* Define to 1 if you have the `rindex' function. */
-/* #undef HAVE_RINDEX */
-
-/* Define if you have the shl_load function. */
-/* #undef HAVE_SHL_LOAD */
-
-/* Define if you have the `snprintf' function. */
-/* #undef HAVE_SNPRINTF */
-
-/* Define if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <stdio.h> header file. */
-#define HAVE_STDIO_H 1
-
-/* Define if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* */
-#define HAVE_STPCPY 1
-
-/* Define if you have the `strcasecmp' function. */
-#define HAVE_STRCASECMP 1
-
-/* Define if you have the `strchr' function. */
-#define HAVE_STRCHR 1
-
-/* Define to 1 if you have the `strcmp' function. */
-#define HAVE_STRCMP 1
-
-/* Define if you have the `strcmpi' function. */
-/* #undef HAVE_STRCMPI */
-
-/* Define if you have the `strerror' function. */
-#define HAVE_STRERROR 1
-
-/* Define if you have the `stricmp' function. */
-/* #undef HAVE_STRICMP */
-
-/* Define if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
-
-/* Define if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define if you have the `strncasecmp' function. */
-#define HAVE_STRNCASECMP 1
-
-/* Define if you have the `strrchr' function. */
-#define HAVE_STRRCHR 1
-
-/* Define if you have the `strsep' function. */
-#define HAVE_STRSEP 1
-
-/* Define if you have the <sys/cdefs.h> header file. */
-#define HAVE_SYS_CDEFS_H 1
-
-/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
- */
-/* #undef HAVE_SYS_DIR_H */
-
-/* Define to 1 if you have the <sys/dl.h> header file. */
-/* #undef HAVE_SYS_DL_H */
-
-/* Define if you have the <sys/ipc.h> header file. */
-/* #undef HAVE_SYS_IPC_H */
-
-/* Define if you have the <sys/msg.h> header file. */
-/* #undef HAVE_SYS_MSG_H */
-
-/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
- */
-/* #undef HAVE_SYS_NDIR_H */
-
-/* Define if you have the <sys/param.h> header file. */
-#define HAVE_SYS_PARAM_H 1
-
-/* Define if you have the <sys/queue.h> header file. */
-/* #undef HAVE_SYS_QUEUE_H */
-
-/* Define if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define if you have <sys/wait.h> that is POSIX.1 compatible. */
-#define HAVE_SYS_WAIT_H 1
-
-/* Define if you have the `toascii' function. */
-#define HAVE_TOASCII 1
-
-/* Define if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 1
-
-/* Define if you have the `vfork' function. */
-/* #undef HAVE_VFORK */
-
-/* Define if you have the <vfork.h> header file. */
-/* #undef HAVE_VFORK_H */
-
-/* Define if you have the vprintf function. */
-#define HAVE_VPRINTF 1
-
-/* Define to 1 if you have the `vsnprintf' function. */
-/* #undef HAVE_VSNPRINTF */
-
-/* Define if you have the `wait' function. */
-#define HAVE_WAIT 1
-
-/* Define if `fork' works. */
-/* #undef HAVE_WORKING_FORK */
-
-/* Define if `vfork' works. */
-/* #undef HAVE_WORKING_VFORK */
-
-/* Define if the OS needs help to load dependent libraries for dlopen(). */
-#define LTDL_DLOPEN_DEPLIBS 1
-
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
- */
-#define LTDL_OBJDIR ".libs/"
-
-/* Define to the name of the environment variable that determines the dynamic
- library search path. */
-#define LTDL_SHLIBPATH_VAR "PATH"
-
-/* Define to the extension used for shared libraries, say, ".so". */
-#define LTDL_SHLIB_EXT ".dll"
-
-/* Define to the system default library search path. */
-#define LTDL_SYSSEARCHPATH "/lib:/usr/lib"
-
-/* Define if dlsym() requires a leading underscode in symbol names. */
-/* #undef NEED_USCORE */
-
-/* Name of package */
-#define PACKAGE "yasm"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "bug-yasm@tortall.net"
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "yasm"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "yasm `date "+%Y%m%d"`"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "yasm"
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "`date "+%Y%m%d"`"
-
-/* Define if the C compiler supports function prototypes. */
-#define PROTOTYPES 1
-
-/* Define if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Combined test for fork/wait/msg* */
-/* #undef USE_FORKWAITMSG */
-
-/* Version number of package */
-#define VERSION "0.1.0"
-
-/* Define if using the dmalloc debugging malloc package */
-/* #undef WITH_DMALLOC */
-
-/* Define if `lex' declares `yytext' as a `char *' by default, not a `char[]'.
- */
-#define YYTEXT_POINTER 1
-
-/* Make sure we see all GNU extensions. */
-/* #undef _GNU_SOURCE */
-
-/* Make sure we see all SVID extensions. */
-/* #undef _SVID_SOURCE */
-
-/* Define like PROTOTYPES; this can be used by system headers. */
-#define __PROTOTYPES 1
-
-/* Define to empty if `const' does not conform to ANSI C. */
-/* #undef const */
-
-/* Define to a type to use for `error_t' if it is not otherwise available. */
-#define error_t int
-
-/* Define as `__inline' if that's what the C compiler calls it, or to nothing
- if it is not supported. */
-/* #undef inline */
-
-/* Define to `int' if <sys/types.h> doesn't define. */
-/* #undef pid_t */
-
-/* Define to `unsigned' if <sys/types.h> doesn't define. */
-/* #undef size_t */
-
-/* Define as `fork' if `vfork' does not work. */
-/* #undef vfork */
