Corrected erroneous bit masking

[proxmark3-svn] / common / Makefile.common

diff --git a/common/Makefile.common b/common/Makefile.common
index 0d0e2e8239668e260eb4c39a745fa5b96efa813d..eb74c2469bb40bb050dce7c6bae0df6e97a420e0 100644 (file)
--- a/common/Makefile.common
+++ b/common/Makefile.common
@@ -1,3 +1,11 @@
+#-----------------------------------------------------------------------------
+# This code is licensed to you under the terms of the GNU GPL, version 2 or,
+# at your option, any later version. See the LICENSE.txt file for the text of
+# the license.
+#-----------------------------------------------------------------------------
+# Common makefile functions for all platforms
+#-----------------------------------------------------------------------------
+
 # This new makefile replaces the previous Makefile/Makefile.linux
 # with as much common code for both environments as possible.
 # Following is a short OS detection to set up variables, all the
@@ -9,7 +17,7 @@
 # (The including Makefile still needs to define what 'all' is)
 all:
 
-CROSS   = arm-eabi-
+CROSS  ?= arm-eabi-
 CC     = $(CROSS)gcc
 AS     = $(CROSS)as
 LD     = $(CROSS)ld
@@ -32,8 +40,7 @@ COPY=cp
 PATHSEP=/
 FLASH_TOOL=client/flasher
 DETECTED_OS=UNAME
-# You may/should set this in your environment
-LIBGCC ?= $(shell $(CC) -print-libgcc-file-name)
+PATH := $(PATH):$(DEVKITARM)/bin
 
 else
 
@@ -42,7 +49,6 @@ DELETE=del /q
 MOVE=ren
 COPY=copy
 PATHSEP=\\#
-LIBGCC ?= ../../devkitARM/lib/gcc/arm-elf/4.1.0/interwork/libgcc.a
 FLASH_TOOL=winsrc\\prox.exe
 DETECTED_OS=Windows
 
@@ -55,6 +61,8 @@ VPATH = . ../common/ ../fpga/
 INCLUDES = ../include/proxmark3.h ../include/at91sam7s512.h ../include/config_gpio.h ../include/usb_cmd.h $(APP_INCLUDES)
 
 CFLAGS =  -c $(INCLUDE) -Wall -Werror -pedantic -std=gnu99 $(APP_CFLAGS)
+LDFLAGS = -nostartfiles -nodefaultlibs -Wl,-gc-sections -n
+LIBS = -lgcc
 
 THUMBOBJ = $(patsubst %.c,$(OBJDIR)/%.o,$(THUMBSRC))
 ARMOBJ   = $(ARMSRC:%.c=$(OBJDIR)/%.o)