Eliminate more useless differences between hppa and hppa64

5 files changed, 13 insertions, 13 deletions

diff --git a/sys/arch/hppa/include/cdefs.h b/sys/arch/hppa/include/cdefs.h
index ca8a9abe7f3..1a24e7e33ff 100644
--- a/sys/arch/hppa/include/cdefs.h
+++ b/sys/arch/hppa/include/cdefs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cdefs.h,v 1.8 2005/11/24 20:46:45 deraadt Exp $	*/
+/*	$OpenBSD: cdefs.h,v 1.9 2011/11/10 23:15:11 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -37,7 +37,7 @@
 #elif defined(__GNUC__) && defined(__STDC__)
 #define	__weak_alias(alias,sym)					\
 	__asm__(".export " __STRING(alias) ", entry\n\t.weak "	\
-	__STRING(alias) "\n\t" __STRING(alias) " = " __STRING(sym))
+	    __STRING(alias) "\n\t" __STRING(alias) " = " __STRING(sym))
 #define	__warn_references(sym,msg)				\
 	__asm__(".section .gnu.warning." __STRING(sym)		\
 	    "\n\t.ascii \"" msg "\"\n\t.text")
diff --git a/sys/arch/hppa64/include/_types.h b/sys/arch/hppa64/include/_types.h
index a05a83ca069..22f92107858 100644
--- a/sys/arch/hppa64/include/_types.h
+++ b/sys/arch/hppa64/include/_types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: _types.h,v 1.8 2011/09/08 03:40:32 guenther Exp $	*/
+/*	$OpenBSD: _types.h,v 1.9 2011/11/10 23:15:11 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -36,7 +36,7 @@
 #define _MACHINE__TYPES_H_
 
 #if defined(_KERNEL)
-typedef struct label_t {
+typedef struct label_t {		/* XXX longs?? */
 	int	lbl_rp;
 	int	lbl_sp;
 	int	lbl_s[17];
@@ -116,7 +116,7 @@ typedef	__int64_t		__intmax_t;
 typedef	__uint64_t		__uintmax_t;
 
 /* Register size */
-typedef long			__register_t;
+typedef __int64_t		__register_t;
 
 /* VM system types */
 typedef unsigned long		__vaddr_t;
diff --git a/sys/arch/hppa64/include/exec.h b/sys/arch/hppa64/include/exec.h
index 4967866a49b..79a7cf4789f 100644
--- a/sys/arch/hppa64/include/exec.h
+++ b/sys/arch/hppa64/include/exec.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exec.h,v 1.2 2005/05/21 18:04:01 mickey Exp $	*/
+/*	$OpenBSD: exec.h,v 1.3 2011/11/10 23:15:11 deraadt Exp $	*/
 
 /* 
  * Copyright (c) 1994, The University of Utah and
@@ -37,7 +37,7 @@
 #define ELF_TARG_DATA           ELFDATA2MSB
 #define ELF_TARG_MACH           EM_PARISC   
 
-#define NATIVE_EXEC_ELF
+#define	NATIVE_EXEC_ELF
 #define _NLIST_DO_ELF
 #define	_KERN_DO_ELF64
 
diff --git a/sys/arch/hppa64/include/pcb.h b/sys/arch/hppa64/include/pcb.h
index 54f2d89d7cc..8ed995f81f9 100644
--- a/sys/arch/hppa64/include/pcb.h
+++ b/sys/arch/hppa64/include/pcb.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcb.h,v 1.3 2011/04/16 22:02:32 kettenis Exp $	*/
+/*	$OpenBSD: pcb.h,v 1.4 2011/11/10 23:15:11 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2005 Michael Shalayeff
@@ -26,9 +26,9 @@
 struct pcb {
 	struct hppa_fpstate *pcb_fpstate;	/* not in the trapframe */
 
-	u_int64_t pcb_ksp;		/* kernel sp for ctxsw */
-	u_int64_t pcb_onfault;		/* SW copy fault handler */
-	pa_space_t pcb_space;		/* copy pmap_space, for asm's sake */
+	u_int64_t	pcb_ksp;		/* kernel sp for ctxsw */
+	u_int64_t	pcb_onfault;		/* SW copy fault handler */
+	pa_space_t	pcb_space;		/* copy pmap_space, for asm's sake */
 };
 
 struct md_coredump {
diff --git a/sys/arch/hppa64/include/reloc.h b/sys/arch/hppa64/include/reloc.h
index 6c32cad2433..adf931f7e48 100644
--- a/sys/arch/hppa64/include/reloc.h
+++ b/sys/arch/hppa64/include/reloc.h
@@ -1,7 +1,7 @@
-/*	$OpenBSD: reloc.h,v 1.1 2005/04/01 10:40:48 mickey Exp $	*/
+/*	$OpenBSD: reloc.h,v 1.2 2011/11/10 23:15:11 deraadt Exp $	*/
 
 /*
- * Copyright (c) 2005 Michael Shalayeff
+ * Copyright (c) 1999,2005 Michael Shalayeff
  * All rights reserved.
  *
  * Permission to use, copy, modify, and distribute this software for any