Commit 8e8acb7f authored by Matthew Wilcox's avatar Matthew Wilcox Committed by Linus Torvalds

[PATCH] PA-RISC Makefile updates

 - Support sparse
 - Use CONFIG_64BIT instead of CONFIG_PARISC64
 - Find palo in /sbin even if it's not in our $PATH
Signed-off-by: default avatarRandolph Chung <tausq@parisc-linux.org>
Signed-off-by: default avatarMatthew Wilcox <willy@parisc-linux.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 629e332a
...@@ -17,9 +17,12 @@ ...@@ -17,9 +17,12 @@
# Mike Shaver, Helge Deller and Martin K. Petersen # Mike Shaver, Helge Deller and Martin K. Petersen
# #
NM = sh $(srctree)/arch/parisc/nm NM = sh $(srctree)/arch/parisc/nm
ifdef CONFIG_PARISC64 CHECKFLAGS += -D__hppa__=1
ifdef CONFIG_64BIT
CROSS_COMPILE := hppa64-linux- CROSS_COMPILE := hppa64-linux-
UTS_MACHINE := parisc64 UTS_MACHINE := parisc64
CHECKFLAGS += -D__LP64__=1 -m64
else else
MACHINE := $(subst 64,,$(shell uname -m)) MACHINE := $(subst 64,,$(shell uname -m))
ifneq ($(MACHINE),parisc) ifneq ($(MACHINE),parisc)
...@@ -65,8 +68,12 @@ libs-y += arch/parisc/lib/ `$(CC) -print-libgcc-file-name` ...@@ -65,8 +68,12 @@ libs-y += arch/parisc/lib/ `$(CC) -print-libgcc-file-name`
drivers-$(CONFIG_OPROFILE) += arch/parisc/oprofile/ drivers-$(CONFIG_OPROFILE) += arch/parisc/oprofile/
PALO := $(shell if which palo; then : ; \
elif [ -x /sbin/palo ]; then echo /sbin/palo; \
fi)
palo: vmlinux palo: vmlinux
@if [ $$(palo -f /dev/null >/dev/null 2>&1 ; echo $$?) != 2 ]; then \ @if [ -x $PALO ]; then \
echo 'ERROR: Please install palo first (apt-get install palo)';\ echo 'ERROR: Please install palo first (apt-get install palo)';\
echo 'or build it from source and install it somewhere in your $$PATH';\ echo 'or build it from source and install it somewhere in your $$PATH';\
false; \ false; \
...@@ -78,7 +85,7 @@ palo: vmlinux ...@@ -78,7 +85,7 @@ palo: vmlinux
echo 'WARNING: the "lifimage" file is now placed in this directory by default!'; \ echo 'WARNING: the "lifimage" file is now placed in this directory by default!'; \
false; \ false; \
fi fi
palo -f ./palo.conf $(PALO) -f ./palo.conf
oldpalo: vmlinux oldpalo: vmlinux
export TOPDIR=`pwd`; \ export TOPDIR=`pwd`; \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment