diff options
| author | hbono@chromium.org <hbono@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c> | 2012-11-14 05:27:15 +0000 |
|---|---|---|
| committer | hbono@chromium.org <hbono@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c> | 2012-11-14 05:27:15 +0000 |
| commit | 8c35491afd495d828e8f43e3293ef9d9e145c751 (patch) | |
| tree | dd443b6de06ed4019a839a5417f922fbac653df0 | |
| parent | d65182f1818d1c19e6f3866ab6e68a262fad5185 (diff) | |
| download | patched-yasm-8c35491afd495d828e8f43e3293ef9d9e145c751.tar.gz | |
Update Yasm to 1.2.0 (Yasm Part 2/3)
This change updates our copy of Yasm to 1.2.0. (This change consists of the files not used by Chromium.)
BUG=156030
TEST=build Chromium
Review URL: https://codereview.chromium.org/11369048
git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/yasm/patched-yasm@167604 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
62 files changed, 730 insertions, 703 deletions
diff --git a/Makefile.in b/Makefile.in index 647ca08..4f2afe1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -15,184 +15,24 @@ @SET_MAKE@ -# $Id: Makefile.am 2299 2010-03-04 05:08:00Z peter $ - -# $Id: Makefile.inc 2084 2008-05-09 07:08:17Z peter $ - -# $Id: Makefile.inc 2234 2009-10-31 21:52:42Z peter $ - # These utility programs have to be built for BUILD host in cross-build. # This makes things rather non-standard automake -# $Id: Makefile.inc 2234 2009-10-31 21:52:42Z peter $ - # These utility programs have to be built for BUILD host in cross-build. # This makes things rather non-standard automake -# $Id: Makefile.inc 2234 2009-10-31 21:52:42Z peter $ - # These utility programs have to be built for BUILD host in cross-build. # This makes things rather non-standard automake -# $Id: Makefile.inc 2256 2010-01-01 20:55:07Z peter $ - -# $Id: Makefile.inc 1951 2007-09-14 05:19:10Z peter $ - -# $Id: Makefile.inc 1598 2006-08-10 04:02:59Z peter $ - -# $Id: Makefile.inc 2269 2010-01-07 07:00:05Z peter $ - -# $Id: Makefile.inc 2111 2008-07-06 22:26:49Z peter $ - -# $Id: Makefile.inc 2339 2010-07-23 03:35:21Z peter $ - -# $Id: Makefile.inc 2239 2009-12-01 03:33:03Z peter $ - -# $Id: Makefile.inc 2238 2009-11-30 03:43:10Z peter $ - -# $Id: Makefile.inc 2111 2008-07-06 22:26:49Z peter $ - -# $Id: Makefile.inc 1928 2007-09-07 22:03:34Z peter $ - -# $Id: Makefile.inc 1152 2004-10-02 06:18:30Z peter $ - -# $Id: Makefile.inc 1183 2004-12-01 07:49:18Z peter $ - -# $Id: Makefile.inc 2269 2010-01-07 07:00:05Z peter $ - -# $Id: Makefile.inc 2279 2010-01-19 07:57:43Z peter $ - -# $Id: Makefile.inc 2169 2009-01-02 20:46:57Z peter $ - -# $Id$ - -# $Id: Makefile.inc 2278 2010-01-19 07:28:08Z peter $ - -# $Id: Makefile.inc 2323 2010-05-16 03:37:00Z peter $ - -# $Id: Makefile.inc 1137 2004-09-04 01:24:57Z peter $ - -# $Id: Makefile.inc 2082 2008-05-09 06:46:02Z peter $ - -# $Id: Makefile.inc 2063 2008-04-12 08:30:22Z peter $ - -# $Id: Makefile.inc 2063 2008-04-12 08:30:22Z peter $ - -# $Id: Makefile.inc 2243 2009-12-23 06:45:17Z peter $ - -# $Id$ - -# $Id$ - -# $Id: Makefile.inc 2130 2008-10-07 05:38:11Z peter $ - -# $Id: Makefile.inc 2311 2010-04-08 03:32:04Z peter $ - -# $Id: Makefile.inc 2172 2009-01-27 06:38:14Z peter $ - -# $Id: Makefile.inc 2176 2009-03-04 07:39:02Z peter $ - # Makefile for cpp module. # Copied from raw preprocessor module. -# $Id: Makefile.inc 2268 2010-01-07 06:55:03Z peter $ - -# $Id: Makefile.inc 2243 2009-12-23 06:45:17Z peter $ - #TESTS += modules/preprocs/gas/tests/rawpp_test.sh -# $Id: Makefile.inc 2269 2010-01-07 07:00:05Z peter $ - -# $Id: Makefile.inc 1428 2006-03-27 02:15:19Z peter $ - -# $Id: Makefile.inc 1378 2006-02-12 01:27:39Z peter $ - -# $Id: Makefile.inc 1350 2006-01-29 21:11:03Z peter $ - -# $Id: Makefile.inc 1851 2007-05-26 17:56:36Z peter $ - -# $Id: Makefile.inc 1617 2006-09-16 05:43:41Z peter $ - -# $Id: Makefile.inc 1350 2006-01-29 21:11:03Z peter $ - -# $Id: Makefile.inc 1183 2004-12-01 07:49:18Z peter $ - -# $Id: Makefile.inc 1183 2004-12-01 07:49:18Z peter $ - -# $Id$ - -# $Id: Makefile.inc 2269 2010-01-07 07:00:05Z peter $ - -# $Id: Makefile.inc 1183 2004-12-01 07:49:18Z peter $ - -# $Id: Makefile.inc 2130 2008-10-07 05:38:11Z peter $ - -# $Id: Makefile.inc 2010 2007-11-14 08:33:32Z peter $ - -# $Id: Makefile.inc 2010 2007-11-14 08:33:32Z peter $ - -# $Id: Makefile.inc 1252 2005-09-28 05:50:51Z peter $ - -# $Id: Makefile.inc 2036 2008-02-09 04:06:47Z peter $ - -# $Id: Makefile.inc 2126 2008-10-03 08:13:00Z peter $ - -# $Id: Makefile.inc 2206 2009-07-21 06:48:42Z peter $ - -# $Id: Makefile.inc 1168 2004-10-31 01:07:52Z peter $ - -# $Id: Makefile.inc 2082 2008-05-09 06:46:02Z peter $ - -# $Id: Makefile.inc 1617 2006-09-16 05:43:41Z peter $ - -# $Id: Makefile.inc 1732 2007-01-13 19:34:04Z peter $ - -# $Id: Makefile.inc 1777 2007-02-19 08:21:17Z peter $ - -# $Id: Makefile.inc 1782 2007-02-21 06:45:39Z peter $ - -# $Id: Makefile.inc 2108 2008-06-05 08:48:21Z peter $ - -# $Id: Makefile.inc 2345 2010-08-01 01:27:40Z peter $ - -# $Id: Makefile.inc 2108 2008-06-05 08:48:21Z peter $ - -# $Id: Makefile.inc 1653 2006-10-17 06:58:41Z peter $ - -# $Id: Makefile.inc 1653 2006-10-17 06:58:41Z peter $ - -# $Id: Makefile.inc 1183 2004-12-01 07:49:18Z peter $ - # Assume objfmt_coff is included -# $Id: Makefile.inc 2166 2009-01-02 08:33:21Z peter $ - -# $Id: Makefile.inc 2166 2009-01-02 08:33:21Z peter $ - -# $Id: Makefile.inc 1331 2006-01-15 22:48:55Z peter $ - # Assume objfmt_coff is included -# $Id: Makefile.inc 2120 2008-09-04 04:45:30Z peter $ - -# $Id: Makefile.inc 2082 2008-05-09 06:46:02Z peter $ - -# $Id: Makefile.inc 1183 2004-12-01 07:49:18Z peter $ - -# $Id: Makefile.inc 1851 2007-05-26 17:56:36Z peter $ - -# $Id: Makefile.inc 2111 2008-07-06 22:26:49Z peter $ - -# $Id: Makefile.inc 2233 2009-10-31 21:45:55Z peter $ - -# $Id: Makefile.inc 2284 2010-02-06 09:27:32Z peter $ - -# $Id: Makefile.inc 1463 2006-04-05 05:39:23Z peter $ - -# $Id: Makefile.inc 1463 2006-04-05 05:39:23Z peter $ - -# $Id: Makefile.inc 1463 2006-04-05 05:39:23Z peter $ - VPATH = @srcdir@ @@ -228,6 +68,7 @@ TESTS = $(am__append_3) modules/arch/x86/tests/x86_test.sh \ modules/preprocs/tasm/tests/tasmpp_test.sh \ modules/preprocs/nasm/tests/nasmpp_test.sh \ modules/preprocs/raw/tests/rawpp_test.sh \ + modules/dbgfmts/dwarf2/tests/gen64/dwarf2_gen64_test.sh \ modules/dbgfmts/dwarf2/tests/pass32/dwarf2_pass32_test.sh \ modules/dbgfmts/dwarf2/tests/pass64/dwarf2_pass64_test.sh \ modules/dbgfmts/dwarf2/tests/passwin64/dwarf2_passwin64_test.sh \ @@ -280,6 +121,7 @@ DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \ $(srcdir)/modules/dbgfmts/codeview/Makefile.inc \ $(srcdir)/modules/dbgfmts/dwarf2/Makefile.inc \ $(srcdir)/modules/dbgfmts/dwarf2/tests/Makefile.inc \ + $(srcdir)/modules/dbgfmts/dwarf2/tests/gen64/Makefile.inc \ $(srcdir)/modules/dbgfmts/dwarf2/tests/pass32/Makefile.inc \ $(srcdir)/modules/dbgfmts/dwarf2/tests/pass64/Makefile.inc \ $(srcdir)/modules/dbgfmts/dwarf2/tests/passwin64/Makefile.inc \ @@ -601,6 +443,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LDFLAGS = @LDFLAGS@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ @@ -801,10 +644,16 @@ EXTRA_DIST = config/config.rpath tools/Makefile.inc \ modules/arch/x86/tests/avx.asm modules/arch/x86/tests/avx.hex \ modules/arch/x86/tests/avx16.asm \ modules/arch/x86/tests/avx16.hex \ + modules/arch/x86/tests/avx2.asm \ + modules/arch/x86/tests/avx2.hex \ modules/arch/x86/tests/avxcc.asm \ modules/arch/x86/tests/avxcc.hex \ modules/arch/x86/tests/bittest.asm \ modules/arch/x86/tests/bittest.hex \ + modules/arch/x86/tests/bmi1.asm \ + modules/arch/x86/tests/bmi1.hex \ + modules/arch/x86/tests/bmi2.asm \ + modules/arch/x86/tests/bmi2.hex \ modules/arch/x86/tests/bswap64.asm \ modules/arch/x86/tests/bswap64.hex \ modules/arch/x86/tests/clmul.asm \ @@ -854,6 +703,8 @@ EXTRA_DIST = config/config.rpath tools/Makefile.inc \ modules/arch/x86/tests/imm64.asm \ modules/arch/x86/tests/imm64.errwarn \ modules/arch/x86/tests/imm64.hex \ + modules/arch/x86/tests/invpcid.asm \ + modules/arch/x86/tests/invpcid.hex \ modules/arch/x86/tests/iret.asm \ modules/arch/x86/tests/iret.hex \ modules/arch/x86/tests/jmp64-1.asm \ @@ -870,11 +721,17 @@ EXTRA_DIST = config/config.rpath tools/Makefile.inc \ modules/arch/x86/tests/jmp64-6.hex \ modules/arch/x86/tests/jmpfar.asm \ modules/arch/x86/tests/jmpfar.hex \ + modules/arch/x86/tests/larlsl.asm \ + modules/arch/x86/tests/larlsl.hex \ modules/arch/x86/tests/lds.asm modules/arch/x86/tests/lds.hex \ + modules/arch/x86/tests/lfs64.asm \ + modules/arch/x86/tests/lfs64.hex \ modules/arch/x86/tests/loopadsz.asm \ modules/arch/x86/tests/loopadsz.hex \ modules/arch/x86/tests/lsahf.asm \ modules/arch/x86/tests/lsahf.hex \ + modules/arch/x86/tests/lzcnt.asm \ + modules/arch/x86/tests/lzcnt.hex \ modules/arch/x86/tests/mem64-err.asm \ modules/arch/x86/tests/mem64-err.errwarn \ modules/arch/x86/tests/mem64.asm \ @@ -948,6 +805,8 @@ EXTRA_DIST = config/config.rpath tools/Makefile.inc \ modules/arch/x86/tests/segoff-err.errwarn \ modules/arch/x86/tests/shift.asm \ modules/arch/x86/tests/shift.hex \ + modules/arch/x86/tests/shift64.asm \ + modules/arch/x86/tests/shift64.hex \ modules/arch/x86/tests/simd-1.asm \ modules/arch/x86/tests/simd-1.hex \ modules/arch/x86/tests/simd-2.asm \ @@ -988,6 +847,12 @@ EXTRA_DIST = config/config.rpath tools/Makefile.inc \ modules/arch/x86/tests/vmx.asm modules/arch/x86/tests/vmx.hex \ modules/arch/x86/tests/vmx-err.asm \ modules/arch/x86/tests/vmx-err.errwarn \ + modules/arch/x86/tests/vsib.asm \ + modules/arch/x86/tests/vsib.hex \ + modules/arch/x86/tests/vsib-err.asm \ + modules/arch/x86/tests/vsib-err.errwarn \ + modules/arch/x86/tests/vsib2-err.asm \ + modules/arch/x86/tests/vsib2-err.errwarn \ modules/arch/x86/tests/x86label.asm \ modules/arch/x86/tests/x86label.hex \ modules/arch/x86/tests/xchg64.asm \ @@ -1021,6 +886,8 @@ EXTRA_DIST = config/config.rpath tools/Makefile.inc \ modules/arch/x86/tests/gas32/gas-movdq32.hex \ modules/arch/x86/tests/gas32/gas-movsd.asm \ modules/arch/x86/tests/gas32/gas-movsd.hex \ + modules/arch/x86/tests/gas32/gas-pop.asm \ + modules/arch/x86/tests/gas32/gas-pop.hex \ modules/arch/x86/tests/gas32/gas32-jmpcall.asm \ modules/arch/x86/tests/gas32/gas32-jmpcall.hex \ modules/arch/x86/tests/gas64/x86_gas64_test.sh \ @@ -1128,6 +995,8 @@ EXTRA_DIST = config/config.rpath tools/Makefile.inc \ modules/parsers/gas/tests/bin/gas-macro.hex \ modules/parsers/gas/tests/bin/gas-set.asm \ modules/parsers/gas/tests/bin/gas-set.hex \ + modules/parsers/gas/tests/bin/gas-str.asm \ + modules/parsers/gas/tests/bin/gas-str.hex \ modules/parsers/gas/tests/bin/rept-err.asm \ modules/parsers/gas/tests/bin/rept-err.errwarn \ modules/parsers/gas/tests/bin/reptempty.asm \ @@ -1185,6 +1054,8 @@ EXTRA_DIST = config/config.rpath tools/Makefile.inc \ modules/parsers/nasm/tests/strucalign.hex \ modules/parsers/nasm/tests/struczero.asm \ modules/parsers/nasm/tests/struczero.hex \ + modules/parsers/nasm/tests/strucbase.asm \ + modules/parsers/nasm/tests/strucbase.hex \ modules/parsers/nasm/tests/syntax-err.asm \ modules/parsers/nasm/tests/syntax-err.errwarn \ modules/parsers/nasm/tests/uscore.asm \ @@ -1283,9 +1154,13 @@ EXTRA_DIST = config/config.rpath tools/Makefile.inc \ modules/dbgfmts/stabs/Makefile.inc \ modules/dbgfmts/codeview/cv8.txt \ modules/dbgfmts/dwarf2/tests/Makefile.inc \ + modules/dbgfmts/dwarf2/tests/gen64/Makefile.inc \ modules/dbgfmts/dwarf2/tests/pass32/Makefile.inc \ modules/dbgfmts/dwarf2/tests/pass64/Makefile.inc \ modules/dbgfmts/dwarf2/tests/passwin64/Makefile.inc \ + modules/dbgfmts/dwarf2/tests/gen64/dwarf2_gen64_test.sh \ + modules/dbgfmts/dwarf2/tests/gen64/dwarf64_pathname.asm \ + modules/dbgfmts/dwarf2/tests/gen64/dwarf64_pathname.hex \ modules/dbgfmts/dwarf2/tests/pass32/dwarf2_pass32_test.sh \ modules/dbgfmts/dwarf2/tests/pass32/dwarf32-err.asm \ modules/dbgfmts/dwarf2/tests/pass32/dwarf32-err.errwarn \ @@ -1448,6 +1323,8 @@ EXTRA_DIST = config/config.rpath tools/Makefile.inc \ modules/objfmts/elf/tests/amd64/elfso64.hex \ modules/objfmts/elf/tests/amd64/gotpcrel.asm \ modules/objfmts/elf/tests/amd64/gotpcrel.hex \ + modules/objfmts/elf/tests/amd64/multiplefixup.asm \ + modules/objfmts/elf/tests/amd64/multiplefixup.hex \ modules/objfmts/elf/tests/gas32/elf_gas32_test.sh \ modules/objfmts/elf/tests/gas32/elf_gas32_ssym.asm \ modules/objfmts/elf/tests/gas32/elf_gas32_ssym.hex \ @@ -1493,6 +1370,8 @@ EXTRA_DIST = config/config.rpath tools/Makefile.inc \ modules/objfmts/macho/tests/nasm32/machotest.hex \ modules/objfmts/macho/tests/nasm32/macho-reloc.asm \ modules/objfmts/macho/tests/nasm32/macho-reloc.hex \ + modules/objfmts/macho/tests/nasm32/macho32-pext.asm \ + modules/objfmts/macho/tests/nasm32/macho32-pext.hex \ modules/objfmts/macho/tests/nasm32/macho32-pic.asm \ modules/objfmts/macho/tests/nasm32/macho32-pic.hex \ modules/objfmts/macho/tests/nasm32/macho32-sect.asm \ @@ -1549,6 +1428,10 @@ EXTRA_DIST = config/config.rpath tools/Makefile.inc \ modules/objfmts/win32/tests/gas/win32_gas_test.sh \ modules/objfmts/win32/tests/gas/win32at.asm \ modules/objfmts/win32/tests/gas/win32at.hex \ + modules/objfmts/win32/tests/gas/win32def.asm \ + modules/objfmts/win32/tests/gas/win32def.hex \ + modules/objfmts/win32/tests/gas/win32secrel32.asm \ + modules/objfmts/win32/tests/gas/win32secrel32.hex \ modules/objfmts/win64/tests/Makefile.inc \ modules/objfmts/win64/tests/win64_test.sh \ modules/objfmts/win64/tests/sce1.asm \ @@ -1577,6 +1460,8 @@ EXTRA_DIST = config/config.rpath tools/Makefile.inc \ modules/objfmts/win64/tests/win64-dataref2.asm \ modules/objfmts/win64/tests/win64-dataref2.hex \ modules/objfmts/win64/tests/win64-dataref2.masm \ + modules/objfmts/win64/tests/win64-imagebase.hex \ + modules/objfmts/win64/tests/win64-imagebase.asm \ modules/objfmts/win64/tests/gas/Makefile.inc \ modules/objfmts/win64/tests/gas/win64_gas_test.sh \ modules/objfmts/win64/tests/gas/win64-gas-sce.asm \ @@ -1610,6 +1495,8 @@ EXTRA_DIST = config/config.rpath tools/Makefile.inc \ libyasm/tests/emptydata.hex libyasm/tests/equ-expand.asm \ libyasm/tests/equ-expand.hex libyasm/tests/expr-fold-level.asm \ libyasm/tests/expr-fold-level.hex \ + libyasm/tests/expr-simplify-identity.asm \ + libyasm/tests/expr-simplify-identity.hex \ libyasm/tests/expr-wide-ident.asm \ libyasm/tests/expr-wide-ident.hex libyasm/tests/externdef.asm \ libyasm/tests/externdef.errwarn libyasm/tests/externdef.hex \ @@ -1663,8 +1550,9 @@ EXTRA_DIST = config/config.rpath tools/Makefile.inc \ m4/lib-prefix.m4 m4/longlong.m4 m4/progtest.m4 m4/stdint_h.m4 \ m4/uintmax_t.m4 m4/pythonhead.m4 m4/cython.m4 out_test.sh \ Artistic.txt BSD.txt GNU_GPL-2.0 GNU_LGPL-2.0 splint.sh \ - Mkfiles/Makefile.flat Mkfiles/Makefile.dj Mkfiles/dj/config.h \ - Mkfiles/dj/libyasm-stdint.h Mkfiles/vc9/config.h \ + YASM-VERSION-GEN.sh Mkfiles/Makefile.flat Mkfiles/Makefile.dj \ + Mkfiles/dj/config.h Mkfiles/dj/libyasm-stdint.h \ + Mkfiles/vc9/config.h \ Mkfiles/vc9/crt_secure_no_deprecate.vsprops \ Mkfiles/vc9/libyasm-stdint.h Mkfiles/vc9/readme.vc9.txt \ Mkfiles/vc9/vc98_swap.py Mkfiles/vc9/vsyasm.vcproj \ @@ -1685,11 +1573,12 @@ EXTRA_DIST = config/config.rpath tools/Makefile.inc \ Mkfiles/vc10/config.h \ Mkfiles/vc10/crt_secure_no_deprecate.props \ Mkfiles/vc10/crt_secure_no_deprecate.vsprops \ - Mkfiles/vc10/libyasm-stdint.h Mkfiles/vc10/readme.vc10.txt \ - Mkfiles/vc10/vsyasm.props Mkfiles/vc10/vsyasm.targets \ - Mkfiles/vc10/vsyasm.vcxproj Mkfiles/vc10/vsyasm.xml \ - Mkfiles/vc10/yasm.sln Mkfiles/vc10/yasm.vcxproj \ - Mkfiles/vc10/yasm.vcxproj.filters Mkfiles/vc10/ytasm.vcxproj \ + Mkfiles/vc10/libyasm-stdint.h Mkfiles/vc10/out_copy_rename.bat \ + Mkfiles/vc10/readme.vc10.txt Mkfiles/vc10/vsyasm.props \ + Mkfiles/vc10/vsyasm.targets Mkfiles/vc10/vsyasm.vcxproj \ + Mkfiles/vc10/vsyasm.xml Mkfiles/vc10/yasm.sln \ + Mkfiles/vc10/yasm.vcxproj Mkfiles/vc10/yasm.vcxproj.filters \ + Mkfiles/vc10/ytasm.vcxproj \ Mkfiles/vc10/genmacro/genmacro.vcxproj \ Mkfiles/vc10/genmacro/genmacro.vcxproj.filters \ Mkfiles/vc10/genmacro/run.bat \ @@ -1714,7 +1603,7 @@ EXTRA_DIST = config/config.rpath tools/Makefile.inc \ Mkfiles/vc10/re2c/run.bat genstring.c # libyasm-stdint.h doesn't clean up after itself? -CONFIG_CLEAN_FILES = libyasm-stdint.h +CONFIG_CLEAN_FILES = libyasm-stdint.h YASM-VERSION-FILE YASM-VERSION.h re2c_SOURCES = re2c_LDADD = re2c-main.$(OBJEXT) re2c-code.$(OBJEXT) \ re2c-dfa.$(OBJEXT) re2c-parser.$(OBJEXT) \ @@ -1851,7 +1740,7 @@ all: $(BUILT_SOURCES) config.h .SUFFIXES: .gperf .c .o .obj am--refresh: @: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/tools/Makefile.inc $(srcdir)/tools/re2c/Makefile.inc $(srcdir)/tools/genmacro/Makefile.inc $(srcdir)/tools/genperf/Makefile.inc $(srcdir)/tools/python-yasm/Makefile.inc $(srcdir)/tools/python-yasm/tests/Makefile.inc $(srcdir)/modules/Makefile.inc $(srcdir)/modules/arch/Makefile.inc $(srcdir)/modules/arch/x86/Makefile.inc $(srcdir)/modules/arch/x86/tests/Makefile.inc $(srcdir)/modules/arch/x86/tests/gas32/Makefile.inc $(srcdir)/modules/arch/x86/tests/gas64/Makefile.inc $(srcdir)/modules/arch/lc3b/Makefile.inc $(srcdir)/modules/arch/lc3b/tests/Makefile.inc $(srcdir)/modules/listfmts/Makefile.inc $(srcdir)/modules/listfmts/nasm/Makefile.inc $(srcdir)/modules/parsers/Makefile.inc $(srcdir)/modules/parsers/gas/Makefile.inc $(srcdir)/modules/parsers/gas/tests/Makefile.inc $(srcdir)/modules/parsers/gas/tests/bin/Makefile.inc $(srcdir)/modules/parsers/nasm/Makefile.inc $(srcdir)/modules/parsers/nasm/tests/Makefile.inc $(srcdir)/modules/parsers/nasm/tests/worphan/Makefile.inc $(srcdir)/modules/parsers/tasm/Makefile.inc $(srcdir)/modules/parsers/tasm/tests/Makefile.inc $(srcdir)/modules/parsers/tasm/tests/exe/Makefile.inc $(srcdir)/modules/preprocs/Makefile.inc $(srcdir)/modules/preprocs/tasm/Makefile.inc $(srcdir)/modules/preprocs/tasm/tests/Makefile.inc $(srcdir)/modules/preprocs/nasm/Makefile.inc $(srcdir)/modules/preprocs/nasm/tests/Makefile.inc $(srcdir)/modules/preprocs/raw/Makefile.inc $(srcdir)/modules/preprocs/raw/tests/Makefile.inc $(srcdir)/modules/preprocs/cpp/Makefile.inc $(srcdir)/modules/preprocs/gas/Makefile.inc $(srcdir)/modules/preprocs/gas/tests/Makefile.inc $(srcdir)/modules/dbgfmts/Makefile.inc $(srcdir)/modules/dbgfmts/codeview/Makefile.inc $(srcdir)/modules/dbgfmts/dwarf2/Makefile.inc $(srcdir)/modules/dbgfmts/dwarf2/tests/Makefile.inc $(srcdir)/modules/dbgfmts/dwarf2/tests/pass32/Makefile.inc $(srcdir)/modules/dbgfmts/dwarf2/tests/pass64/Makefile.inc $(srcdir)/modules/dbgfmts/dwarf2/tests/passwin64/Makefile.inc $(srcdir)/modules/dbgfmts/null/Makefile.inc $(srcdir)/modules/dbgfmts/stabs/Makefile.inc $(srcdir)/modules/dbgfmts/stabs/tests/Makefile.inc $(srcdir)/modules/objfmts/Makefile.inc $(srcdir)/modules/objfmts/dbg/Makefile.inc $(srcdir)/modules/objfmts/bin/Makefile.inc $(srcdir)/modules/objfmts/bin/tests/Makefile.inc $(srcdir)/modules/objfmts/bin/tests/multisect/Makefile.inc $(srcdir)/modules/objfmts/elf/Makefile.inc $(srcdir)/modules/objfmts/elf/tests/Makefile.inc $(srcdir)/modules/objfmts/elf/tests/amd64/Makefile.inc $(srcdir)/modules/objfmts/elf/tests/gas32/Makefile.inc $(srcdir)/modules/objfmts/elf/tests/gas64/Makefile.inc $(srcdir)/modules/objfmts/coff/Makefile.inc $(srcdir)/modules/objfmts/coff/tests/Makefile.inc $(srcdir)/modules/objfmts/macho/Makefile.inc $(srcdir)/modules/objfmts/macho/tests/Makefile.inc $(srcdir)/modules/objfmts/macho/tests/gas32/Makefile.inc $(srcdir)/modules/objfmts/macho/tests/gas64/Makefile.inc $(srcdir)/modules/objfmts/macho/tests/nasm32/Makefile.inc $(srcdir)/modules/objfmts/macho/tests/nasm64/Makefile.inc $(srcdir)/modules/objfmts/rdf/Makefile.inc $(srcdir)/modules/objfmts/rdf/tests/Makefile.inc $(srcdir)/modules/objfmts/win32/Makefile.inc $(srcdir)/modules/objfmts/win32/tests/Makefile.inc $(srcdir)/modules/objfmts/win32/tests/gas/Makefile.inc $(srcdir)/modules/objfmts/win64/Makefile.inc $(srcdir)/modules/objfmts/win64/tests/Makefile.inc $(srcdir)/modules/objfmts/win64/tests/gas/Makefile.inc $(srcdir)/modules/objfmts/xdf/Makefile.inc $(srcdir)/modules/objfmts/xdf/tests/Makefile.inc $(srcdir)/libyasm/Makefile.inc $(srcdir)/libyasm/tests/Makefile.inc $(srcdir)/frontends/Makefile.inc $(srcdir)/frontends/yasm/Makefile.inc $(srcdir)/frontends/tasm/Makefile.inc $(srcdir)/frontends/vsyasm/Makefile.inc $(srcdir)/m4/Makefile.inc $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/tools/Makefile.inc $(srcdir)/tools/re2c/Makefile.inc $(srcdir)/tools/genmacro/Makefile.inc $(srcdir)/tools/genperf/Makefile.inc $(srcdir)/tools/python-yasm/Makefile.inc $(srcdir)/tools/python-yasm/tests/Makefile.inc $(srcdir)/modules/Makefile.inc $(srcdir)/modules/arch/Makefile.inc $(srcdir)/modules/arch/x86/Makefile.inc $(srcdir)/modules/arch/x86/tests/Makefile.inc $(srcdir)/modules/arch/x86/tests/gas32/Makefile.inc $(srcdir)/modules/arch/x86/tests/gas64/Makefile.inc $(srcdir)/modules/arch/lc3b/Makefile.inc $(srcdir)/modules/arch/lc3b/tests/Makefile.inc $(srcdir)/modules/listfmts/Makefile.inc $(srcdir)/modules/listfmts/nasm/Makefile.inc $(srcdir)/modules/parsers/Makefile.inc $(srcdir)/modules/parsers/gas/Makefile.inc $(srcdir)/modules/parsers/gas/tests/Makefile.inc $(srcdir)/modules/parsers/gas/tests/bin/Makefile.inc $(srcdir)/modules/parsers/nasm/Makefile.inc $(srcdir)/modules/parsers/nasm/tests/Makefile.inc $(srcdir)/modules/parsers/nasm/tests/worphan/Makefile.inc $(srcdir)/modules/parsers/tasm/Makefile.inc $(srcdir)/modules/parsers/tasm/tests/Makefile.inc $(srcdir)/modules/parsers/tasm/tests/exe/Makefile.inc $(srcdir)/modules/preprocs/Makefile.inc $(srcdir)/modules/preprocs/tasm/Makefile.inc $(srcdir)/modules/preprocs/tasm/tests/Makefile.inc $(srcdir)/modules/preprocs/nasm/Makefile.inc $(srcdir)/modules/preprocs/nasm/tests/Makefile.inc $(srcdir)/modules/preprocs/raw/Makefile.inc $(srcdir)/modules/preprocs/raw/tests/Makefile.inc $(srcdir)/modules/preprocs/cpp/Makefile.inc $(srcdir)/modules/preprocs/gas/Makefile.inc $(srcdir)/modules/preprocs/gas/tests/Makefile.inc $(srcdir)/modules/dbgfmts/Makefile.inc $(srcdir)/modules/dbgfmts/codeview/Makefile.inc $(srcdir)/modules/dbgfmts/dwarf2/Makefile.inc $(srcdir)/modules/dbgfmts/dwarf2/tests/Makefile.inc $(srcdir)/modules/dbgfmts/dwarf2/tests/gen64/Makefile.inc $(srcdir)/modules/dbgfmts/dwarf2/tests/pass32/Makefile.inc $(srcdir)/modules/dbgfmts/dwarf2/tests/pass64/Makefile.inc $(srcdir)/modules/dbgfmts/dwarf2/tests/passwin64/Makefile.inc $(srcdir)/modules/dbgfmts/null/Makefile.inc $(srcdir)/modules/dbgfmts/stabs/Makefile.inc $(srcdir)/modules/dbgfmts/stabs/tests/Makefile.inc $(srcdir)/modules/objfmts/Makefile.inc $(srcdir)/modules/objfmts/dbg/Makefile.inc $(srcdir)/modules/objfmts/bin/Makefile.inc $(srcdir)/modules/objfmts/bin/tests/Makefile.inc $(srcdir)/modules/objfmts/bin/tests/multisect/Makefile.inc $(srcdir)/modules/objfmts/elf/Makefile.inc $(srcdir)/modules/objfmts/elf/tests/Makefile.inc $(srcdir)/modules/objfmts/elf/tests/amd64/Makefile.inc $(srcdir)/modules/objfmts/elf/tests/gas32/Makefile.inc $(srcdir)/modules/objfmts/elf/tests/gas64/Makefile.inc $(srcdir)/modules/objfmts/coff/Makefile.inc $(srcdir)/modules/objfmts/coff/tests/Makefile.inc $(srcdir)/modules/objfmts/macho/Makefile.inc $(srcdir)/modules/objfmts/macho/tests/Makefile.inc $(srcdir)/modules/objfmts/macho/tests/gas32/Makefile.inc $(srcdir)/modules/objfmts/macho/tests/gas64/Makefile.inc $(srcdir)/modules/objfmts/macho/tests/nasm32/Makefile.inc $(srcdir)/modules/objfmts/macho/tests/nasm64/Makefile.inc $(srcdir)/modules/objfmts/rdf/Makefile.inc $(srcdir)/modules/objfmts/rdf/tests/Makefile.inc $(srcdir)/modules/objfmts/win32/Makefile.inc $(srcdir)/modules/objfmts/win32/tests/Makefile.inc $(srcdir)/modules/objfmts/win32/tests/gas/Makefile.inc $(srcdir)/modules/objfmts/win64/Makefile.inc $(srcdir)/modules/objfmts/win64/tests/Makefile.inc $(srcdir)/modules/objfmts/win64/tests/gas/Makefile.inc $(srcdir)/modules/objfmts/xdf/Makefile.inc $(srcdir)/modules/objfmts/xdf/tests/Makefile.inc $(srcdir)/libyasm/Makefile.inc $(srcdir)/libyasm/tests/Makefile.inc $(srcdir)/frontends/Makefile.inc $(srcdir)/frontends/yasm/Makefile.inc $(srcdir)/frontends/tasm/Makefile.inc $(srcdir)/frontends/vsyasm/Makefile.inc $(srcdir)/m4/Makefile.inc $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -3737,6 +3626,9 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$(top_distdir)" distdir="$(distdir)" \ + dist-hook -test -n "$(am__skip_mode_fix)" \ || find "$(distdir)" -type d ! -perm -755 \ -exec chmod u+rwx,go+rx {} \; -o \ @@ -3982,8 +3874,8 @@ uninstall-man: uninstall-man1 uninstall-man7 all all-am all-local am--refresh check check-TESTS check-am \ clean clean-binPROGRAMS clean-checkPROGRAMS clean-generic \ clean-libLIBRARIES clean-noinstPROGRAMS ctags ctags-recursive \ - dist dist-all dist-bzip2 dist-gzip dist-lzma dist-shar \ - dist-tarZ dist-xz dist-zip distcheck distclean \ + dist dist-all dist-bzip2 dist-gzip dist-hook dist-lzma \ + dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \ distclean-compile distclean-generic distclean-hdr \ distclean-local distclean-tags distcleancheck distdir \ distuninstallcheck dvi dvi-am html html-am info info-am \ @@ -4198,6 +4090,15 @@ license.c: $(srcdir)/COPYING genstring$(EXEEXT) $(srcdir)/frontends/vsyasm/vsyasm.c: license.c +dist-hook: YASM-VERSION-FILE YASM-VERSION.h + cp YASM-VERSION-FILE $(distdir)/version + cp YASM-VERSION.h $(distdir)/Mkfiles/dj/ + cp YASM-VERSION.h $(distdir)/Mkfiles/vc9/ + cp YASM-VERSION.h $(distdir)/Mkfiles/vc10/ + +YASM-VERSION-FILE: $(top_srcdir)/YASM-VERSION-GEN.sh + $(top_srcdir)/YASM-VERSION-GEN.sh + distclean-local: -rm -rf results @HAVE_PYTHON_TRUE@ -rm -rf build @@ -1,13 +1,13 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for yasm 1.1.0. +# Generated by GNU Autoconf 2.68 for yasm 1.2.0. # # Report bugs to <bug-yasm@tortall.net>. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software +# Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -91,6 +91,7 @@ fi IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. +as_myself= case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -216,11 +217,18 @@ IFS=$as_save_IFS # We cannot yet assume a decent shell, so we have to provide a # neutralization value for shells without unset; and this also # works around shells that cannot unset nonexistent variables. + # Preserve -v and -x to the replacement shell. BASH_ENV=/dev/null ENV=/dev/null (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV export CONFIG_SHELL - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} + case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; + esac + exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} fi if test x$as_have_required = xno; then : @@ -319,7 +327,7 @@ $as_echo X"$as_dir" | test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" } # as_fn_mkdir_p @@ -359,19 +367,19 @@ else fi # as_fn_arith -# as_fn_error ERROR [LINENO LOG_FD] -# --------------------------------- +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are # provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with status $?, using 1 if that was 0. +# script with STATUS, using 1 if that was 0. as_fn_error () { - as_status=$?; test $as_status -eq 0 && as_status=1 - if test "$3"; then - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $1" >&2 + $as_echo "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -533,7 +541,7 @@ test -n "$DJDIR" || exec 7<&0 </dev/null exec 6>&1 # Name of the host. -# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, +# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, # so uname gets run too. ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` @@ -552,8 +560,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='yasm' PACKAGE_TARNAME='yasm' -PACKAGE_VERSION='1.1.0' -PACKAGE_STRING='yasm 1.1.0' +PACKAGE_VERSION='1.2.0' +PACKAGE_STRING='yasm 1.2.0' PACKAGE_BUGREPORT='bug-yasm@tortall.net' PACKAGE_URL='' @@ -624,6 +632,7 @@ LIBINTL INTLLIBS LTLIBICONV LIBICONV +INTL_MACOSX_LIBS host_os host_vendor host_cpu @@ -824,8 +833,9 @@ do fi case $ac_option in - *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; - *) ac_optarg=yes ;; + *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; + *=) ac_optarg= ;; + *) ac_optarg=yes ;; esac # Accept the important Cygnus configure options, so we can diagnose typos. @@ -870,7 +880,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -896,7 +906,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1100,7 +1110,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1116,7 +1126,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1146,8 +1156,8 @@ do | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) as_fn_error "unrecognized option: \`$ac_option' -Try \`$0 --help' for more information." + -*) as_fn_error $? "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information" ;; *=*) @@ -1155,7 +1165,7 @@ Try \`$0 --help' for more information." # Reject names that are not valid shell variable names. case $ac_envvar in #( '' | [0-9]* | *[!_$as_cr_alnum]* ) - as_fn_error "invalid variable name: \`$ac_envvar'" ;; + as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; esac eval $ac_envvar=\$ac_optarg export $ac_envvar ;; @@ -1165,7 +1175,7 @@ Try \`$0 --help' for more information." $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} + : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" ;; esac @@ -1173,13 +1183,13 @@ done if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` - as_fn_error "missing argument to $ac_option" + as_fn_error $? "missing argument to $ac_option" fi if test -n "$ac_unrecognized_opts"; then case $enable_option_checking in no) ;; - fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; + fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi @@ -1202,7 +1212,7 @@ do [\\/$]* | ?:[\\/]* ) continue;; NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac - as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" + as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" done # There might be people who depend on the old broken behavior: `$host' @@ -1216,8 +1226,8 @@ target=$target_alias if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used." >&2 + $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. + If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1232,9 +1242,9 @@ test "$silent" = yes && exec 6>/dev/null ac_pwd=`pwd` && test -n "$ac_pwd" && ac_ls_di=`ls -di .` && ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - as_fn_error "working directory cannot be determined" + as_fn_error $? "working directory cannot be determined" test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - as_fn_error "pwd does not report name of working directory" + as_fn_error $? "pwd does not report name of working directory" # Find the source files, if location was not specified. @@ -1273,11 +1283,11 @@ else fi if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" + as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" fi ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" pwd)` # When building in place, set srcdir=. if test "$ac_abs_confdir" = "$ac_pwd"; then @@ -1303,7 +1313,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yasm 1.1.0 to adapt to many kinds of systems. +\`configure' configures yasm 1.2.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1317,7 +1327,7 @@ Configuration: --help=short display options specific to this package --help=recursive display the short help of all the included packages -V, --version display version information and exit - -q, --quiet, --silent do not print \`checking...' messages + -q, --quiet, --silent do not print \`checking ...' messages --cache-file=FILE cache test results in FILE [disabled] -C, --config-cache alias for \`--cache-file=config.cache' -n, --no-create do not create output files @@ -1373,7 +1383,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yasm 1.1.0:";; + short | recursive ) echo "Configuration of yasm 1.2.0:";; esac cat <<\_ACEOF @@ -1488,10 +1498,10 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yasm configure 1.1.0 -generated by GNU Autoconf 2.65 +yasm configure 1.2.0 +generated by GNU Autoconf 2.68 -Copyright (C) 2009 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1535,7 +1545,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_compile @@ -1561,7 +1571,7 @@ $as_echo "$ac_try_echo"; } >&5 mv -f conftest.er1 conftest.err fi $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } >/dev/null && { + test $ac_status = 0; } > conftest.i && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err }; then : @@ -1572,7 +1582,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_cpp @@ -1614,7 +1624,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=$ac_status fi rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_run @@ -1627,10 +1637,10 @@ fi ac_fn_c_check_header_mongrel () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + if eval \${$3+:} false; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 fi eval ac_res=\$$3 @@ -1666,7 +1676,7 @@ if ac_fn_c_try_cpp "$LINENO"; then : else ac_header_preproc=no fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 $as_echo "$ac_header_preproc" >&6; } @@ -1689,17 +1699,15 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -( cat <<\_ASBOX -## ----------------------------------- ## +( $as_echo "## ----------------------------------- ## ## Report this to bug-yasm@tortall.net ## -## ----------------------------------- ## -_ASBOX +## ----------------------------------- ##" ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 else eval "$3=\$ac_header_compiler" @@ -1708,7 +1716,7 @@ eval ac_res=\$$3 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_header_mongrel @@ -1721,7 +1729,7 @@ ac_fn_c_check_header_compile () as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -1739,7 +1747,7 @@ fi eval ac_res=\$$3 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_header_compile @@ -1752,7 +1760,7 @@ ac_fn_c_check_type () as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 else eval "$3=no" @@ -1793,7 +1801,7 @@ fi eval ac_res=\$$3 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_type @@ -1970,7 +1978,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ rm -f conftest.val fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_compute_int @@ -2016,7 +2024,7 @@ fi # interfere with the next link command; also delete a directory that is # left behind by Apple's compiler. We do this before executing the actions. rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_link @@ -2029,7 +2037,7 @@ ac_fn_c_check_func () as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -2084,15 +2092,15 @@ fi eval ac_res=\$$3 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_func cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yasm $as_me 1.1.0, which was -generated by GNU Autoconf 2.65. Invocation command line was +It was created by yasm $as_me 1.2.0, which was +generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2202,11 +2210,9 @@ trap 'exit_status=$? { echo - cat <<\_ASBOX -## ---------------- ## + $as_echo "## ---------------- ## ## Cache variables. ## -## ---------------- ## -_ASBOX +## ---------------- ##" echo # The following way of writing the cache mishandles newlines in values, ( @@ -2240,11 +2246,9 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ) echo - cat <<\_ASBOX -## ----------------- ## + $as_echo "## ----------------- ## ## Output variables. ## -## ----------------- ## -_ASBOX +## ----------------- ##" echo for ac_var in $ac_subst_vars do @@ -2257,11 +2261,9 @@ _ASBOX echo if test -n "$ac_subst_files"; then - cat <<\_ASBOX -## ------------------- ## + $as_echo "## ------------------- ## ## File substitutions. ## -## ------------------- ## -_ASBOX +## ------------------- ##" echo for ac_var in $ac_subst_files do @@ -2275,11 +2277,9 @@ _ASBOX fi if test -s confdefs.h; then - cat <<\_ASBOX -## ----------- ## + $as_echo "## ----------- ## ## confdefs.h. ## -## ----------- ## -_ASBOX +## ----------- ##" echo cat confdefs.h echo @@ -2334,7 +2334,12 @@ _ACEOF ac_site_file1=NONE ac_site_file2=NONE if test -n "$CONFIG_SITE"; then - ac_site_file1=$CONFIG_SITE + # We do not want a PATH search for config.site. + case $CONFIG_SITE in #(( + -*) ac_site_file1=./$CONFIG_SITE;; + */*) ac_site_file1=$CONFIG_SITE;; + *) ac_site_file1=./$CONFIG_SITE;; + esac elif test "x$prefix" != xNONE; then ac_site_file1=$prefix/share/config.site ac_site_file2=$prefix/etc/config.site @@ -2349,7 +2354,11 @@ do { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 $as_echo "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 - . "$ac_site_file" + . "$ac_site_file" \ + || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "failed to load site script $ac_site_file +See \`config.log' for more details" "$LINENO" 5; } fi done @@ -2426,7 +2435,7 @@ if $ac_cache_corrupted; then $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 + as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 fi ## -------------------- ## ## Main body of script. ## @@ -2442,16 +2451,22 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu #AC_CONFIG_SRCDIR([src/main.c]) ac_aux_dir= for ac_dir in config "$srcdir"/config; do - for ac_t in install-sh install.sh shtool; do - if test -f "$ac_dir/$ac_t"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/$ac_t -c" - break 2 - fi - done + if test -f "$ac_dir/install-sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break + elif test -f "$ac_dir/install.sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break + elif test -f "$ac_dir/shtool"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/shtool install -c" + break + fi done if test -z "$ac_aux_dir"; then - as_fn_error "cannot find install-sh, install.sh, or shtool in config \"$srcdir\"/config" "$LINENO" 5 + as_fn_error $? "cannot find install-sh, install.sh, or shtool in config \"$srcdir\"/config" "$LINENO" 5 fi # These three variables are undocumented and unsupported, @@ -2485,7 +2500,7 @@ am__api_version='1.11' { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 $as_echo_n "checking for a BSD-compatible install... " >&6; } if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then : +if ${ac_cv_path_install+:} false; then : $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2572,11 +2587,11 @@ am_lf=' ' case `pwd` in *[\\\"\#\$\&\'\`$am_lf]*) - as_fn_error "unsafe absolute working directory name" "$LINENO" 5;; + as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;; esac case $srcdir in *[\\\"\#\$\&\'\`$am_lf\ \ ]*) - as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; + as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; esac # Do `set' in a subshell so we don't clobber the current shell's @@ -2598,7 +2613,7 @@ if ( # if, for instance, CONFIG_SHELL is bash and it inherits a # broken ls alias from the environment. This has actually # happened. Such a system could not be considered "sane". - as_fn_error "ls -t appears to fail. Make sure there is not a broken + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken alias in your environment" "$LINENO" 5 fi @@ -2608,7 +2623,7 @@ then # Ok. : else - as_fn_error "newly created file is older than distributed files! + as_fn_error $? "newly created file is older than distributed files! Check your system clock" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 @@ -2662,7 +2677,7 @@ if test "$cross_compiling" != no; then set dummy ${ac_tool_prefix}strip; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_STRIP+set}" = set; then : +if ${ac_cv_prog_STRIP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$STRIP"; then @@ -2702,7 +2717,7 @@ if test -z "$ac_cv_prog_STRIP"; then set dummy strip; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_STRIP"; then @@ -2755,7 +2770,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 $as_echo_n "checking for a thread-safe mkdir -p... " >&6; } if test -z "$MKDIR_P"; then - if test "${ac_cv_path_mkdir+set}" = set; then : + if ${ac_cv_path_mkdir+:} false; then : $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2806,7 +2821,7 @@ do set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_AWK+set}" = set; then : +if ${ac_cv_prog_AWK+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$AWK"; then @@ -2846,7 +2861,7 @@ done $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF @@ -2854,7 +2869,7 @@ SHELL = /bin/sh all: @echo '@@@%%%=$(MAKE)=@@@%%%' _ACEOF -# GNU make sometimes prints "make[1]: Entering...", which would confuse us. +# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. case `${MAKE-make} -f conftest.make 2>/dev/null` in *@@@%%%=?*=@@@%%%*) eval ac_cv_prog_make_${ac_make}_set=yes;; @@ -2888,7 +2903,7 @@ if test "`cd $srcdir && pwd`" != "`pwd`"; then am__isrc=' -I$(srcdir)' # test to see if srcdir already configured if test -f $srcdir/config.status; then - as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 + as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 fi fi @@ -2904,7 +2919,7 @@ fi # Define the identity of the package. PACKAGE='yasm' - VERSION='1.1.0' + VERSION='1.2.0' cat >>confdefs.h <<_ACEOF @@ -2968,13 +2983,6 @@ fi - -$as_echo "#define PACKAGE_INTVER \"1.1.0\"" >>confdefs.h - - -$as_echo "#define PACKAGE_BUILD \"2352\"" >>confdefs.h - - # # autoconf command-line options # @@ -2983,7 +2991,7 @@ if test "${enable_debug+set}" = set; then : enableval=$enable_debug; case "${enableval}" in yes) debugging="yes" ;; no) debugging="no" ;; - *) as_fn_error "bad value ${enableval} for --enable-debug" "$LINENO" 5 ;; + *) as_fn_error $? "bad value ${enableval} for --enable-debug" "$LINENO" 5 ;; esac fi @@ -2993,7 +3001,7 @@ if test "${enable_warnerror+set}" = set; then : enableval=$enable_warnerror; case "${enableval}" in yes) warnerror="yes" ;; no) warnerror="no" ;; - *) as_fn_error "bad value ${enableval} for --enable-warnerror" "$LINENO" 5 ;; + *) as_fn_error $? "bad value ${enableval} for --enable-warnerror" "$LINENO" 5 ;; esac fi @@ -3003,7 +3011,7 @@ if test "${enable_profiling+set}" = set; then : enableval=$enable_profiling; case "${enableval}" in yes) profiling="yes" ;; no) profiling="no" ;; - *) as_fn_error "bad value ${enableval} for --enable-profiling" "$LINENO" 5 ;; + *) as_fn_error $? "bad value ${enableval} for --enable-profiling" "$LINENO" 5 ;; esac fi @@ -3013,7 +3021,7 @@ if test "${enable_gcov+set}" = set; then : enableval=$enable_gcov; case "${enableval}" in yes) gcov="yes" ;; no) gcov="no" ;; - *) as_fn_error "bad value ${enableval} for --enable-gcov" "$LINENO" 5 ;; + *) as_fn_error $? "bad value ${enableval} for --enable-gcov" "$LINENO" 5 ;; esac fi @@ -3023,7 +3031,7 @@ if test "${enable_python+set}" = set; then : enableval=$enable_python; case "${enableval}" in yes) enable_python="yes" ;; no) enable_python="no" ;; - *) as_fn_error "bad value ${enableval} for --enable-python" "$LINENO" 5 ;; + *) as_fn_error $? "bad value ${enableval} for --enable-python" "$LINENO" 5 ;; esac else enable_python="auto" @@ -3035,7 +3043,7 @@ if test "${enable_python_bindings+set}" = set; then : enableval=$enable_python_bindings; case "${enableval}" in yes) enable_python_bindings="yes" ;; no) enable_python_bindings="no" ;; - *) as_fn_error "bad value ${enableval} for --enable-python-bindings" "$LINENO" 5 ;; + *) as_fn_error $? "bad value ${enableval} for --enable-python-bindings" "$LINENO" 5 ;; esac else enable_python_bindings="no" @@ -3117,7 +3125,7 @@ if test -n "$ac_tool_prefix"; then set dummy ${ac_tool_prefix}gcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3157,7 +3165,7 @@ if test -z "$ac_cv_prog_CC"; then set dummy gcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -3210,7 +3218,7 @@ if test -z "$CC"; then set dummy ${ac_tool_prefix}cc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3250,7 +3258,7 @@ if test -z "$CC"; then set dummy cc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3309,7 +3317,7 @@ if test -z "$CC"; then set dummy $ac_tool_prefix$ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3353,7 +3361,7 @@ do set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -3407,8 +3415,8 @@ fi test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "no acceptable C compiler found in \$PATH -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "no acceptable C compiler found in \$PATH +See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -3522,9 +3530,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ as_fn_set_status 77 -as_fn_error "C compiler cannot create executables -See \`config.log' for more details." "$LINENO" 5; }; } +as_fn_error 77 "C compiler cannot create executables +See \`config.log' for more details" "$LINENO" 5; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -3566,8 +3573,8 @@ done else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest conftest$ac_cv_exeext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 @@ -3624,9 +3631,9 @@ $as_echo "$ac_try_echo"; } >&5 else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot run C compiled programs. +as_fn_error $? "cannot run C compiled programs. If you meant to cross compile, use \`--host'. -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5; } fi fi fi @@ -3637,7 +3644,7 @@ rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out ac_clean_files=$ac_clean_files_save { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 $as_echo_n "checking for suffix of object files... " >&6; } -if test "${ac_cv_objext+set}" = set; then : +if ${ac_cv_objext+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -3677,8 +3684,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot compute suffix of object files: cannot compile -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "cannot compute suffix of object files: cannot compile +See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi @@ -3688,7 +3695,7 @@ OBJEXT=$ac_cv_objext ac_objext=$OBJEXT { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if test "${ac_cv_c_compiler_gnu+set}" = set; then : +if ${ac_cv_c_compiler_gnu+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -3725,7 +3732,7 @@ ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 $as_echo_n "checking whether $CC accepts -g... " >&6; } -if test "${ac_cv_prog_cc_g+set}" = set; then : +if ${ac_cv_prog_cc_g+:} false; then : $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag @@ -3803,7 +3810,7 @@ else fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then : +if ${ac_cv_prog_cc_c89+:} false; then : $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no @@ -3902,7 +3909,7 @@ depcc="$CC" am_compiler_list= { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 $as_echo_n "checking dependency style of $depcc... " >&6; } -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : +if ${am_cv_CC_dependencies_compiler_type+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then @@ -4037,7 +4044,7 @@ if test -n "$CPP" && test -d "$CPP"; then CPP= fi if test -z "$CPP"; then - if test "${ac_cv_prog_CPP+set}" = set; then : + if ${ac_cv_prog_CPP+:} false; then : $as_echo_n "(cached) " >&6 else # Double quotes because CPP needs to be expanded @@ -4067,7 +4074,7 @@ else # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. @@ -4083,11 +4090,11 @@ else ac_preproc_ok=: break fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext +rm -f conftest.i conftest.err conftest.$ac_ext if $ac_preproc_ok; then : break fi @@ -4126,7 +4133,7 @@ else # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. @@ -4142,18 +4149,18 @@ else ac_preproc_ok=: break fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext +rm -f conftest.i conftest.err conftest.$ac_ext if $ac_preproc_ok; then : else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details" "$LINENO" 5; } fi ac_ext=c @@ -4168,7 +4175,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu *) : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C99" >&5 $as_echo_n "checking for $CC option to accept ISO C99... " >&6; } -if test "${ac_cv_prog_cc_c99+set}" = set; then : +if ${ac_cv_prog_cc_c99+:} false; then : $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c99=no @@ -4343,7 +4350,7 @@ if test "x$ac_cv_prog_cc_c99" != xno; then : else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then : +if ${ac_cv_prog_cc_c89+:} false; then : $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no @@ -4439,7 +4446,7 @@ fi esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO Standard C" >&5 $as_echo_n "checking for $CC option to accept ISO Standard C... " >&6; } - if test "${ac_cv_prog_cc_stdc+set}" = set; then : + if ${ac_cv_prog_cc_stdc+:} false; then : $as_echo_n "(cached) " >&6 fi @@ -4475,7 +4482,7 @@ if test -n "$ac_tool_prefix"; then set dummy $ac_tool_prefix$ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_AR+set}" = set; then : +if ${ac_cv_prog_AR+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$AR"; then @@ -4519,7 +4526,7 @@ do set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : +if ${ac_cv_prog_ac_ct_AR+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_AR"; then @@ -4573,7 +4580,7 @@ if test -n "$ac_tool_prefix"; then set dummy ${ac_tool_prefix}ranlib; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_RANLIB+set}" = set; then : +if ${ac_cv_prog_RANLIB+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$RANLIB"; then @@ -4613,7 +4620,7 @@ if test -z "$ac_cv_prog_RANLIB"; then set dummy ranlib; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then : +if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_RANLIB"; then @@ -4663,7 +4670,7 @@ fi # REQUIRE a standard (ANSI/ISO) C compiler if test "$ac_cv_prog_cc_stdc" = no; then - as_fn_error "A standard (ANSI/ISO C89) C compiler is required." "$LINENO" 5 + as_fn_error $? "A standard (ANSI/ISO C89) C compiler is required." "$LINENO" 5 fi # Check for xmlto (for rendering manpages, needed only for development) @@ -4673,7 +4680,7 @@ do set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_XMLTO+set}" = set; then : +if ${ac_cv_prog_XMLTO+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$XMLTO"; then @@ -4761,7 +4768,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 $as_echo_n "checking for grep that handles long lines and -e... " >&6; } -if test "${ac_cv_path_GREP+set}" = set; then : +if ${ac_cv_path_GREP+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$GREP"; then @@ -4810,7 +4817,7 @@ esac done IFS=$as_save_IFS if test -z "$ac_cv_path_GREP"; then - as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_GREP=$GREP @@ -4824,7 +4831,7 @@ $as_echo "$ac_cv_path_GREP" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 $as_echo_n "checking for egrep... " >&6; } -if test "${ac_cv_path_EGREP+set}" = set; then : +if ${ac_cv_path_EGREP+:} false; then : $as_echo_n "(cached) " >&6 else if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 @@ -4876,7 +4883,7 @@ esac done IFS=$as_save_IFS if test -z "$ac_cv_path_EGREP"; then - as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_EGREP=$EGREP @@ -4891,7 +4898,7 @@ $as_echo "$ac_cv_path_EGREP" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 $as_echo_n "checking for ANSI C header files... " >&6; } -if test "${ac_cv_header_stdc+set}" = set; then : +if ${ac_cv_header_stdc+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -5008,8 +5015,7 @@ do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default " -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -5023,8 +5029,7 @@ for ac_header in strings.h libgen.h unistd.h direct.h sys/stat.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -5036,7 +5041,7 @@ done # REQUIRE standard C headers if test "$ac_cv_header_stdc" != yes; then - as_fn_error "Standard (ANSI/ISO C89) header files are required." "$LINENO" 5 + as_fn_error $? "Standard (ANSI/ISO C89) header files are required." "$LINENO" 5 fi # @@ -5044,7 +5049,7 @@ fi # { $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 $as_echo_n "checking for an ANSI C-conforming const... " >&6; } -if test "${ac_cv_c_const+set}" = set; then : +if ${ac_cv_c_const+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -5124,7 +5129,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 $as_echo_n "checking for inline... " >&6; } -if test "${ac_cv_c_inline+set}" = set; then : +if ${ac_cv_c_inline+:} false; then : $as_echo_n "(cached) " >&6 else ac_cv_c_inline=no @@ -5181,7 +5186,7 @@ $as_echo "no" >&6; } fi ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default" -if test "x$ac_cv_type_size_t" = x""yes; then : +if test "x$ac_cv_type_size_t" = xyes; then : else @@ -5197,7 +5202,7 @@ $as_echo_n "checking for stdint types... " >&6; } ac_stdint_h=`echo libyasm-stdint.h` # try to shortcircuit - if the default include path of the compiler # can find a "stdint.h" header then we assume that all compilers can. -if test "${ac_cv_header_stdint_t+set}" = set; then : +if ${ac_cv_header_stdint_t+:} false; then : $as_echo_n "(cached) " >&6 else @@ -5253,7 +5258,7 @@ ac_cv_stdint_result="(no helpful system typedefs seen)" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdint uintptr_t" >&5 $as_echo_n "checking for stdint uintptr_t... " >&6; } -if test "${ac_cv_header_stdint_x+set}" = set; then : +if ${ac_cv_header_stdint_x+:} false; then : $as_echo_n "(cached) " >&6 else @@ -5265,7 +5270,7 @@ $as_echo "(..)" >&6; } unset ac_cv_type_uint64_t ac_fn_c_check_type "$LINENO" "uintptr_t" "ac_cv_type_uintptr_t" "#include <$i> " -if test "x$ac_cv_type_uintptr_t" = x""yes; then : +if test "x$ac_cv_type_uintptr_t" = xyes; then : ac_cv_header_stdint_x=$i else continue @@ -5273,7 +5278,7 @@ fi ac_fn_c_check_type "$LINENO" "uint64_t" "ac_cv_type_uint64_t" "#include<$i> " -if test "x$ac_cv_type_uint64_t" = x""yes; then : +if test "x$ac_cv_type_uint64_t" = xyes; then : and64="/uint64_t" else and64="" @@ -5293,7 +5298,7 @@ if test "_$ac_cv_header_stdint_x" = "_" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdint uint32_t" >&5 $as_echo_n "checking for stdint uint32_t... " >&6; } -if test "${ac_cv_header_stdint_o+set}" = set; then : +if ${ac_cv_header_stdint_o+:} false; then : $as_echo_n "(cached) " >&6 else @@ -5305,7 +5310,7 @@ $as_echo "(..)" >&6; } unset ac_cv_type_uint64_t ac_fn_c_check_type "$LINENO" "uint32_t" "ac_cv_type_uint32_t" "#include <$i> " -if test "x$ac_cv_type_uint32_t" = x""yes; then : +if test "x$ac_cv_type_uint32_t" = xyes; then : ac_cv_header_stdint_o=$i else continue @@ -5313,7 +5318,7 @@ fi ac_fn_c_check_type "$LINENO" "uint64_t" "ac_cv_type_uint64_t" "#include<$i> " -if test "x$ac_cv_type_uint64_t" = x""yes; then : +if test "x$ac_cv_type_uint64_t" = xyes; then : and64="/uint64_t" else and64="" @@ -5335,7 +5340,7 @@ if test "_$ac_cv_header_stdint_o" = "_" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdint u_int32_t" >&5 $as_echo_n "checking for stdint u_int32_t... " >&6; } -if test "${ac_cv_header_stdint_u+set}" = set; then : +if ${ac_cv_header_stdint_u+:} false; then : $as_echo_n "(cached) " >&6 else @@ -5347,7 +5352,7 @@ $as_echo "(..)" >&6; } unset ac_cv_type_u_int64_t ac_fn_c_check_type "$LINENO" "u_int32_t" "ac_cv_type_u_int32_t" "#include <$i> " -if test "x$ac_cv_type_u_int32_t" = x""yes; then : +if test "x$ac_cv_type_u_int32_t" = xyes; then : ac_cv_header_stdint_u=$i else continue @@ -5355,7 +5360,7 @@ fi ac_fn_c_check_type "$LINENO" "u_int64_t" "ac_cv_type_u_int64_t" "#include<$i> " -if test "x$ac_cv_type_u_int64_t" = x""yes; then : +if test "x$ac_cv_type_u_int64_t" = xyes; then : and64="/u_int64_t" else and64="" @@ -5384,7 +5389,7 @@ $as_echo "(..)" >&6; } # This bug is HP SR number 8606223364. { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of char" >&5 $as_echo_n "checking size of char... " >&6; } -if test "${ac_cv_sizeof_char+set}" = set; then : +if ${ac_cv_sizeof_char+:} false; then : $as_echo_n "(cached) " >&6 else if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (char))" "ac_cv_sizeof_char" "$ac_includes_default"; then : @@ -5393,9 +5398,8 @@ else if test "$ac_cv_type_char" = yes; then { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ as_fn_set_status 77 -as_fn_error "cannot compute sizeof (char) -See \`config.log' for more details." "$LINENO" 5; }; } +as_fn_error 77 "cannot compute sizeof (char) +See \`config.log' for more details" "$LINENO" 5; } else ac_cv_sizeof_char=0 fi @@ -5418,7 +5422,7 @@ _ACEOF # This bug is HP SR number 8606223364. { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of short" >&5 $as_echo_n "checking size of short... " >&6; } -if test "${ac_cv_sizeof_short+set}" = set; then : +if ${ac_cv_sizeof_short+:} false; then : $as_echo_n "(cached) " >&6 else if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (short))" "ac_cv_sizeof_short" "$ac_includes_default"; then : @@ -5427,9 +5431,8 @@ else if test "$ac_cv_type_short" = yes; then { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ as_fn_set_status 77 -as_fn_error "cannot compute sizeof (short) -See \`config.log' for more details." "$LINENO" 5; }; } +as_fn_error 77 "cannot compute sizeof (short) +See \`config.log' for more details" "$LINENO" 5; } else ac_cv_sizeof_short=0 fi @@ -5452,7 +5455,7 @@ _ACEOF # This bug is HP SR number 8606223364. { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5 $as_echo_n "checking size of int... " >&6; } -if test "${ac_cv_sizeof_int+set}" = set; then : +if ${ac_cv_sizeof_int+:} false; then : $as_echo_n "(cached) " >&6 else if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int" "$ac_includes_default"; then : @@ -5461,9 +5464,8 @@ else if test "$ac_cv_type_int" = yes; then { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ as_fn_set_status 77 -as_fn_error "cannot compute sizeof (int) -See \`config.log' for more details." "$LINENO" 5; }; } +as_fn_error 77 "cannot compute sizeof (int) +See \`config.log' for more details" "$LINENO" 5; } else ac_cv_sizeof_int=0 fi @@ -5486,7 +5488,7 @@ _ACEOF # This bug is HP SR number 8606223364. { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5 $as_echo_n "checking size of long... " >&6; } -if test "${ac_cv_sizeof_long+set}" = set; then : +if ${ac_cv_sizeof_long+:} false; then : $as_echo_n "(cached) " >&6 else if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long" "$ac_includes_default"; then : @@ -5495,9 +5497,8 @@ else if test "$ac_cv_type_long" = yes; then { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ as_fn_set_status 77 -as_fn_error "cannot compute sizeof (long) -See \`config.log' for more details." "$LINENO" 5; }; } +as_fn_error 77 "cannot compute sizeof (long) +See \`config.log' for more details" "$LINENO" 5; } else ac_cv_sizeof_long=0 fi @@ -5520,7 +5521,7 @@ _ACEOF # This bug is HP SR number 8606223364. { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void*" >&5 $as_echo_n "checking size of void*... " >&6; } -if test "${ac_cv_sizeof_voidp+set}" = set; then : +if ${ac_cv_sizeof_voidp+:} false; then : $as_echo_n "(cached) " >&6 else if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void*))" "ac_cv_sizeof_voidp" "$ac_includes_default"; then : @@ -5529,9 +5530,8 @@ else if test "$ac_cv_type_voidp" = yes; then { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ as_fn_set_status 77 -as_fn_error "cannot compute sizeof (void*) -See \`config.log' for more details." "$LINENO" 5; }; } +as_fn_error 77 "cannot compute sizeof (void*) +See \`config.log' for more details" "$LINENO" 5; } else ac_cv_sizeof_voidp=0 fi @@ -5600,19 +5600,19 @@ unset ac_cv_type_int_least32_t unset ac_cv_type_int_fast32_t ac_fn_c_check_type "$LINENO" "int_least32_t" "ac_cv_type_int_least32_t" "#include <$ac_cv_header_stdint> " -if test "x$ac_cv_type_int_least32_t" = x""yes; then : +if test "x$ac_cv_type_int_least32_t" = xyes; then : fi ac_fn_c_check_type "$LINENO" "int_fast32_t" "ac_cv_type_int_fast32_t" "#include<$ac_cv_header_stdint> " -if test "x$ac_cv_type_int_fast32_t" = x""yes; then : +if test "x$ac_cv_type_int_fast32_t" = xyes; then : fi ac_fn_c_check_type "$LINENO" "intmax_t" "ac_cv_type_intmax_t" "#include <$ac_cv_header_stdint> " -if test "x$ac_cv_type_intmax_t" = x""yes; then : +if test "x$ac_cv_type_intmax_t" = xyes; then : fi @@ -5640,8 +5640,7 @@ for ac_func in abort toascii vsnprintf do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -5653,8 +5652,7 @@ for ac_func in strsep mergesort getcwd do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -5666,8 +5664,7 @@ for ac_func in popen ftruncate do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -5680,8 +5677,7 @@ for ac_func in strcasecmp strncasecmp stricmp _stricmp strcmpi do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -5747,7 +5743,7 @@ rm -f conf$$.file set dummy msgfmt; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_MSGFMT+set}" = set; then : +if ${ac_cv_path_MSGFMT+:} false; then : $as_echo_n "(cached) " >&6 else case "$MSGFMT" in @@ -5788,7 +5784,7 @@ fi set dummy gmsgfmt; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_GMSGFMT+set}" = set; then : +if ${ac_cv_path_GMSGFMT+:} false; then : $as_echo_n "(cached) " >&6 else case $GMSGFMT in @@ -5870,7 +5866,7 @@ rm -f conf$$.file set dummy xgettext; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_XGETTEXT+set}" = set; then : +if ${ac_cv_path_XGETTEXT+:} false; then : $as_echo_n "(cached) " >&6 else case "$XGETTEXT" in @@ -5948,7 +5944,7 @@ rm -f conf$$.file set dummy msgmerge; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_MSGMERGE+set}" = set; then : +if ${ac_cv_path_MSGMERGE+:} false; then : $as_echo_n "(cached) " >&6 else case "$MSGMERGE" in @@ -6012,27 +6008,27 @@ fi # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 + as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 $as_echo_n "checking build system type... " >&6; } -if test "${ac_cv_build+set}" = set; then : +if ${ac_cv_build+:} false; then : $as_echo_n "(cached) " >&6 else ac_build_alias=$build_alias test "x$ac_build_alias" = x && ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` test "x$ac_build_alias" = x && - as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 + as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 $as_echo "$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; -*) as_fn_error "invalid value of canonical build" "$LINENO" 5;; +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; esac build=$ac_cv_build ac_save_IFS=$IFS; IFS='-' @@ -6050,14 +6046,14 @@ case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 $as_echo_n "checking host system type... " >&6; } -if test "${ac_cv_host+set}" = set; then : +if ${ac_cv_host+:} false; then : $as_echo_n "(cached) " >&6 else if test "x$host_alias" = x; then ac_cv_host=$ac_cv_build else ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || - as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 fi fi @@ -6065,7 +6061,7 @@ fi $as_echo "$ac_cv_host" >&6; } case $ac_cv_host in *-*-*) ;; -*) as_fn_error "invalid value of canonical host" "$LINENO" 5;; +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; esac host=$ac_cv_host ac_save_IFS=$IFS; IFS='-' @@ -6141,7 +6137,7 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 $as_echo_n "checking for non-GNU ld... " >&6; } fi -if test "${acl_cv_path_LD+set}" = set; then : +if ${acl_cv_path_LD+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$LD"; then @@ -6175,10 +6171,10 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5 +test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } -if test "${acl_cv_prog_gnu_ld+set}" = set; then : +if ${acl_cv_prog_gnu_ld+:} false; then : $as_echo_n "(cached) " >&6 else # I'd rather use --version here, but apparently some GNU ld's only accept -v. @@ -6198,7 +6194,7 @@ with_gnu_ld=$acl_cv_prog_gnu_ld { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5 $as_echo_n "checking for shared library run path origin... " >&6; } -if test "${acl_cv_rpath+set}" = set; then : +if ${acl_cv_rpath+:} false; then : $as_echo_n "(cached) " >&6 else @@ -6709,7 +6705,81 @@ fi - gt_INTL_MACOSX + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5 +$as_echo_n "checking for CFPreferencesCopyAppValue... " >&6; } +if ${gt_cv_func_CFPreferencesCopyAppValue+:} false; then : + $as_echo_n "(cached) " >&6 +else + gt_save_LIBS="$LIBS" + LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <CoreFoundation/CFPreferences.h> +int +main () +{ +CFPreferencesCopyAppValue(NULL, NULL) + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + gt_cv_func_CFPreferencesCopyAppValue=yes +else + gt_cv_func_CFPreferencesCopyAppValue=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS="$gt_save_LIBS" +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5 +$as_echo "$gt_cv_func_CFPreferencesCopyAppValue" >&6; } + if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then + +$as_echo "#define HAVE_CFPREFERENCESCOPYAPPVALUE 1" >>confdefs.h + + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyCurrent" >&5 +$as_echo_n "checking for CFLocaleCopyCurrent... " >&6; } +if ${gt_cv_func_CFLocaleCopyCurrent+:} false; then : + $as_echo_n "(cached) " >&6 +else + gt_save_LIBS="$LIBS" + LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <CoreFoundation/CFLocale.h> +int +main () +{ +CFLocaleCopyCurrent(); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + gt_cv_func_CFLocaleCopyCurrent=yes +else + gt_cv_func_CFLocaleCopyCurrent=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS="$gt_save_LIBS" +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFLocaleCopyCurrent" >&5 +$as_echo "$gt_cv_func_CFLocaleCopyCurrent" >&6; } + if test $gt_cv_func_CFLocaleCopyCurrent = yes; then + +$as_echo "#define HAVE_CFLOCALECOPYCURRENT 1" >>confdefs.h + + fi + INTL_MACOSX_LIBS= + if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then + INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation" + fi + + @@ -6748,7 +6818,7 @@ typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5 $as_echo_n "checking for GNU gettext in libc... " >&6; } -if { as_var=$gt_func_gnugettext_libc; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${$gt_func_gnugettext_libc+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -6811,7 +6881,7 @@ $as_echo "$ac_res" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5 $as_echo_n "checking for iconv... " >&6; } -if test "${am_cv_func_iconv+set}" = set; then : +if ${am_cv_func_iconv+:} false; then : $as_echo_n "(cached) " >&6 else @@ -6868,7 +6938,7 @@ $as_echo "$am_cv_func_iconv" >&6; } if test "$am_cv_func_iconv" = yes; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5 $as_echo_n "checking for working iconv... " >&6; } -if test "${am_cv_func_iconv_works+set}" = set; then : +if ${am_cv_func_iconv_works+:} false; then : $as_echo_n "(cached) " >&6 else @@ -7419,7 +7489,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5 $as_echo_n "checking for GNU gettext in libintl... " >&6; } -if { as_var=$gt_func_gnugettext_libintl; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${$gt_func_gnugettext_libintl+:} false; then : $as_echo_n "(cached) " >&6 else gt_save_CPPFLAGS="$CPPFLAGS" @@ -7605,7 +7675,7 @@ $as_echo "#define HAVE_DCGETTEXT 1" >>confdefs.h { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU C Library" >&5 $as_echo_n "checking for GNU C Library... " >&6; } -if test "${yasm_cv_header_gnulib+set}" = set; then : +if ${yasm_cv_header_gnulib+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -7767,7 +7837,7 @@ sys.exit(sys.hexversion < minverhex)" { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - as_fn_error "too old" "$LINENO" 5 + as_fn_error $? "too old" "$LINENO" 5 fi am_display_PYTHON=$PYTHON else @@ -7775,11 +7845,11 @@ fi # VERSION. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 2.4" >&5 $as_echo_n "checking for a Python interpreter with version >= 2.4... " >&6; } -if test "${am_cv_pathless_PYTHON+set}" = set; then : +if ${am_cv_pathless_PYTHON+:} false; then : $as_echo_n "(cached) " >&6 else - for am_cv_pathless_PYTHON in python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do + for am_cv_pathless_PYTHON in python python2 python3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do test "$am_cv_pathless_PYTHON" = none && break prog="import sys # split strings by '.' and convert to numeric. Append some zeros @@ -7809,7 +7879,7 @@ $as_echo "$am_cv_pathless_PYTHON" >&6; } set dummy $am_cv_pathless_PYTHON; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PYTHON+set}" = set; then : +if ${ac_cv_path_PYTHON+:} false; then : $as_echo_n "(cached) " >&6 else case $PYTHON in @@ -7858,7 +7928,7 @@ $as_echo "$as_me: WARNING: Python not found" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON version" >&5 $as_echo_n "checking for $am_display_PYTHON version... " >&6; } -if test "${am_cv_python_version+set}" = set; then : +if ${am_cv_python_version+:} false; then : $as_echo_n "(cached) " >&6 else am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"` @@ -7877,7 +7947,7 @@ $as_echo "$am_cv_python_version" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON platform" >&5 $as_echo_n "checking for $am_display_PYTHON platform... " >&6; } -if test "${am_cv_python_platform+set}" = set; then : +if ${am_cv_python_platform+:} false; then : $as_echo_n "(cached) " >&6 else am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"` @@ -7891,7 +7961,7 @@ $as_echo "$am_cv_python_platform" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5 $as_echo_n "checking for $am_display_PYTHON script directory... " >&6; } -if test "${am_cv_python_pythondir+set}" = set; then : +if ${am_cv_python_pythondir+:} false; then : $as_echo_n "(cached) " >&6 else if test "x$prefix" = xNONE @@ -7929,7 +7999,7 @@ $as_echo "$am_cv_python_pythondir" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory" >&5 $as_echo_n "checking for $am_display_PYTHON extension module directory... " >&6; } -if test "${am_cv_python_pyexecdir+set}" = set; then : +if ${am_cv_python_pyexecdir+:} false; then : $as_echo_n "(cached) " >&6 else if test "x$exec_prefix" = xNONE @@ -7978,7 +8048,7 @@ $as_echo "$am_cv_python_pyexecdir" >&6; } if test x$have_python = xno ; then if test x$enable_python = xyes ; then - as_fn_error "Python explicitly requested, but a suitable Python version was not found" "$LINENO" 5 + as_fn_error $? "Python explicitly requested, but a suitable Python version was not found" "$LINENO" 5 else { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find a suitable version of Python" >&5 $as_echo "$as_me: WARNING: Could not find a suitable version of Python" >&2;} @@ -7999,14 +8069,19 @@ $as_echo "$as_me: Checking to see if we can build Python bindings" >&6;} $as_echo_n "checking for Cython >= 0.11.3... " >&6; } prog="import sys from Cython.Compiler.Version import version +def get_int(arg): + try: + return int(arg) + except ValueError: + return 0 # split strings by '.' and convert to numeric. Append some zeros # because we need at least 4 digits for the hex conversion. -ver = map(int, version.rstrip('abcdefghijklmnopqrstuvwxyz').split('.')) + [0, 0, 0] +ver = map(get_int, version.rstrip('abcdefghijklmnopqrstuvwxyz').split('.')) + [0, 0, 0] verhex = 0 -for i in xrange(0, 4): verhex = (verhex << 8) + ver[i] -minver = map(int, '0.11.3'.split('.')) + [0, 0, 0] +for i in range(0, 4): verhex = (verhex << 8) + ver[i] +minver = map(get_int, '0.11.3'.split('.')) + [0, 0, 0] minverhex = 0 -for i in xrange(0, 4): minverhex = (minverhex << 8) + minver[i] +for i in range(0, 4): minverhex = (minverhex << 8) + minver[i] sys.exit(verhex < minverhex)" if { echo "$as_me:$LINENO: $PYTHON -c "$prog"" >&5 ($PYTHON -c "$prog") >&5 2>&5 @@ -8047,7 +8122,7 @@ else $as_echo "not found" >&6; } have_python_headers=no fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext CPPFLAGS="$save_CPPFLAGS" @@ -8058,7 +8133,7 @@ CPPFLAGS="$save_CPPFLAGS" if test x$have_python_bindings = xno ; then if test x$enable_python_bindings = xyes ; then - as_fn_error "Building Python bindings explicitly requested, but can't build Python bindings because either Cython, Python headers or a suitable Python version was not found" "$LINENO" 5 + as_fn_error $? "Building Python bindings explicitly requested, but can't build Python bindings because either Cython, Python headers or a suitable Python version was not found" "$LINENO" 5 else { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Couldn't find either Cython, the Python headers or a suitable version of Python, not building Python bindings" >&5 $as_echo "$as_me: WARNING: Couldn't find either Cython, the Python headers or a suitable version of Python, not building Python bindings" >&2;} @@ -8149,10 +8224,21 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; :end' >>confcache if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then - test "x$cache_file" != "x/dev/null" && + if test "x$cache_file" != "x/dev/null"; then { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 $as_echo "$as_me: updating cache $cache_file" >&6;} - cat confcache >$cache_file + if test ! -f "$cache_file" || test -h "$cache_file"; then + cat confcache >"$cache_file" + else + case $cache_file in #( + */* | ?:*) + mv -f confcache "$cache_file"$$ && + mv -f "$cache_file"$$ "$cache_file" ;; #( + *) + mv -f confcache "$cache_file" ;; + esac + fi + fi else { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} @@ -8168,6 +8254,7 @@ DEFS=-DHAVE_CONFIG_H ac_libobjs= ac_ltlibobjs= +U= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' @@ -8191,31 +8278,31 @@ else fi if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then - as_fn_error "conditional \"MAINTAINER_MODE\" was never defined. + as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then - as_fn_error "conditional \"AMDEP\" was never defined. + as_fn_error $? "conditional \"AMDEP\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - as_fn_error "conditional \"am__fastdepCC\" was never defined. + as_fn_error $? "conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${BUILD_MAN_TRUE}" && test -z "${BUILD_MAN_FALSE}"; then - as_fn_error "conditional \"BUILD_MAN\" was never defined. + as_fn_error $? "conditional \"BUILD_MAN\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${HAVE_PYTHON_TRUE}" && test -z "${HAVE_PYTHON_FALSE}"; then - as_fn_error "conditional \"HAVE_PYTHON\" was never defined. + as_fn_error $? "conditional \"HAVE_PYTHON\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${HAVE_PYTHON_BINDINGS_TRUE}" && test -z "${HAVE_PYTHON_BINDINGS_FALSE}"; then - as_fn_error "conditional \"HAVE_PYTHON_BINDINGS\" was never defined. + as_fn_error $? "conditional \"HAVE_PYTHON_BINDINGS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -: ${CONFIG_STATUS=./config.status} +: "${CONFIG_STATUS=./config.status}" ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" @@ -8316,6 +8403,7 @@ fi IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. +as_myself= case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -8361,19 +8449,19 @@ export LANGUAGE (unset CDPATH) >/dev/null 2>&1 && unset CDPATH -# as_fn_error ERROR [LINENO LOG_FD] -# --------------------------------- +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are # provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with status $?, using 1 if that was 0. +# script with STATUS, using 1 if that was 0. as_fn_error () { - as_status=$?; test $as_status -eq 0 && as_status=1 - if test "$3"; then - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $1" >&2 + $as_echo "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -8569,7 +8657,7 @@ $as_echo X"$as_dir" | test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" } # as_fn_mkdir_p @@ -8622,8 +8710,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yasm $as_me 1.1.0, which was -generated by GNU Autoconf 2.65. Invocation command line was +This file was extended by yasm $as_me 1.2.0, which was +generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -8647,9 +8735,9 @@ esac cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # Files that config.status was made for. -config_files="`echo $ac_config_files`" -config_headers="`echo $ac_config_headers`" -config_commands="`echo $ac_config_commands`" +config_files="$ac_config_files" +config_headers="$ac_config_headers" +config_commands="$ac_config_commands" _ACEOF @@ -8688,11 +8776,11 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -yasm config.status 1.1.0 -configured by $0, generated by GNU Autoconf 2.65, +yasm config.status 1.2.0 +configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" -Copyright (C) 2009 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -8710,11 +8798,16 @@ ac_need_defaults=: while test $# != 0 do case $1 in - --*=*) + --*=?*) ac_option=`expr "X$1" : 'X\([^=]*\)='` ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` ac_shift=: ;; + --*=) + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg= + ac_shift=: + ;; *) ac_option=$1 ac_optarg=$2 @@ -8736,6 +8829,7 @@ do $ac_shift case $ac_optarg in *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + '') as_fn_error $? "missing file argument" ;; esac as_fn_append CONFIG_FILES " '$ac_optarg'" ac_need_defaults=false;; @@ -8748,7 +8842,7 @@ do ac_need_defaults=false;; --he | --h) # Conflict between --help and --header - as_fn_error "ambiguous option: \`$1' + as_fn_error $? "ambiguous option: \`$1' Try \`$0 --help' for more information.";; --help | --hel | -h ) $as_echo "$ac_cs_usage"; exit ;; @@ -8757,7 +8851,7 @@ Try \`$0 --help' for more information.";; ac_cs_silent=: ;; # This is an error. - -*) as_fn_error "unrecognized option: \`$1' + -*) as_fn_error $? "unrecognized option: \`$1' Try \`$0 --help' for more information." ;; *) as_fn_append ac_config_targets " $1" @@ -8843,7 +8937,7 @@ do "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; - *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac done @@ -8866,9 +8960,10 @@ fi # after its creation but before its name has been assigned to `$tmp'. $debug || { - tmp= + tmp= ac_tmp= trap 'exit_status=$? - { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status + : "${ac_tmp:=$tmp}" + { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status ' 0 trap 'as_fn_exit 1' 1 2 13 15 } @@ -8876,12 +8971,13 @@ $debug || { tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && - test -n "$tmp" && test -d "$tmp" + test -d "$tmp" } || { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") -} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 +} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 +ac_tmp=$tmp # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. @@ -8898,12 +8994,12 @@ if test "x$ac_cr" = x; then fi ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null` if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then - ac_cs_awk_cr='\r' + ac_cs_awk_cr='\\r' else ac_cs_awk_cr=$ac_cr fi -echo 'BEGIN {' >"$tmp/subs1.awk" && +echo 'BEGIN {' >"$ac_tmp/subs1.awk" && _ACEOF @@ -8912,18 +9008,18 @@ _ACEOF echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && echo "_ACEOF" } >conf$$subs.sh || - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 -ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 +ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` ac_delim='%!_!# ' for ac_last_try in false false false false false :; do . ./conf$$subs.sh || - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` if test $ac_delim_n = $ac_delim_num; then break elif $ac_last_try; then - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -8931,7 +9027,7 @@ done rm -f conf$$subs.sh cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -cat >>"\$tmp/subs1.awk" <<\\_ACAWK && +cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && _ACEOF sed -n ' h @@ -8979,7 +9075,7 @@ t delim rm -f conf$$subs.awk cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 _ACAWK -cat >>"\$tmp/subs1.awk" <<_ACAWK && +cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && for (key in S) S_is_set[key] = 1 FS = "" @@ -9011,21 +9107,29 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" else cat -fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ - || as_fn_error "could not setup config files machinery" "$LINENO" 5 +fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ + || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 _ACEOF -# VPATH may cause trouble with some makes, so we remove $(srcdir), -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and +# VPATH may cause trouble with some makes, so we remove sole $(srcdir), +# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and # trailing colons and then remove the whole line if VPATH becomes empty # (actually we leave an empty line to preserve line numbers). if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=/{ -s/:*\$(srcdir):*/:/ -s/:*\${srcdir}:*/:/ -s/:*@srcdir@:*/:/ -s/^\([^=]*=[ ]*\):*/\1/ + ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ +h +s/// +s/^/:/ +s/[ ]*$/:/ +s/:\$(srcdir):/:/g +s/:\${srcdir}:/:/g +s/:@srcdir@:/:/g +s/^:*// s/:*$// +x +s/\(=[ ]*\).*/\1/ +G +s/\n// s/^[^=]*=[ ]*$// }' fi @@ -9037,7 +9141,7 @@ fi # test -n "$CONFIG_FILES" # No need to generate them if there are no CONFIG_HEADERS. # This happens for instance with `./config.status Makefile'. if test -n "$CONFIG_HEADERS"; then -cat >"$tmp/defines.awk" <<\_ACAWK || +cat >"$ac_tmp/defines.awk" <<\_ACAWK || BEGIN { _ACEOF @@ -9049,11 +9153,11 @@ _ACEOF # handling of long lines. ac_delim='%!_!# ' for ac_last_try in false false :; do - ac_t=`sed -n "/$ac_delim/p" confdefs.h` - if test -z "$ac_t"; then + ac_tt=`sed -n "/$ac_delim/p" confdefs.h` + if test -z "$ac_tt"; then break elif $ac_last_try; then - as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 + as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -9138,7 +9242,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 _ACAWK _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - as_fn_error "could not setup config headers machinery" "$LINENO" 5 + as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 fi # test -n "$CONFIG_HEADERS" @@ -9151,7 +9255,7 @@ do esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -9170,7 +9274,7 @@ do for ac_f do case $ac_f in - -) ac_f="$tmp/stdin";; + -) ac_f="$ac_tmp/stdin";; *) # Look for the file first in the build tree, then in the source tree # (if the path is not absolute). The absolute path cannot be DOS-style, # because $ac_f cannot contain `:'. @@ -9179,7 +9283,7 @@ do [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" @@ -9205,8 +9309,8 @@ $as_echo "$as_me: creating $ac_file" >&6;} esac case $ac_tag in - *:-:* | *:-) cat >"$tmp/stdin" \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; + *:-:* | *:-) cat >"$ac_tmp/stdin" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -9342,23 +9446,24 @@ s&@INSTALL@&$ac_INSTALL&;t t s&@MKDIR_P@&$ac_MKDIR_P&;t t $ac_datarootdir_hack " -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ + >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && - { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && + { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ + "$ac_tmp/out"`; test -z "$ac_out"; } && { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&5 +which seems to be undefined. Please make sure it is defined" >&5 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&2;} +which seems to be undefined. Please make sure it is defined" >&2;} - rm -f "$tmp/stdin" + rm -f "$ac_tmp/stdin" case $ac_file in - -) cat "$tmp/out" && rm -f "$tmp/out";; - *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; + -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; + *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; esac \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; :H) # @@ -9367,21 +9472,21 @@ which seems to be undefined. Please make sure it is defined." >&2;} if test x"$ac_file" != x-; then { $as_echo "/* $configure_input */" \ - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" - } >"$tmp/config.h" \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 - if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" + } >"$ac_tmp/config.h" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 $as_echo "$as_me: $ac_file is unchanged" >&6;} else rm -f "$ac_file" - mv "$tmp/config.h" "$ac_file" \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + mv "$ac_tmp/config.h" "$ac_file" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 fi else $as_echo "/* $configure_input */" \ - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ - || as_fn_error "could not create -" "$LINENO" 5 + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ + || as_fn_error $? "could not create -" "$LINENO" 5 fi # Compute "$ac_file"'s index in $config_headers. _am_arg="$ac_file" @@ -10108,7 +10213,7 @@ _ACEOF ac_clean_files=$ac_clean_files_save test $ac_write_fail = 0 || - as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 # configure is writing to config.log, and then calls config.status. @@ -10129,7 +10234,7 @@ if test "$no_create" != yes; then exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. - $ac_cs_success || as_fn_exit $? + $ac_cs_success || as_fn_exit 1 fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 diff --git a/configure.ac b/configure.ac index 2aae686..c0507a6 100644 --- a/configure.ac +++ b/configure.ac @@ -1,11 +1,12 @@ # Process this file with autoconf to produce a configure script. -# $Id: configure.ac 2353 2010-08-07 16:37:52Z peter $ # # autoconf setup # AC_PREREQ(2.53) -AC_INIT([yasm], [1.1.0], [bug-yasm@tortall.net]) +AC_INIT([yasm], + m4_esyscmd([./YASM-VERSION-GEN.sh && tr -d '\n' <YASM-VERSION-FILE]), + [bug-yasm@tortall.net]) #AC_CONFIG_SRCDIR([src/main.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config.h]) @@ -13,10 +14,6 @@ AC_CONFIG_HEADER([config.h]) AM_INIT_AUTOMAKE([1.9.6 foreign]) AM_MAINTAINER_MODE -AC_DEFINE(PACKAGE_INTVER, ["1.1.0"], - [Define to internal version of this package.]) -AC_DEFINE(PACKAGE_BUILD, ["2352"], [Define to build version of this package.]) - # # autoconf command-line options # diff --git a/libyasm/tests/Makefile.inc b/libyasm/tests/Makefile.inc index fc323f4..9c038a1 100644 --- a/libyasm/tests/Makefile.inc +++ b/libyasm/tests/Makefile.inc @@ -1,5 +1,3 @@ -# $Id: Makefile.inc 2233 2009-10-31 21:45:55Z peter $ - TESTS += bitvect_test TESTS += floatnum_test TESTS += leb128_test @@ -25,6 +23,8 @@ EXTRA_DIST += libyasm/tests/equ-expand.asm EXTRA_DIST += libyasm/tests/equ-expand.hex EXTRA_DIST += libyasm/tests/expr-fold-level.asm EXTRA_DIST += libyasm/tests/expr-fold-level.hex +EXTRA_DIST += libyasm/tests/expr-simplify-identity.asm +EXTRA_DIST += libyasm/tests/expr-simplify-identity.hex EXTRA_DIST += libyasm/tests/expr-wide-ident.asm EXTRA_DIST += libyasm/tests/expr-wide-ident.hex EXTRA_DIST += libyasm/tests/externdef.asm diff --git a/libyasm/tests/bitvect_test.c b/libyasm/tests/bitvect_test.c index cf0e504..f7b3413 100644 --- a/libyasm/tests/bitvect_test.c +++ b/libyasm/tests/bitvect_test.c @@ -1,4 +1,4 @@ -/* $Id: bitvect_test.c 1892 2007-07-13 20:56:28Z peter $ +/* * * Copyright (C) 2001-2007 Peter Johnson * diff --git a/libyasm/tests/combpath_test.c b/libyasm/tests/combpath_test.c index c674577..90f2e24 100644 --- a/libyasm/tests/combpath_test.c +++ b/libyasm/tests/combpath_test.c @@ -1,4 +1,4 @@ -/* $Id: combpath_test.c 1892 2007-07-13 20:56:28Z peter $ +/* * * Copyright (C) 2006-2007 Peter Johnson * diff --git a/libyasm/tests/floatnum_test.c b/libyasm/tests/floatnum_test.c index 082c566..30b8d6c 100644 --- a/libyasm/tests/floatnum_test.c +++ b/libyasm/tests/floatnum_test.c @@ -1,4 +1,4 @@ -/* $Id: floatnum_test.c 1892 2007-07-13 20:56:28Z peter $ +/* * * Copyright (C) 2001-2007 Peter Johnson * diff --git a/libyasm/tests/leb128_test.c b/libyasm/tests/leb128_test.c index 505136d..87fc8d9 100644 --- a/libyasm/tests/leb128_test.c +++ b/libyasm/tests/leb128_test.c @@ -1,4 +1,4 @@ -/* $Id: leb128_test.c 1892 2007-07-13 20:56:28Z peter $ +/* * * Copyright (C) 2005-2007 Peter Johnson * diff --git a/libyasm/tests/libyasm_test.sh b/libyasm/tests/libyasm_test.sh index 5cef56b..37f8717 100755 --- a/libyasm/tests/libyasm_test.sh +++ b/libyasm/tests/libyasm_test.sh @@ -1,4 +1,3 @@ #! /bin/sh -# $Id: libyasm_test.sh 1137 2004-09-04 01:24:57Z peter $ ${srcdir}/out_test.sh libyasm_test libyasm/tests "libyasm" "-f bin" "" exit $? diff --git a/libyasm/tests/splitpath_test.c b/libyasm/tests/splitpath_test.c index 03f27f4..7f873a4 100644 --- a/libyasm/tests/splitpath_test.c +++ b/libyasm/tests/splitpath_test.c @@ -1,4 +1,4 @@ -/* $Id: splitpath_test.c 1892 2007-07-13 20:56:28Z peter $ +/* * * Copyright (C) 2006-2007 Peter Johnson * diff --git a/libyasm/tests/uncstring_test.c b/libyasm/tests/uncstring_test.c index f8a818a..7303764 100644 --- a/libyasm/tests/uncstring_test.c +++ b/libyasm/tests/uncstring_test.c @@ -1,4 +1,4 @@ -/* $Id: uncstring_test.c 1892 2007-07-13 20:56:28Z peter $ +/* * * Copyright (C) 2006-2007 Peter Johnson * diff --git a/modules/objfmts/Makefile.inc b/modules/objfmts/Makefile.inc index 16a952d..a76359a 100644 --- a/modules/objfmts/Makefile.inc +++ b/modules/objfmts/Makefile.inc @@ -1,5 +1,3 @@ -# $Id: Makefile.inc 2269 2010-01-07 07:00:05Z peter $ - EXTRA_DIST += modules/objfmts/dbg/Makefile.inc EXTRA_DIST += modules/objfmts/bin/Makefile.inc EXTRA_DIST += modules/objfmts/elf/Makefile.inc diff --git a/modules/objfmts/elf/Makefile.inc b/modules/objfmts/elf/Makefile.inc index 626d463..659f867 100644 --- a/modules/objfmts/elf/Makefile.inc +++ b/modules/objfmts/elf/Makefile.inc @@ -1,5 +1,3 @@ -# $Id: Makefile.inc 1252 2005-09-28 05:50:51Z peter $ - libyasm_a_SOURCES += modules/objfmts/elf/elf.c libyasm_a_SOURCES += modules/objfmts/elf/elf.h libyasm_a_SOURCES += modules/objfmts/elf/elf-objfmt.c diff --git a/modules/objfmts/elf/tests/Makefile.inc b/modules/objfmts/elf/tests/Makefile.inc index dd839e8..e6d421c 100644 --- a/modules/objfmts/elf/tests/Makefile.inc +++ b/modules/objfmts/elf/tests/Makefile.inc @@ -1,5 +1,3 @@ -# $Id: Makefile.inc 2036 2008-02-09 04:06:47Z peter $ - TESTS += modules/objfmts/elf/tests/elf_test.sh EXTRA_DIST += modules/objfmts/elf/tests/elf_test.sh diff --git a/modules/objfmts/elf/tests/amd64/Makefile.inc b/modules/objfmts/elf/tests/amd64/Makefile.inc index cb26f08..deb54bc 100644 --- a/modules/objfmts/elf/tests/amd64/Makefile.inc +++ b/modules/objfmts/elf/tests/amd64/Makefile.inc @@ -1,5 +1,3 @@ -# $Id: Makefile.inc 2126 2008-10-03 08:13:00Z peter $ - TESTS += modules/objfmts/elf/tests/amd64/elf_amd64_test.sh EXTRA_DIST += modules/objfmts/elf/tests/amd64/elf_amd64_test.sh @@ -9,3 +7,5 @@ EXTRA_DIST += modules/objfmts/elf/tests/amd64/elfso64.asm EXTRA_DIST += modules/objfmts/elf/tests/amd64/elfso64.hex EXTRA_DIST += modules/objfmts/elf/tests/amd64/gotpcrel.asm EXTRA_DIST += modules/objfmts/elf/tests/amd64/gotpcrel.hex +EXTRA_DIST += modules/objfmts/elf/tests/amd64/multiplefixup.asm +EXTRA_DIST += modules/objfmts/elf/tests/amd64/multiplefixup.hex diff --git a/modules/objfmts/elf/tests/amd64/elf_amd64_test.sh b/modules/objfmts/elf/tests/amd64/elf_amd64_test.sh index df79975..1f48a32 100755 --- a/modules/objfmts/elf/tests/amd64/elf_amd64_test.sh +++ b/modules/objfmts/elf/tests/amd64/elf_amd64_test.sh @@ -1,4 +1,3 @@ #! /bin/sh -# $Id: elf_amd64_test.sh 1137 2004-09-04 01:24:57Z peter $ ${srcdir}/out_test.sh elf_amd64_test modules/objfmts/elf/tests/amd64 "elf-amd64 objfmt" "-m amd64 -f elf" ".o" exit $? diff --git a/modules/objfmts/elf/tests/elf-x86id.asm b/modules/objfmts/elf/tests/elf-x86id.asm index ceb838d..04b4a03 100644 --- a/modules/objfmts/elf/tests/elf-x86id.asm +++ b/modules/objfmts/elf/tests/elf-x86id.asm @@ -3,7 +3,7 @@ ;.file "x86id.c" ;#APP - ;.ident "$Id: elf-x86id.asm 2165 2009-01-02 08:15:58Z peter $" + ;.ident "$Id$" ;#NO_APP [extern yasm_internal_error_] [extern yasm_expr_copy] diff --git a/modules/objfmts/elf/tests/elf_test.sh b/modules/objfmts/elf/tests/elf_test.sh index 01bee5d..ed3766e 100755 --- a/modules/objfmts/elf/tests/elf_test.sh +++ b/modules/objfmts/elf/tests/elf_test.sh @@ -1,5 +1,4 @@ #! /bin/sh -# $Id: elf_test.sh 1137 2004-09-04 01:24:57Z peter $ # copied from yasm/modules/objfmts/coff/tests/coff_test.sh ; s/coff/elf/g ${srcdir}/out_test.sh elf_test modules/objfmts/elf/tests "elf objfmt" "-f elf" ".o" exit $? diff --git a/modules/objfmts/elf/tests/gas32/Makefile.inc b/modules/objfmts/elf/tests/gas32/Makefile.inc index 01d18cd..883c214 100644 --- a/modules/objfmts/elf/tests/gas32/Makefile.inc +++ b/modules/objfmts/elf/tests/gas32/Makefile.inc @@ -1,5 +1,3 @@ -# $Id: Makefile.inc 2206 2009-07-21 06:48:42Z peter $ - TESTS += modules/objfmts/elf/tests/gas32/elf_gas32_test.sh EXTRA_DIST += modules/objfmts/elf/tests/gas32/elf_gas32_test.sh diff --git a/modules/objfmts/elf/tests/gas32/elf_gas32_test.sh b/modules/objfmts/elf/tests/gas32/elf_gas32_test.sh index d7f93d1..4d34691 100755 --- a/modules/objfmts/elf/tests/gas32/elf_gas32_test.sh +++ b/modules/objfmts/elf/tests/gas32/elf_gas32_test.sh @@ -1,4 +1,3 @@ #! /bin/sh -# $Id: elf_gas32_test.sh 2036 2008-02-09 04:06:47Z peter $ ${srcdir}/out_test.sh elf_gas32_test modules/objfmts/elf/tests/gas32 "GAS elf-x86 objfmt" "-f elf32 -p gas" ".o" exit $? diff --git a/modules/objfmts/elf/tests/gas64/Makefile.inc b/modules/objfmts/elf/tests/gas64/Makefile.inc index 8cedf04..382744d 100644 --- a/modules/objfmts/elf/tests/gas64/Makefile.inc +++ b/modules/objfmts/elf/tests/gas64/Makefile.inc @@ -1,5 +1,3 @@ -# $Id: Makefile.inc 1168 2004-10-31 01:07:52Z peter $ - TESTS += modules/objfmts/elf/tests/gas64/elf_gas64_test.sh EXTRA_DIST += modules/objfmts/elf/tests/gas64/elf_gas64_test.sh diff --git a/modules/objfmts/elf/tests/gas64/elf_gas64_test.sh b/modules/objfmts/elf/tests/gas64/elf_gas64_test.sh index de90bc1..6696ba7 100755 --- a/modules/objfmts/elf/tests/gas64/elf_gas64_test.sh +++ b/modules/objfmts/elf/tests/gas64/elf_gas64_test.sh @@ -1,4 +1,3 @@ #! /bin/sh -# $Id: elf_amd64_test.sh 1137 2004-09-04 01:24:57Z peter $ ${srcdir}/out_test.sh elf_gas64_test modules/objfmts/elf/tests/gas64 "GAS elf-amd64 objfmt" "-f elf64 -p gas" ".o" exit $? diff --git a/modules/objfmts/win32/Makefile.inc b/modules/objfmts/win32/Makefile.inc index 606fd79..5b3b162 100644 --- a/modules/objfmts/win32/Makefile.inc +++ b/modules/objfmts/win32/Makefile.inc @@ -1,5 +1,3 @@ -# $Id: Makefile.inc 1183 2004-12-01 07:49:18Z peter $ - # Assume objfmt_coff is included YASM_MODULES += objfmt_win32 diff --git a/modules/objfmts/win32/tests/Makefile.inc b/modules/objfmts/win32/tests/Makefile.inc index a237a6f..3f2ab94 100644 --- a/modules/objfmts/win32/tests/Makefile.inc +++ b/modules/objfmts/win32/tests/Makefile.inc @@ -1,5 +1,3 @@ -# $Id: Makefile.inc 2166 2009-01-02 08:33:21Z peter $ - TESTS += modules/objfmts/win32/tests/win32_test.sh EXTRA_DIST += modules/objfmts/win32/tests/export.asm diff --git a/modules/objfmts/win32/tests/gas/Makefile.inc b/modules/objfmts/win32/tests/gas/Makefile.inc index e4c8106..f492cba 100644 --- a/modules/objfmts/win32/tests/gas/Makefile.inc +++ b/modules/objfmts/win32/tests/gas/Makefile.inc @@ -1,7 +1,9 @@ -# $Id: Makefile.inc 2166 2009-01-02 08:33:21Z peter $ - TESTS += modules/objfmts/win32/tests/gas/win32_gas_test.sh EXTRA_DIST += modules/objfmts/win32/tests/gas/win32_gas_test.sh EXTRA_DIST += modules/objfmts/win32/tests/gas/win32at.asm EXTRA_DIST += modules/objfmts/win32/tests/gas/win32at.hex +EXTRA_DIST += modules/objfmts/win32/tests/gas/win32def.asm +EXTRA_DIST += modules/objfmts/win32/tests/gas/win32def.hex +EXTRA_DIST += modules/objfmts/win32/tests/gas/win32secrel32.asm +EXTRA_DIST += modules/objfmts/win32/tests/gas/win32secrel32.hex diff --git a/modules/objfmts/win32/tests/gas/win32_gas_test.sh b/modules/objfmts/win32/tests/gas/win32_gas_test.sh index 26b1676..4a1bbe9 100755 --- a/modules/objfmts/win32/tests/gas/win32_gas_test.sh +++ b/modules/objfmts/win32/tests/gas/win32_gas_test.sh @@ -1,4 +1,3 @@ #! /bin/sh -# $Id: win32_gas_test.sh 2166 2009-01-02 08:33:21Z peter $ ${srcdir}/out_test.sh win32_gas_test modules/objfmts/win32/tests/gas "win32 objfmt" "-f win32 -p gas" ".obj" exit $? diff --git a/modules/objfmts/win32/tests/win32_test.sh b/modules/objfmts/win32/tests/win32_test.sh index b7adea3..6ffb349 100755 --- a/modules/objfmts/win32/tests/win32_test.sh +++ b/modules/objfmts/win32/tests/win32_test.sh @@ -1,4 +1,3 @@ #! /bin/sh -# $Id: win32_test.sh 1137 2004-09-04 01:24:57Z peter $ ${srcdir}/out_test.sh win32_test modules/objfmts/win32/tests "win32 objfmt" "-f win32" ".obj" exit $? diff --git a/modules/objfmts/xdf/Makefile.inc b/modules/objfmts/xdf/Makefile.inc index 4798b0c..ffdc68b 100644 --- a/modules/objfmts/xdf/Makefile.inc +++ b/modules/objfmts/xdf/Makefile.inc @@ -1,5 +1,3 @@ -# $Id: Makefile.inc 1183 2004-12-01 07:49:18Z peter $ - libyasm_a_SOURCES += modules/objfmts/xdf/xdf-objfmt.c YASM_MODULES += objfmt_xdf diff --git a/modules/objfmts/xdf/tests/Makefile.inc b/modules/objfmts/xdf/tests/Makefile.inc index c037789..c39ba30 100644 --- a/modules/objfmts/xdf/tests/Makefile.inc +++ b/modules/objfmts/xdf/tests/Makefile.inc @@ -1,5 +1,3 @@ -# $Id: Makefile.inc 1851 2007-05-26 17:56:36Z peter $ - TESTS += modules/objfmts/xdf/tests/xdf_test.sh EXTRA_DIST += modules/objfmts/xdf/tests/xdf_test.sh diff --git a/modules/objfmts/xdf/tests/xdf_test.sh b/modules/objfmts/xdf/tests/xdf_test.sh index 136991f..ee9d5d5 100755 --- a/modules/objfmts/xdf/tests/xdf_test.sh +++ b/modules/objfmts/xdf/tests/xdf_test.sh @@ -1,4 +1,3 @@ #! /bin/sh -# $Id: xdf_test.sh 1151 2004-09-29 03:36:52Z peter $ ${srcdir}/out_test.sh xdf_test modules/objfmts/xdf/tests "xdf objfmt" "-f xdf" ".xdf" exit $? diff --git a/modules/parsers/Makefile.inc b/modules/parsers/Makefile.inc index 993ce2e..b432fa9 100644 --- a/modules/parsers/Makefile.inc +++ b/modules/parsers/Makefile.inc @@ -1,5 +1,3 @@ -# $Id: Makefile.inc 2269 2010-01-07 07:00:05Z peter $ - EXTRA_DIST += modules/parsers/gas/Makefile.inc EXTRA_DIST += modules/parsers/nasm/Makefile.inc diff --git a/modules/parsers/gas/Makefile.inc b/modules/parsers/gas/Makefile.inc index 0336805..a0264cc 100644 --- a/modules/parsers/gas/Makefile.inc +++ b/modules/parsers/gas/Makefile.inc @@ -1,5 +1,3 @@ -# $Id: Makefile.inc 2279 2010-01-19 07:57:43Z peter $ - libyasm_a_SOURCES += modules/parsers/gas/gas-parser.c libyasm_a_SOURCES += modules/parsers/gas/gas-parser.h libyasm_a_SOURCES += modules/parsers/gas/gas-parse.c diff --git a/modules/parsers/gas/tests/Makefile.inc b/modules/parsers/gas/tests/Makefile.inc index f388516..c288adc 100644 --- a/modules/parsers/gas/tests/Makefile.inc +++ b/modules/parsers/gas/tests/Makefile.inc @@ -1,5 +1,3 @@ -# $Id: Makefile.inc 2169 2009-01-02 20:46:57Z peter $ - TESTS += modules/parsers/gas/tests/gas_test.sh EXTRA_DIST += modules/parsers/gas/tests/gas_test.sh diff --git a/modules/parsers/gas/tests/bin/Makefile.inc b/modules/parsers/gas/tests/bin/Makefile.inc index 39f12f0..5428d14 100644 --- a/modules/parsers/gas/tests/bin/Makefile.inc +++ b/modules/parsers/gas/tests/bin/Makefile.inc @@ -1,5 +1,3 @@ -# $Id$ - TESTS += modules/parsers/gas/tests/bin/gas_bin_test.sh EXTRA_DIST += modules/parsers/gas/tests/bin/gas_bin_test.sh @@ -14,6 +12,8 @@ EXTRA_DIST += modules/parsers/gas/tests/bin/gas-macro.asm EXTRA_DIST += modules/parsers/gas/tests/bin/gas-macro.hex EXTRA_DIST += modules/parsers/gas/tests/bin/gas-set.asm EXTRA_DIST += modules/parsers/gas/tests/bin/gas-set.hex +EXTRA_DIST += modules/parsers/gas/tests/bin/gas-str.asm +EXTRA_DIST += modules/parsers/gas/tests/bin/gas-str.hex EXTRA_DIST += modules/parsers/gas/tests/bin/rept-err.asm EXTRA_DIST += modules/parsers/gas/tests/bin/rept-err.errwarn EXTRA_DIST += modules/parsers/gas/tests/bin/reptempty.asm diff --git a/modules/parsers/gas/tests/bin/gas-set.asm b/modules/parsers/gas/tests/bin/gas-set.asm index 24f278f..6bce4a2 100644 --- a/modules/parsers/gas/tests/bin/gas-set.asm +++ b/modules/parsers/gas/tests/bin/gas-set.asm @@ -1,2 +1,34 @@ +.set bar,(foo-1) .set foo,5 -.byte foo +.byte foo /* 0x5 */ +.byte bar /* 0x4 */ +.set foo,6 +.byte foo /* 0x6 */ +.byte bar /* 0x4 */ +.set bar,10 +.byte bar /* 0xa */ +.set bar,foo+1 +.byte bar /* 0x7 */ +.set bar,bar+1 +.byte bar /* 0x8 */ +.set bar,5 +.set bam,bar-1 +.set bar,1 +.byte bam /* 0x4 */ +.set bar, boo + 1 +.set boo, 5 +.set boo, 6 +.byte bar /* 0x6 */ +.set a, b+c +.set b, 0x1 +.set b, 0x2 +.set c, 0x10 +.set c, 0x20 +.byte a /* 0x11 */ +.set x, 5 +.set y, x+z +.set x, 10 +.set z, 1 +.byte y /* 0x6 */ +.set z, 0xfe +.byte z /* 0xfe */ diff --git a/modules/parsers/gas/tests/bin/gas-set.hex b/modules/parsers/gas/tests/bin/gas-set.hex index f62fa93..54ccb30 100644 --- a/modules/parsers/gas/tests/bin/gas-set.hex +++ b/modules/parsers/gas/tests/bin/gas-set.hex @@ -1 +1,12 @@ 05 +04 +06 +04 +0a +07 +08 +04 +06 +11 +06 +fe diff --git a/modules/parsers/gas/tests/bin/gas_bin_test.sh b/modules/parsers/gas/tests/bin/gas_bin_test.sh index f0c83e9..aa35a4e 100755 --- a/modules/parsers/gas/tests/bin/gas_bin_test.sh +++ b/modules/parsers/gas/tests/bin/gas_bin_test.sh @@ -1,4 +1,3 @@ #! /bin/sh -# $Id$ ${srcdir}/out_test.sh gas_bin_test modules/parsers/gas/tests/bin "gas-compat parser bin output" "-f bin -p gas" "" exit $? diff --git a/modules/parsers/gas/tests/gas_test.sh b/modules/parsers/gas/tests/gas_test.sh index 55edb03..f39d4d1 100755 --- a/modules/parsers/gas/tests/gas_test.sh +++ b/modules/parsers/gas/tests/gas_test.sh @@ -1,4 +1,3 @@ #! /bin/sh -# $Id: gas_test.sh 1239 2005-09-25 04:25:26Z peter $ ${srcdir}/out_test.sh gas_test modules/parsers/gas/tests "gas-compat parser" "-f elf -p gas" ".o" exit $? diff --git a/modules/parsers/nasm/Makefile.inc b/modules/parsers/nasm/Makefile.inc index 1b3a5f2..ed58bb6 100644 --- a/modules/parsers/nasm/Makefile.inc +++ b/modules/parsers/nasm/Makefile.inc @@ -1,5 +1,3 @@ -# $Id: Makefile.inc 2278 2010-01-19 07:28:08Z peter $ - libyasm_a_SOURCES += modules/parsers/nasm/nasm-parser.c libyasm_a_SOURCES += modules/parsers/nasm/nasm-parser.h libyasm_a_SOURCES += modules/parsers/nasm/nasm-parser-struct.h diff --git a/modules/parsers/nasm/tests/Makefile.inc b/modules/parsers/nasm/tests/Makefile.inc index a8e96c8..56d0b92 100644 --- a/modules/parsers/nasm/tests/Makefile.inc +++ b/modules/parsers/nasm/tests/Makefile.inc @@ -1,5 +1,3 @@ -# $Id: Makefile.inc 2323 2010-05-16 03:37:00Z peter $ - TESTS += modules/parsers/nasm/tests/nasm_test.sh EXTRA_DIST += modules/parsers/nasm/tests/nasm_test.sh @@ -41,6 +39,8 @@ EXTRA_DIST += modules/parsers/nasm/tests/strucalign.asm EXTRA_DIST += modules/parsers/nasm/tests/strucalign.hex EXTRA_DIST += modules/parsers/nasm/tests/struczero.asm EXTRA_DIST += modules/parsers/nasm/tests/struczero.hex +EXTRA_DIST += modules/parsers/nasm/tests/strucbase.asm +EXTRA_DIST += modules/parsers/nasm/tests/strucbase.hex EXTRA_DIST += modules/parsers/nasm/tests/syntax-err.asm EXTRA_DIST += modules/parsers/nasm/tests/syntax-err.errwarn EXTRA_DIST += modules/parsers/nasm/tests/uscore.asm diff --git a/modules/parsers/nasm/tests/nasm_test.sh b/modules/parsers/nasm/tests/nasm_test.sh index 55faaf1..0ff39b6 100755 --- a/modules/parsers/nasm/tests/nasm_test.sh +++ b/modules/parsers/nasm/tests/nasm_test.sh @@ -1,4 +1,3 @@ #! /bin/sh -# $Id: nasm_test.sh 1137 2004-09-04 01:24:57Z peter $ ${srcdir}/out_test.sh nasm_test modules/parsers/nasm/tests "nasm-compat parser" "-f bin" "" exit $? diff --git a/modules/parsers/nasm/tests/worphan/Makefile.inc b/modules/parsers/nasm/tests/worphan/Makefile.inc index f00da6e..f55b93d 100644 --- a/modules/parsers/nasm/tests/worphan/Makefile.inc +++ b/modules/parsers/nasm/tests/worphan/Makefile.inc @@ -1,5 +1,3 @@ -# $Id: Makefile.inc 1137 2004-09-04 01:24:57Z peter $ - TESTS += modules/parsers/nasm/tests/worphan/nasm_worphan_test.sh EXTRA_DIST += modules/parsers/nasm/tests/worphan/nasm_worphan_test.sh diff --git a/modules/parsers/nasm/tests/worphan/nasm_worphan_test.sh b/modules/parsers/nasm/tests/worphan/nasm_worphan_test.sh index a3d8dbf..ebb6bcd 100755 --- a/modules/parsers/nasm/tests/worphan/nasm_worphan_test.sh +++ b/modules/parsers/nasm/tests/worphan/nasm_worphan_test.sh @@ -1,4 +1,3 @@ #! /bin/sh -# $Id: nasm_worphan_test.sh 1137 2004-09-04 01:24:57Z peter $ ${srcdir}/out_test.sh nasm_test modules/parsers/nasm/tests/worphan "nasm-compat parser" "-Worphan-labels -f bin" "" exit $? diff --git a/modules/parsers/tasm/Makefile.inc b/modules/parsers/tasm/Makefile.inc index e758958..bf49f71 100644 --- a/modules/parsers/tasm/Makefile.inc +++ b/modules/parsers/tasm/Makefile.inc @@ -1,5 +1,3 @@ -# $Id: Makefile.inc 2082 2008-05-09 06:46:02Z peter $ - EXTRA_DIST += modules/parsers/tasm/tests/Makefile.inc include modules/parsers/tasm/tests/Makefile.inc diff --git a/modules/parsers/tasm/tests/Makefile.inc b/modules/parsers/tasm/tests/Makefile.inc index 1af4dea..d37e1e6 100644 --- a/modules/parsers/tasm/tests/Makefile.inc +++ b/modules/parsers/tasm/tests/Makefile.inc @@ -1,5 +1,3 @@ -# $Id: Makefile.inc 2063 2008-04-12 08:30:22Z peter $ - TESTS += modules/parsers/tasm/tests/tasm_test.sh EXTRA_DIST += modules/parsers/tasm/tests/tasm_test.sh diff --git a/modules/parsers/tasm/tests/exe/Makefile.inc b/modules/parsers/tasm/tests/exe/Makefile.inc index faed7f5..117012c 100644 --- a/modules/parsers/tasm/tests/exe/Makefile.inc +++ b/modules/parsers/tasm/tests/exe/Makefile.inc @@ -1,5 +1,3 @@ -# $Id: Makefile.inc 2063 2008-04-12 08:30:22Z peter $ - TESTS += modules/parsers/tasm/tests/exe/tasm_exe_test.sh EXTRA_DIST += modules/parsers/tasm/tests/exe/tasm_exe_test.sh diff --git a/modules/parsers/tasm/tests/exe/tasm_exe_test.sh b/modules/parsers/tasm/tests/exe/tasm_exe_test.sh index 47645e3..15fdd55 100755 --- a/modules/parsers/tasm/tests/exe/tasm_exe_test.sh +++ b/modules/parsers/tasm/tests/exe/tasm_exe_test.sh @@ -1,4 +1,3 @@ #! /bin/sh -# $Id: tasm_test.sh 1137 2004-09-04 01:24:57Z peter $ ${srcdir}/out_test.sh tasm_test modules/parsers/tasm/tests/exe "tasm-compat parser" "-f dosexe -p tasm" "" exit $? diff --git a/modules/parsers/tasm/tests/tasm_test.sh b/modules/parsers/tasm/tests/tasm_test.sh index 531e03e..35ef736 100755 --- a/modules/parsers/tasm/tests/tasm_test.sh +++ b/modules/parsers/tasm/tests/tasm_test.sh @@ -1,4 +1,3 @@ #! /bin/sh -# $Id: tasm_test.sh 1137 2004-09-04 01:24:57Z peter $ ${srcdir}/out_test.sh tasm_test modules/parsers/tasm/tests "tasm-compat parser" "-f bin -p tasm" "" exit $? diff --git a/modules/parsers/yasm_parsers.xml b/modules/parsers/yasm_parsers.xml index 18f0e95..28aa2e2 100644 --- a/modules/parsers/yasm_parsers.xml +++ b/modules/parsers/yasm_parsers.xml @@ -2,8 +2,6 @@ <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"> -<!-- $Id: yasm_parsers.xml 2286 2010-02-13 07:25:23Z peter $ --> - <refentry id="yasm_parsers"> <refentryinfo> diff --git a/out_test.sh b/out_test.sh index 65ce97c..b9698e5 100755 --- a/out_test.sh +++ b/out_test.sh @@ -1,5 +1,4 @@ #! /bin/sh -# $Id: out_test.sh 2226 2009-07-30 02:19:38Z peter $ YASM_TEST_SUITE=1 export YASM_TEST_SUITE diff --git a/tools/python-yasm/Makefile.inc b/tools/python-yasm/Makefile.inc index 2f21355..fce135b 100644 --- a/tools/python-yasm/Makefile.inc +++ b/tools/python-yasm/Makefile.inc @@ -1,5 +1,3 @@ -# $Id: Makefile.inc 2256 2010-01-01 20:55:07Z peter $ - PYBINDING_DEPS = tools/python-yasm/bytecode.pxi PYBINDING_DEPS += tools/python-yasm/errwarn.pxi PYBINDING_DEPS += tools/python-yasm/expr.pxi diff --git a/tools/python-yasm/tests/Makefile.inc b/tools/python-yasm/tests/Makefile.inc index b69f3b2..c6df22c 100644 --- a/tools/python-yasm/tests/Makefile.inc +++ b/tools/python-yasm/tests/Makefile.inc @@ -1,5 +1,3 @@ -# $Id: Makefile.inc 1951 2007-09-14 05:19:10Z peter $ - EXTRA_DIST += tools/python-yasm/tests/python_test.sh EXTRA_DIST += tools/python-yasm/tests/__init__.py EXTRA_DIST += tools/python-yasm/tests/test_bytecode.py diff --git a/tools/python-yasm/tests/__init__.py b/tools/python-yasm/tests/__init__.py index 97ddae0..f5afb30 100644 --- a/tools/python-yasm/tests/__init__.py +++ b/tools/python-yasm/tests/__init__.py @@ -1,6 +1,5 @@ # Test wrapper from Quod Libet # http://www.sacredchao.net/quodlibet/ -# $Id: __init__.py 1527 2006-05-07 16:41:16Z mu $ import unittest, sys suites = [] add = registerCase = suites.append diff --git a/tools/python-yasm/tests/python_test.sh b/tools/python-yasm/tests/python_test.sh index 351298e..18e7a69 100755 --- a/tools/python-yasm/tests/python_test.sh +++ b/tools/python-yasm/tests/python_test.sh @@ -1,7 +1,6 @@ #!/bin/sh # Based on _sanity.sh from Quod Libet # http://www.sacredchao.net/quodlibet/ -# $Id: python_test.sh 1502 2006-04-17 03:53:04Z peter $ set -e diff --git a/tools/python-yasm/tests/test_bytecode.py b/tools/python-yasm/tests/test_bytecode.py index a8f6447..eb0e96d 100644 --- a/tools/python-yasm/tests/test_bytecode.py +++ b/tools/python-yasm/tests/test_bytecode.py @@ -1,4 +1,3 @@ -# $Id: test_bytecode.py 1740 2007-01-21 22:01:34Z peter $ from tests import TestCase, add from yasm import Bytecode, Expression diff --git a/tools/python-yasm/tests/test_expr.py b/tools/python-yasm/tests/test_expr.py index a47caf7..97b021c 100644 --- a/tools/python-yasm/tests/test_expr.py +++ b/tools/python-yasm/tests/test_expr.py @@ -1,4 +1,3 @@ -# $Id: test_expr.py 1527 2006-05-07 16:41:16Z mu $ from tests import TestCase, add from yasm import Expression import operator diff --git a/tools/python-yasm/tests/test_intnum.py b/tools/python-yasm/tests/test_intnum.py index d312381..a222018 100644 --- a/tools/python-yasm/tests/test_intnum.py +++ b/tools/python-yasm/tests/test_intnum.py @@ -1,4 +1,3 @@ -# $Id: test_intnum.py 1739 2007-01-20 19:37:02Z peter $ from tests import TestCase, add from yasm import IntNum diff --git a/tools/python-yasm/tests/test_symrec.py b/tools/python-yasm/tests/test_symrec.py index 7ec4acf..a575b19 100644 --- a/tools/python-yasm/tests/test_symrec.py +++ b/tools/python-yasm/tests/test_symrec.py @@ -1,4 +1,3 @@ -# $Id: test_symrec.py 1527 2006-05-07 16:41:16Z mu $ from tests import TestCase, add from yasm import SymbolTable, Expression, YasmError diff --git a/tools/python-yasm/yasm.pyx b/tools/python-yasm/yasm.pyx index f9c6ee4..adbc734 100644 --- a/tools/python-yasm/yasm.pyx +++ b/tools/python-yasm/yasm.pyx @@ -97,7 +97,7 @@ cdef void *__get_voidp(object obj, object forclass) except NULL: # cdef class __assoc_data_callback: cdef yasm_assoc_data_callback *cb - def __new__(self, destroy, print_): + def __cinit__(self, destroy, print_): self.cb = <yasm_assoc_data_callback *>malloc(sizeof(yasm_assoc_data_callback)) self.cb.destroy = <void (*) (void *)>PyCObject_AsVoidPtr(destroy) #self.cb.print_ = <void (*) (void *, FILE *, int)>PyCObject_AsVoidPtr(print_) @@ -107,7 +107,7 @@ cdef class __assoc_data_callback: cdef class Register: cdef unsigned long reg - def __new__(self, reg): + def __cinit__(self, reg): self.reg = reg include "errwarn.pxi" @@ -1,47 +1,55 @@ +'\" t .\" Title: yasm .\" Author: Peter Johnson <peter@tortall.net> -.\" Generator: DocBook XSL Stylesheets v1.71.1 <http://docbook.sf.net/> +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> .\" Date: April 2007 .\" Manual: The Yasm Modular Assembler .\" Source: Yasm +.\" Language: English .\" .TH "YASM" "1" "April 2007" "Yasm" "The Yasm Modular Assembler" +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) .ad l +.\" ----------------------------------------------------------------- +.\" * MAIN CONTENT STARTS HERE * +.\" ----------------------------------------------------------------- .SH "NAME" yasm \- The Yasm Modular Assembler .SH "SYNOPSIS" -.HP 5 +.HP \w'\fByasm\fR\ 'u \fByasm\fR [\fB\-f\ \fR\fB\fIformat\fR\fR] [\fB\-o\ \fR\fB\fIoutfile\fR\fR] [\fB\fIother\ options\fR\fR...] {\fIinfile\fR} -.HP 5 +.HP \w'\fByasm\fR\ 'u \fByasm\fR \fB\-h\fR .SH "DESCRIPTION" .PP The Yasm Modular Assembler is a portable, retargetable assembler written under the \(lqnew\(rq -(2 or 3 clause) BSD license. Yasm currently supports the x86 and AMD64 instruction sets, accepts NASM and GAS assembler syntaxes, outputs binary, ELF32, ELF64, COFF, Win32, and Win64 object formats, and generates source debugging information in STABS, DWARF 2, and CodeView 8 formats. +(2 or 3 clause) BSD license\&. Yasm currently supports the x86 and AMD64 instruction sets, accepts NASM and GAS assembler syntaxes, outputs binary, ELF32, ELF64, COFF, Win32, and Win64 object formats, and generates source debugging information in STABS, DWARF 2, and CodeView 8 formats\&. .PP YASM consists of the \fByasm\fR -command, libyasm, the core backend library, and a large number of modules. Currently, libyasm and the loadable modules are statically built into the +command, libyasm, the core backend library, and a large number of modules\&. Currently, libyasm and the loadable modules are statically built into the \fByasm\fR -executable. +executable\&. .PP The \fByasm\fR command assembles the file infile and directs output to the file \fIoutfile\fR -if specified. If +if specified\&. If \fIoutfile\fR is not specified, \fByasm\fR will derive a default output file name from the name of its input file, usually by appending -\fI.o\fR +\&.o or -\fI.obj\fR, or by removing all extensions for a raw binary file. Failing that, the output file name will be -\fIyasm.out\fR. +\&.obj, or by removing all extensions for a raw binary file\&. Failing that, the output file name will be +yasm\&.out\&. .PP If called with an \fIinfile\fR @@ -50,115 +58,115 @@ of \fByasm\fR assembles the standard input and directs output to the file \fIoutfile\fR, or -\fIyasm.out\fR +yasm\&.out if no \fIoutfile\fR -is specified. +is specified\&. .SH "OPTIONS" .PP -Many options may be given in one of two forms: either a dash followed by a single letter, or two dashes followed by a long option name. Options are listed in alphabetical order. +Many options may be given in one of two forms: either a dash followed by a single letter, or two dashes followed by a long option name\&. Options are listed in alphabetical order\&. .SS "General Options" .PP \fB\-a \fR\fB\fIarch\fR\fR or \fB\-\-arch=\fR\fB\fIarch\fR\fR: Select target architecture .RS 4 -Selects the target architecture. The default architecture is -\(lqx86\(rq, which supports both the IA\-32 and derivatives and AMD64 instruction sets. To print a list of available architectures to standard output, use +Selects the target architecture\&. The default architecture is +\(lqx86\(rq, which supports both the IA\-32 and derivatives and AMD64 instruction sets\&. To print a list of available architectures to standard output, use \(lqhelp\(rq as -\fIarch\fR. See +\fIarch\fR\&. See \fByasm_arch\fR(7) -for a list of supported architectures. +for a list of supported architectures\&. .RE .PP \fB\-f \fR\fB\fIformat\fR\fR or \fB\-\-oformat=\fR\fB\fIformat\fR\fR: Select object format .RS 4 -Selects the output object format. The default object format is -\(lqbin\(rq, which is a flat format binary with no relocation. To print a list of available object formats to standard output, use +Selects the output object format\&. The default object format is +\(lqbin\(rq, which is a flat format binary with no relocation\&. To print a list of available object formats to standard output, use \(lqhelp\(rq as -\fIformat\fR. See +\fIformat\fR\&. See \fByasm_objfmts\fR(7) -for a list of supported object formats. +for a list of supported object formats\&. .RE .PP \fB\-g \fR\fB\fIdebug\fR\fR or \fB\-\-dformat=\fR\fB\fIdebug\fR\fR: Select debugging format .RS 4 -Selects the debugging format for debug information. Debugging information can be used by a debugger to associate executable code back to the source file or get data structure and type information. Available debug formats vary between different object formats; +Selects the debugging format for debug information\&. Debugging information can be used by a debugger to associate executable code back to the source file or get data structure and type information\&. Available debug formats vary between different object formats; \fByasm\fR -will error when an invalid combination is selected. The default object format is selected by the object format. To print a list of available debugging formats to standard output, use +will error when an invalid combination is selected\&. The default object format is selected by the object format\&. To print a list of available debugging formats to standard output, use \(lqhelp\(rq as -\fIdebug\fR. See +\fIdebug\fR\&. See \fByasm_dbgfmts\fR(7) -for a list of supported debugging formats. -.RE -.PP -\fB\-h\fR or \fB\-\-help\fR: Print a summary of options -.RS 4 -Prints a summary of invocation options. All other options are ignored, and no output file is generated. +for a list of supported debugging formats\&. .RE .PP \fB\-L \fR\fB\fIlist\fR\fR or \fB\-\-lformat=\fR\fB\fIlist\fR\fR: Select list file format .RS 4 -Selects the format/style of the output list file. List files typically intermix the original source with the machine code generated by the assembler. The default list format is -\(lqnasm\(rq, which mimics the NASM list file format. To print a list of available list file formats to standard output, use +Selects the format/style of the output list file\&. List files typically intermix the original source with the machine code generated by the assembler\&. The default list format is +\(lqnasm\(rq, which mimics the NASM list file format\&. To print a list of available list file formats to standard output, use \(lqhelp\(rq as -\fIlist\fR. +\fIlist\fR\&. .RE .PP \fB\-l \fR\fB\fIlistfile\fR\fR or \fB\-\-list=\fR\fB\fIlistfile\fR\fR: Specify list filename .RS 4 -Specifies the name of the output list file. If this option is not used, no list file is generated. +Specifies the name of the output list file\&. If this option is not used, no list file is generated\&. .RE .PP \fB\-m \fR\fB\fImachine\fR\fR or \fB\-\-machine=\fR\fB\fImachine\fR\fR: Select target machine architecture .RS 4 -Selects the target machine architecture. Essentially a subtype of the selected architecture, the machine type selects between major subsets of an architecture. For example, for the +Selects the target machine architecture\&. Essentially a subtype of the selected architecture, the machine type selects between major subsets of an architecture\&. For example, for the \(lqx86\(rq architecture, the two available machines are \(lqx86\(rq, which is used for the IA\-32 and derivative 32\-bit instruction set, and -\(lqamd64\(rq, which is used for the 64\-bit instruction set. This differentiation is required to generate the proper object file for relocatable object formats such as COFF and ELF. To print a list of available machines for a given architecture to standard output, use +\(lqamd64\(rq, which is used for the 64\-bit instruction set\&. This differentiation is required to generate the proper object file for relocatable object formats such as COFF and ELF\&. To print a list of available machines for a given architecture to standard output, use \(lqhelp\(rq as \fImachine\fR and the given architecture using -\fB\-a \fR\fB\fIarch\fR\fR. See +\fB\-a \fR\fB\fIarch\fR\fR\&. See \fByasm_arch\fR(7) -for more details. +for more details\&. .RE .PP \fB\-o \fR\fB\fIfilename\fR\fR or \fB\-\-objfile=\fR\fB\fIfilename\fR\fR: Specify object filename .RS 4 -Specifies the name of the output file, overriding any default name generated by Yasm. +Specifies the name of the output file, overriding any default name generated by Yasm\&. .RE .PP \fB\-p \fR\fB\fIparser\fR\fR or \fB\-\-parser=\fR\fB\fIparser\fR\fR: Select parser .RS 4 -Selects the parser (the assembler syntax). The default parser is -\(lqnasm\(rq, which emulates the syntax of NASM, the Netwide Assembler. Another available parser is -\(lqgas\(rq, which emulates the syntax of GNU AS. To print a list of available parsers to standard output, use +Selects the parser (the assembler syntax)\&. The default parser is +\(lqnasm\(rq, which emulates the syntax of NASM, the Netwide Assembler\&. Another available parser is +\(lqgas\(rq, which emulates the syntax of GNU AS\&. To print a list of available parsers to standard output, use \(lqhelp\(rq as -\fIparser\fR. See +\fIparser\fR\&. See \fByasm_parsers\fR(7) -for a list of supported parsers. +for a list of supported parsers\&. .RE .PP \fB\-r \fR\fB\fIpreproc\fR\fR or \fB\-\-preproc=\fR\fB\fIpreproc\fR\fR: Select preprocessor .RS 4 -Selects the preprocessor to use on the input file before passing it to the parser. Preprocessors often provide macro functionality that is not included in the main parser. The default preprocessor is -\(lqnasm\(rq, which is an imported version of the actual NASM preprocessor. A +Selects the preprocessor to use on the input file before passing it to the parser\&. Preprocessors often provide macro functionality that is not included in the main parser\&. The default preprocessor is +\(lqnasm\(rq, which is an imported version of the actual NASM preprocessor\&. A \(lqraw\(rq -preprocessor is also available, which simply skips the preprocessing step, passing the input file directly to the parser. To print a list of available preprocessors to standard output, use +preprocessor is also available, which simply skips the preprocessing step, passing the input file directly to the parser\&. To print a list of available preprocessors to standard output, use \(lqhelp\(rq as -\fIpreproc\fR. +\fIpreproc\fR\&. +.RE +.PP +\fB\-h\fR or \fB\-\-help\fR: Print a summary of options +.RS 4 +Prints a summary of invocation options\&. All other options are ignored, and no output file is generated\&. .RE .PP \fB\-\-version\fR: Get the Yasm version .RS 4 -This option causes Yasm to prints the version number of Yasm as well as a license summary to standard output. All other options are ignored, and no output file is generated. +This option causes Yasm to prints the version number of Yasm as well as a license summary to standard output\&. All other options are ignored, and no output file is generated\&. .RE .SS "Warning Options" .PP @@ -166,71 +174,71 @@ This option causes Yasm to prints the version number of Yasm as well as a licens options have two contrary forms: \fB\-W\fR\fB\fIname\fR\fR and -\fB\-Wno\-\fR\fB\fIname\fR\fR. Only the non\-default forms are shown here. +\fB\-Wno\-\fR\fB\fIname\fR\fR\&. Only the non\-default forms are shown here\&. .PP The warning options are handled in the order given on the command line, so if \fB\-w\fR is followed by \fB\-Worphan\-labels\fR, all warnings are turned off \fIexcept\fR -for orphan\-labels. +for orphan\-labels\&. .PP \fB\-w\fR: Inhibit all warning messages .RS 4 -This option causes Yasm to inhibit all warning messages. As discussed above, this option may be followed by other options to re\-enable specified warnings. +This option causes Yasm to inhibit all warning messages\&. As discussed above, this option may be followed by other options to re\-enable specified warnings\&. .RE .PP \fB\-Werror\fR: Treat warnings as errors .RS 4 -This option causes Yasm to treat all warnings as errors. Normally warnings do not prevent an object file from being generated and do not result in a failure exit status from -\fByasm\fR, whereas errors do. This option makes warnings equivalent to errors in terms of this behavior. +This option causes Yasm to treat all warnings as errors\&. Normally warnings do not prevent an object file from being generated and do not result in a failure exit status from +\fByasm\fR, whereas errors do\&. This option makes warnings equivalent to errors in terms of this behavior\&. .RE .PP \fB\-Wno\-unrecognized\-char\fR: Do not warn on unrecognized input characters .RS 4 -Causes Yasm to not warn on unrecognized characters found in the input. Normally Yasm will generate a warning for any non\-ASCII character found in the input file. +Causes Yasm to not warn on unrecognized characters found in the input\&. Normally Yasm will generate a warning for any non\-ASCII character found in the input file\&. .RE .PP \fB\-Worphan\-labels\fR: Warn on labels lacking a trailing option .RS 4 -When using the NASM\-compatible parser, causes Yasm to warn about labels found alone on a line without a trailing colon. While these are legal labels in NASM syntax, they may be unintentional, due to typos or macro definition ordering. +When using the NASM\-compatible parser, causes Yasm to warn about labels found alone on a line without a trailing colon\&. While these are legal labels in NASM syntax, they may be unintentional, due to typos or macro definition ordering\&. .RE .PP \fB\-X \fR\fB\fIstyle\fR\fR: Change error/warning reporting style .RS 4 -Selects a specific output style for error and warning messages. The default is +Selects a specific output style for error and warning messages\&. The default is \(lqgnu\(rq style, which mimics the output of -\fBgcc\fR. The +\fBgcc\fR\&. The \(lqvc\(rq -style is also available, which mimics the output of Microsoft's Visual C++ compiler. +style is also available, which mimics the output of Microsoft\'s Visual C++ compiler\&. .sp This option is available so that Yasm integrates more naturally into IDE environments such as Visual Studio or -Emacs, allowing the IDE to correctly recognize the error/warning message as such and link back to the offending line of source code. +Emacs, allowing the IDE to correctly recognize the error/warning message as such and link back to the offending line of source code\&. .RE .SS "Preprocessor Options" .PP While these preprocessor options theoretically will affect any preprocessor, the only preprocessor currently in Yasm is the \(lqnasm\(rq -preprocessor. +preprocessor\&. .PP \fB\-D \fR\fB\fImacro[=value]\fR\fR: Pre\-define a macro .RS 4 -Pre\-defines a single\-line macro. The value is optional (if no value is given, the macro is still defined, but to an empty value). +Pre\-defines a single\-line macro\&. The value is optional (if no value is given, the macro is still defined, but to an empty value)\&. .RE .PP \fB\-e\fR or \fB\-\-preproc\-only\fR: Only preprocess .RS 4 -Stops assembly after the preprocessing stage; preprocessed output is sent to the specified output name or, if no output name is specified, the standard output. No object file is produced. +Stops assembly after the preprocessing stage; preprocessed output is sent to the specified output name or, if no output name is specified, the standard output\&. No object file is produced\&. .RE .PP \fB\-I \fR\fB\fIpath\fR\fR: Add include file path .RS 4 Adds directory \fIpath\fR -to the search path for include files. The search path defaults to only including the directory in which the source file resides. +to the search path for include files\&. The search path defaults to only including the directory in which the source file resides\&. .RE .PP \fB\-P \fR\fB\fIfilename\fR\fR: Pre\-include a file @@ -238,65 +246,77 @@ to the search path for include files. The search path defaults to only including Pre\-includes file \fIfilename\fR, making it look as though \fIfilename\fR -was prepended to the input. Can be useful for prepending multi\-line macros that the +was prepended to the input\&. Can be useful for prepending multi\-line macros that the \fB\-D\fR -can't support. +can\'t support\&. .RE .PP \fB\-U \fR\fB\fImacro\fR\fR: Undefine a macro .RS 4 Undefines a single\-line macro (may be either a built\-in macro or one defined earlier in the command line with -\fB\-D\fR. +\fB\-D\fR\&. .RE .SH "EXAMPLES" .PP To assemble NASM syntax, 32\-bit x86 source -\fIsource.asm\fR +source\&.asm into ELF file -\fIsource.o\fR, warning on orphan labels: +source\&.o, warning on orphan labels: .sp +.if n \{\ .RS 4 +.\} .nf -yasm \-f elf32 \-Worphan\-labels source.asm +yasm \-f elf32 \-Worphan\-labels source\&.asm .fi +.if n \{\ .RE +.\} .PP To assemble NASM syntax AMD64 source -\fIx.asm\fR +x\&.asm into Win64 file -\fIobject.obj\fR: +object\&.obj: .sp +.if n \{\ .RS 4 +.\} .nf -yasm \-f win64 \-o object.obj x.asm +yasm \-f win64 \-o object\&.obj x\&.asm .fi +.if n \{\ .RE +.\} .PP To assemble already preprocessed NASM syntax x86 source -\fIy.asm\fR +y\&.asm into flat binary file -\fIy.com\fR: +y\&.com: .sp +.if n \{\ .RS 4 +.\} .nf -yasm \-f bin \-r raw \-o y.com y.asm +yasm \-f bin \-r raw \-o y\&.com y\&.asm .fi +.if n \{\ .RE +.\} .SH "DIAGNOSTICS" .PP The \fByasm\fR -command exits 0 on success, and nonzero if an error occurs. +command exits 0 on success, and nonzero if an error occurs\&. .SH "COMPATIBILITY" .PP -Yasm's NASM parser and preprocessor, while they strive to be as compatible as possible with NASM, have a few incompatibilities due to YASM's different internal structure. +Yasm\'s NASM parser and preprocessor, while they strive to be as compatible as possible with NASM, have a few incompatibilities due to YASM\'s different internal structure\&. .PP -Yasm's GAS parser and preprocessor are missing a number of features present in GNU AS. +Yasm\'s GAS parser and preprocessor are missing a number of features present in GNU AS\&. .SH "RESTRICTIONS" .PP -As object files are often architecture and machine dependent, not all combinations of object formats, architectures, and machines are legal; trying to use an invalid combination will result in an error. +As object files are often architecture and machine dependent, not all combinations of object formats, architectures, and machines are legal; trying to use an invalid combination will result in an error\&. .PP -There is no support for symbol maps. +There is no support for symbol maps\&. .SH "SEE ALSO" .PP \fByasm_arch\fR(7), @@ -316,14 +336,14 @@ architecture, it is overly easy to generate AMD64 code (using the \fBBITS 64\fR directive) and generate a 32\-bit object file (by failing to specify \fB\-m amd64\fR -or selecting a 64\-bit object format such as ELF64 on the command line). +or selecting a 64\-bit object format such as ELF64 on the command line)\&. .SH "AUTHOR" .PP -\fBPeter Johnson\fR <\&peter@tortall.net\&> -.sp -1n -.IP "" 4 +\fBPeter Johnson\fR <\&peter@tortall\&.net\&> +.RS 4 Author. +.RE .SH "COPYRIGHT" +.br Copyright \(co 2004, 2005, 2006, 2007 Peter Johnson .br - diff --git a/yasm_dbgfmts.7 b/yasm_dbgfmts.7 index 2227d8c..aed2882 100644 --- a/yasm_dbgfmts.7 +++ b/yasm_dbgfmts.7 @@ -1,53 +1,63 @@ +'\" t .\" Title: yasm_dbgfmts .\" Author: Peter Johnson <peter@tortall.net> -.\" Generator: DocBook XSL Stylesheets v1.70.1 <http://docbook.sf.net/> +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> .\" Date: October 2006 .\" Manual: Yasm Supported Debug Formats .\" Source: Yasm +.\" Language: English .\" .TH "YASM_DBGFMTS" "7" "October 2006" "Yasm" "Yasm Supported Debug Formats" +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) .ad l +.\" ----------------------------------------------------------------- +.\" * MAIN CONTENT STARTS HERE * +.\" ----------------------------------------------------------------- .SH "NAME" yasm_dbgfmts \- Yasm Supported Debugging Formats .SH "SYNOPSIS" -.HP 5 -\fByasm\fR \fB\-g\ \fR\fB\fIdbgfmt\fR\fR \fB\fI...\fR\fR +.HP \w'\fByasm\fR\ 'u +\fByasm\fR \fB\-g\ \fR\fB\fIdbgfmt\fR\fR \fB\fI\&.\&.\&.\fR\fR .SH "DESCRIPTION" .PP -The standard Yasm distribution includes a number of modules for different debugging formats. The debugging information is embedded into the object file. Use of a non\-\(lqnull\(rq -debug format also causes Yasm to output all symbols to the object file (including local symbols). +The standard Yasm distribution includes a number of modules for different debugging formats\&. The debugging information is embedded into the object file\&. Use of a non\-\(lqnull\(rq +debug format also causes Yasm to output all symbols to the object file (including local symbols)\&. .PP The debug format is selected on the \fByasm\fR(1) command line by use of the \fB\-g \fR\fB\fIdbgfmt\fR\fR -command line option. +command line option\&. .SH "CV8" .PP -The CV8 debug format is used by Microsoft Visual Studio 2005 (version 8.0) and is completely undocumented, although it bears strong similarities to earlier CodeView formats. Yasm's support for the CV8 debug format is currently limited to generating assembly\-level line number information (to allow some level of source\-level debugging). The CV8 debug information is stored in the .debug$S and .debug$T sections of the Win64 object file. +The CV8 debug format is used by Microsoft Visual Studio 2005 (version 8\&.0) and is completely undocumented, although it bears strong similarities to earlier CodeView formats\&. Yasm\'s support for the CV8 debug format is currently limited to generating assembly\-level line number information (to allow some level of source\-level debugging)\&. The CV8 debug information is stored in the \&.debug$S and \&.debug$T sections of the Win64 object file\&. .SH "DWARF2" .PP -The DWARF 2 debug format is a complex, well\-documented standard for debugging information. It was created to overcome shortcomings in STABS, allowing for much more detailed and compact descriptions of data structures, data variable movement, and complex language structures such as in C++. The debugging information is stored in sections (just like normal program sections) in the object file. Yasm supports full pass\-through of DWARF2 debugging information (e.g. from a C++ compiler), and can also generate assembly\-level line number information. +The DWARF 2 debug format is a complex, well\-documented standard for debugging information\&. It was created to overcome shortcomings in STABS, allowing for much more detailed and compact descriptions of data structures, data variable movement, and complex language structures such as in C++\&. The debugging information is stored in sections (just like normal program sections) in the object file\&. Yasm supports full pass\-through of DWARF2 debugging information (e\&.g\&. from a C++ compiler), and can also generate assembly\-level line number information\&. .SH "NULL" .PP The \(lqnull\(rq -debug format is a placeholder; it adds no debugging information to the output file. +debug format is a placeholder; it adds no debugging information to the output file\&. .SH "STABS" .PP -The STABS debug format is a poorly documented, semi\-standard format for debugging information in COFF and ELF object files. The debugging information is stored as part of the object file's symbol table and thus is limited in complexity and scope. Despite this, STABS is a common debugging format on older Unix and compatible systems, as well as DJGPP. +The STABS debug format is a poorly documented, semi\-standard format for debugging information in COFF and ELF object files\&. The debugging information is stored as part of the object file\'s symbol table and thus is limited in complexity and scope\&. Despite this, STABS is a common debugging format on older Unix and compatible systems, as well as DJGPP\&. .SH "SEE ALSO" .PP \fByasm\fR(1), \fByasm_objfmts\fR(7) .SH "AUTHOR" .PP -\fBPeter\fR \fBJohnson\fR <peter@tortall.net> -.sp -1n -.IP "" 3n +\fBPeter Johnson\fR <\&peter@tortall\&.net\&> +.RS 4 Author. +.RE .SH "COPYRIGHT" +.br Copyright \(co 2006 Peter Johnson +.br diff --git a/yasm_objfmts.7 b/yasm_objfmts.7 index 9825c0a..5f64273 100644 --- a/yasm_objfmts.7 +++ b/yasm_objfmts.7 @@ -1,81 +1,91 @@ +'\" t .\" Title: yasm_objfmts .\" Author: Peter Johnson <peter@tortall.net> -.\" Generator: DocBook XSL Stylesheets v1.70.1 <http://docbook.sf.net/> +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> .\" Date: February 2007 .\" Manual: Yasm Supported Object Formats .\" Source: Yasm +.\" Language: English .\" .TH "YASM_OBJFMTS" "7" "February 2007" "Yasm" "Yasm Supported Object Formats" +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) .ad l +.\" ----------------------------------------------------------------- +.\" * MAIN CONTENT STARTS HERE * +.\" ----------------------------------------------------------------- .SH "NAME" yasm_objfmts \- Yasm Supported Object Formats .SH "SYNOPSIS" -.HP 5 -\fByasm\fR \fB\-f\ \fR\fB\fIobjfmt\fR\fR \fB\fI...\fR\fR +.HP \w'\fByasm\fR\ 'u +\fByasm\fR \fB\-f\ \fR\fB\fIobjfmt\fR\fR \fB\fI\&.\&.\&.\fR\fR .SH "DESCRIPTION" .PP -The standard Yasm distribution includes a number of modules for different object formats (Yasm's primary output). +The standard Yasm distribution includes a number of modules for different object formats (Yasm\'s primary output)\&. .PP The object format is selected on the \fByasm\fR(1) command line by use of the \fB\-f \fR\fB\fIobjfmt\fR\fR -command line option. +command line option\&. .SH "BIN" .PP The \(lqbin\(rq -object format produces a flat\-format, non\-relocatable binary file. It is appropriate for producing DOS .COM executables or things like boot blocks. It supports only 3 sections and those sections are written in a predefined order to the output file. +object format produces a flat\-format, non\-relocatable binary file\&. It is appropriate for producing DOS \&.COM executables or things like boot blocks\&. It supports only 3 sections and those sections are written in a predefined order to the output file\&. .SH "COFF" .PP -The COFF object format is an older relocatable object format used on older Unix and compatible systems, and also (more recently) on the DJGPP development system for DOS. +The COFF object format is an older relocatable object format used on older Unix and compatible systems, and also (more recently) on the DJGPP development system for DOS\&. .SH "DBG" .PP The \(lqdbg\(rq object format is not a \(lqreal\(rq -object format; the output file it creates simply describes the sequence of calls made to it by Yasm and the final object and symbol table information in a human\-readable text format (that in a normal object format would get processed into that object format's particular binary representation). This object format is not intended for real use, but rather for debugging Yasm's internals. +object format; the output file it creates simply describes the sequence of calls made to it by Yasm and the final object and symbol table information in a human\-readable text format (that in a normal object format would get processed into that object format\'s particular binary representation)\&. This object format is not intended for real use, but rather for debugging Yasm\'s internals\&. .SH "ELF" .PP The ELF object format really comes in two flavors: \(lqelf32\(rq (for 32\-bit targets) and \(lqelf64\(rq -(for 64\-bit targets). ELF is a standard object format in common use on modern Unix and compatible systems (e.g. Linux, FreeBSD). ELF has complex support for relocatable and shared objects. +(for 64\-bit targets)\&. ELF is a standard object format in common use on modern Unix and compatible systems (e\&.g\&. Linux, FreeBSD)\&. ELF has complex support for relocatable and shared objects\&. .SH "MACHO" .PP The Mach\-O object format really comes in two flavors: \(lqmacho32\(rq (for 32\-bit targets) and \(lqmacho64\(rq -(for 64\-bit targets). Mach\-O is used as the object format on MacOS X. As Yasm currently only supports x86 and AMD64 instruction sets, it can only generate Mach\-O objects for Intel\-based Macs. +(for 64\-bit targets)\&. Mach\-O is used as the object format on MacOS X\&. As Yasm currently only supports x86 and AMD64 instruction sets, it can only generate Mach\-O objects for Intel\-based Macs\&. .SH "RDF" .PP -The RDOFF2 object format is a simple multi\-section format originally designed for NASM. It supports segment references but not WRT references. It was designed primarily for simplicity and has minimalistic headers for ease of loading and linking. A complete toolchain (linker, librarian, and loader) is distributed with NASM. +The RDOFF2 object format is a simple multi\-section format originally designed for NASM\&. It supports segment references but not WRT references\&. It was designed primarily for simplicity and has minimalistic headers for ease of loading and linking\&. A complete toolchain (linker, librarian, and loader) is distributed with NASM\&. .SH "WIN32" .PP -The Win32 object format produces object files compatible with Microsoft compilers (such as Visual C++) that target the 32\-bit x86 Windows platform. The object format itself is an extended version of COFF. +The Win32 object format produces object files compatible with Microsoft compilers (such as Visual C++) that target the 32\-bit x86 Windows platform\&. The object format itself is an extended version of COFF\&. .SH "WIN64" .PP The Win64 object format produces object files compatible with Microsoft compilers that target the 64\-bit \(lqx64\(rq -Windows platform. This format is very similar to the win32 object format, but produces 64\-bit objects. +Windows platform\&. This format is very similar to the win32 object format, but produces 64\-bit objects\&. .SH "XDF" .PP -The XDF object format is essentially a simplified version of COFF. It's a multi\-section relocatable format that supports 64\-bit physical and virtual addresses. +The XDF object format is essentially a simplified version of COFF\&. It\'s a multi\-section relocatable format that supports 64\-bit physical and virtual addresses\&. .SH "SEE ALSO" .PP \fByasm\fR(1), \fByasm_arch\fR(7) .SH "AUTHOR" .PP -\fBPeter\fR \fBJohnson\fR <peter@tortall.net> -.sp -1n -.IP "" 3n +\fBPeter Johnson\fR <\&peter@tortall\&.net\&> +.RS 4 Author. +.RE .SH "COPYRIGHT" +.br Copyright \(co 2006 Peter Johnson +.br |