Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6)

Unified Diff: third_party/yasm/patched-yasm/Mkfiles/Makefile.flat

Issue 6170009: Update our yasm copy to yasm 1.1.0 (Part 1: yasm side)... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/
Patch Set: Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/yasm/patched-yasm/Mkfiles/Makefile.flat
===================================================================
--- third_party/yasm/patched-yasm/Mkfiles/Makefile.flat (revision 71129)
+++ third_party/yasm/patched-yasm/Mkfiles/Makefile.flat (working copy)
@@ -1,4 +1,4 @@
-# $Id: Makefile.flat 2183 2009-03-24 04:58:46Z peter $
+# $Id: Makefile.flat 2284 2010-02-06 09:27:32Z peter $
#
# Ultra-flat Makefile "prototype" for non-Unix platforms.
# Does NOT depend on or use configure.
@@ -16,7 +16,7 @@
CC?=gcc
BUILDCC?=$(CC)
-all: yasm ytasm
+all: yasm ytasm vsyasm
LIBYASM_OBJS= \
libyasm/assocdat.o \
@@ -112,6 +112,7 @@
modules/parsers/nasm/nasm-parse.o \
nasm-token.o \
modules/parsers/gas/gas-parser.o \
+ modules/parsers/gas/gas-parse-intel.o \
modules/parsers/gas/gas-parse.o \
gas-token.o
YASM_MODULES+=parser_nasm parser_tasm
@@ -132,10 +133,16 @@
modules/preprocs/cpp/cpp-preproc.o
YASM_MODULES+=preproc_cpp
+MODULES_PREPROCS_GAS_OBJS = \
+ modules/preprocs/gas/gas-eval.o \
+ modules/preprocs/gas/gas-preproc.o
+YASM_MODULES+=preproc_gas
+
MODULES_PREPROCS_OBJS = \
$(MODULES_PREPROCS_NASM_OBJS) \
$(MODULES_PREPROCS_RAW_OBJS) \
- $(MODULES_PREPROCS_CPP_OBJS)
+ $(MODULES_PREPROCS_CPP_OBJS) \
+ $(MODULES_PREPROCS_GAS_OBJS)
MODULES_OBJS = \
$(MODULES_ARCH_OBJS) \
@@ -158,6 +165,12 @@
$(LIBYASM_OBJS) \
$(MODULES_OBJS)
+VSYASM_OBJS= \
+ frontends/vsyasm/vsyasm.o \
+ frontends/yasm/yasm-options.o \
+ $(LIBYASM_OBJS) \
+ $(MODULES_OBJS)
+
genstring: genstring.c
$(BUILDCC) -o $@ $<
@@ -255,6 +268,9 @@
ytasm: $(YTASM_OBJS)
$(CC) -o ytasm $(YTASM_OBJS)
+vsyasm: $(VSYASM_OBJS)
+ $(CC) -o vsyasm $(VSYASM_OBJS)
+
.c.o:
$(CC) -c $(CFLAGS) -o $@ $<
« no previous file with comments | « third_party/yasm/patched-yasm/Mkfiles/Makefile.dj ('k') | third_party/yasm/patched-yasm/Mkfiles/dj/config.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698