Merge pull request #1884 from AlexeiFedorov/af/set_march_to_arch_minor

[project/bcm63xx/atf.git] / Makefile

diff --git a/Makefile b/Makefile
index 5621c53e06f4f6beaecb0f96f393741447bb89ee..8656da5d12811b452ec1390918654c63e04c0429 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -371,7 +371,7 @@ endif
 
 ifeq ($(ENABLE_PIE),1)
     TF_CFLAGS          +=      -fpie
-    TF_LDFLAGS         +=      -pie
+    TF_LDFLAGS         +=      -pie --no-dynamic-linker
 else
     PIE_FOUND          :=      $(findstring --enable-default-pie,${GCC_V_OUTPUT})
     ifneq ($(PIE_FOUND),)
@@ -841,13 +841,18 @@ checkcodebase:            locate-checkpatch
 
 checkpatch:            locate-checkpatch
        @echo "  CHECKING STYLE"
+       @if test -n "${CHECKPATCH_OPTS}"; then                          \
+               echo "    with ${CHECKPATCH_OPTS} option(s)";           \
+       fi
        ${Q}COMMON_COMMIT=$$(git merge-base HEAD ${BASE_COMMIT});       \
        for commit in `git rev-list $$COMMON_COMMIT..HEAD`; do          \
                printf "\n[*] Checking style of '$$commit'\n\n";        \
                git log --format=email "$$commit~..$$commit"            \
-                       -- ${CHECK_PATHS} | ${CHECKPATCH} - || true;    \
+                       -- ${CHECK_PATHS} |                             \
+                       ${CHECKPATCH} ${CHECKPATCH_OPTS} - || true;     \
                git diff --format=email "$$commit~..$$commit"           \
-                       -- ${CHECK_PATHS} | ${CHECKPATCH} - || true;    \
+                       -- ${CHECK_PATHS} |                             \
+                       ${CHECKPATCH}  ${CHECKPATCH_OPTS} - || true;    \
        done
 
 certtool: ${CRTTOOL}