ref: 8a7a15ff30c3b420f2a1b7a84510f9896b18239f
parent: 2c828d7918bb52db6da761ab965a86ea11e57a20
author: volvet <qizh@cisco.com>
date: Sat Jan 4 03:20:56 EST 2014
fix merge conflict
--- a/build/platform-darwin.mk
+++ b/build/platform-darwin.mk
@@ -2,11 +2,7 @@
ASM = nasm
CFLAGS += -Werror -fPIC
LDFLAGS += -lpthread
-<<<<<<< HEAD
-ASMFLAGS += --prefix _
-=======
ASMFLAGS += --prefix _ -DNOPREFIX
->>>>>>> 64bits_Support
ifeq ($(ENABLE64BIT), Yes)
ASMFLAGS += -f macho64
else
--- a/build/platform-linux.mk
+++ b/build/platform-linux.mk
@@ -1,10 +1,7 @@
ASM = nasm
CFLAGS += -Werror -fPIC -DLINUX -D__NO_CTYPE
LDFLAGS += -lpthread
-<<<<<<< HEAD
-=======
ASMFLAGS += -DNOPREFIX
->>>>>>> 64bits_Support
ifeq ($(ENABLE64BIT), Yes)
ASMFLAGS += -f elf64
else