70 files changed, 6524 insertions, 1886 deletions

diff --git a/arch/parisc/Makefile b/arch/parisc/Makefile
index f3d0d7c70977..ae4a9b3d4fd6 100644
--- a/arch/parisc/Makefile
+++ b/arch/parisc/Makefile
@@ -19,26 +19,27 @@
 NM              = sh $(srctree)/arch/parisc/nm
 CHECKFLAGS      += -D__hppa__=1
 
+MACHINE         := $(shell uname -m)
+ifeq ($(MACHINE),parisc*)
+NATIVE          := 1
+endif
+
 ifdef CONFIG_64BIT
-CROSS_COMPILE   := $(shell if [ -x /usr/bin/hppa64-linux-gnu-gcc ]; then \
-                        echo hppa64-linux-gnu-; else echo hppa64-linux-; fi)
 UTS_MACHINE     := parisc64
 CHECKFLAGS      += -D__LP64__=1 -m64
-else
-MACHINE := $(subst 64,,$(shell uname -m))
-ifneq ($(MACHINE),parisc)
-CROSS_COMPILE   := hppa-linux-
-endif
+WIDTH           := 64
+CROSS_COMPILE   := hppa64-linux-gnu-
+else # 32-bit
+WIDTH           :=
 endif
 
-FINAL_LD=$(CROSS_COMPILE)ld --warn-common --warn-section-align 
+# attempt to help out folks who are cross-compiling
+ifeq ($(NATIVE),1)
+CROSS_COMPILE   := hppa$(WIDTH)-linux-
+endif
 
 OBJCOPY_FLAGS =-O binary -R .note -R .comment -S
 
-ifneq ($(call cc-ifversion, -lt, 0303, "bad"),)
-$(error Sorry, GCC v3.3 or above is required.)
-endif
-
 cflags-y        := -pipe
 
 # These flags should be implied by an hppa-linux configuration, but they
@@ -69,7 +70,7 @@ kernel-y			:= mm/ kernel/ math-emu/ kernel/init_task.o
 kernel-$(CONFIG_HPUX)           += hpux/
 
 core-y  += $(addprefix arch/parisc/, $(kernel-y))
-libs-y  += arch/parisc/lib/ `$(CC) -print-libgcc-file-name`
+libs-y  += arch/parisc/lib/
 
 drivers-$(CONFIG_OPROFILE)              += arch/parisc/oprofile/
 
@@ -77,27 +78,27 @@ PALO := $(shell if which palo; then : ; \
         elif [ -x /sbin/palo ]; then echo /sbin/palo; \
         fi)
 
+PALOCONF := $(shell if [ -f $(src)/palo.conf ]; then echo $(src)/palo.conf; \
+        else echo $(obj)/palo.conf; \
+        fi)
+
 palo: vmlinux
-        @if [ -x $PALO ]; then \
+        @if test ! -x "$(PALO)"; then \
                 echo 'ERROR: Please install palo first (apt-get install palo)';\
                 echo 'or build it from source and install it somewhere in your $$PATH';\
                 false; \
         fi
-        @if [ ! -f ./palo.conf ]; then \
-                cp arch/parisc/defpalo.conf palo.conf; \
-                echo 'A generic palo config file (./palo.conf) has been created for you.'; \
+        @if test ! -f "$(PALOCONF)"; then \
+                cp $(src)/arch/parisc/defpalo.conf $(obj)/palo.conf; \
+                echo 'A generic palo config file ($(obj)/palo.conf) has been created for you.'; \
                 echo 'You should check it and re-run "make palo".'; \
                 echo 'WARNING: the "lifimage" file is now placed in this directory by default!'; \
                 false; \
         fi
-        $(PALO) -f ./palo.conf
-
-oldpalo: vmlinux
-        export TOPDIR=`pwd`; \
+        $(PALO) -f $(PALOCONF)