From 00849100f8d07f00a6b80ee2a6afa9ad35fae9e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Sat, 15 Mar 2014 12:47:03 +0200 Subject: [PATCH] Remove the unused define NOPREFIX Nothing in the x86 assembly reacts to that define (nor anything else within the code base). --- build/platform-android.mk | 2 +- build/platform-darwin.mk | 2 +- build/platform-freebsd.mk | 1 - build/platform-linux.mk | 1 - 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/build/platform-android.mk b/build/platform-android.mk index ac5153e4..6fd86dd6 100644 --- a/build/platform-android.mk +++ b/build/platform-android.mk @@ -17,7 +17,7 @@ else ifeq ($(ARCH), x86) APP_ABI = x86 TOOLCHAINPREFIX = $(shell NDK_PROJECT_PATH=./codec/build/android/dec make --no-print-dir -f $(NDKROOT)/build/core/build-local.mk DUMP_TOOLCHAIN_PREFIX APP_ABI=x86) ifeq (Yes, $(USE_ASM)) - ASMFLAGS += -DNOPREFIX -f elf32 + ASMFLAGS += -f elf32 endif else APP_ABI = $(ARCH) diff --git a/build/platform-darwin.mk b/build/platform-darwin.mk index 2d3a63c2..40d00f54 100644 --- a/build/platform-darwin.mk +++ b/build/platform-darwin.mk @@ -4,7 +4,7 @@ SHARED = -dynamiclib CFLAGS += -Werror -fPIC -DMACOS -DMT_ENABLED -MMD -MP LDFLAGS += -lpthread ifeq ($(ASM_ARCH), x86) -ASMFLAGS += --prefix _ -DNOPREFIX +ASMFLAGS += --prefix _ ifeq ($(ENABLE64BIT), Yes) ASMFLAGS += -f macho64 else diff --git a/build/platform-freebsd.mk b/build/platform-freebsd.mk index adb56601..c7ef75da 100644 --- a/build/platform-freebsd.mk +++ b/build/platform-freebsd.mk @@ -3,7 +3,6 @@ SHAREDLIBSUFFIX = so CFLAGS += -fPIC -DMT_ENABLED LDFLAGS += -lpthread ifeq ($(ASM_ARCH), x86) -ASMFLAGS += -DNOPREFIX ifeq ($(ENABLE64BIT), Yes) ASMFLAGS += -f elf64 else diff --git a/build/platform-linux.mk b/build/platform-linux.mk index ccd9eef8..e95ff2cd 100644 --- a/build/platform-linux.mk +++ b/build/platform-linux.mk @@ -3,7 +3,6 @@ SHAREDLIBSUFFIX = so CFLAGS += -Werror -fPIC -DLINUX -DMT_ENABLED -MMD -MP LDFLAGS += -lpthread ifeq ($(ASM_ARCH), x86) -ASMFLAGS += -DNOPREFIX ifeq ($(ENABLE64BIT), Yes) ASMFLAGS += -f elf64 else