Commitd852d31

committed

This patch should enable 6.5 to build on Motorola 68000 architecture.It comes from Roman Hodek <Roman.Hodek@informatik.uni-erlangen.de>.

1 parent70dfc8c commitd852d31Copy full SHA for d852d31

File tree

+35

-2

lines changed

+35

-2

lines changed

Lines changed: 15 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`*`
`7`	`7`	`* Copyright (c) 1995, Regents of the University of California`
`8`	`8`	`*`
`9`		`- * $Id: postgres.h,v 1.22 1999/05/03 19:10:14 momjian Exp $`
	`9`	`+ * $Id: postgres.h,v 1.23 1999/06/10 22:59:22 momjian Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -63,7 +63,21 @@ typedef Oid regproc;`
`63`	`63`	`typedefOidRegProcedure;`
`64`	`64`
`65`	`65`	`/* ptr to func returning (char ) /`
	`66`	`+#if defined(__mc68000__)&& defined(__ELF__)`
	`67`	`+/* The m68k SVR4 ABI defines that pointers are returned in %a0 instead of`
	`68`	`+ * %d0. So if a function pointer is declared to return a pointer, the`
	`69`	`+ * compiler may look only into %a0, but if the called function was declared`
	`70`	`+ * to return return an integer type, it puts its value only into %d0. So the`
	`71`	`+ * caller doesn't pink up the correct return value. The solution is to`
	`72`	`+ * declare the function pointer to return int, so the compiler picks up the`
	`73`	`+ * return value from %d0. (Functions returning pointers put their value`
	`74`	`+ * additionally into %d0 for compability.) The price is that there are`
	`75`	`+ * some warnings about int->pointer conversions...`
	`76`	`+ */`
	`77`	`+typedefint32 ((*func_ptr) ());`
	`78`	`+#else`
`66`	`79`	`typedefchar((func_ptr) ());`
	`80`	`+#endif`
`67`	`81`
`68`	`82`
`69`	`83`	`#defineRegProcedureIsValid(p)OidIsValid(p)`

Lines changed: 20 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/include/storage/s_lock.h,v 1.59 1999/04/13 17:42:26 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/include/storage/s_lock.h,v 1.60 1999/06/10 22:59:22 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -157,6 +157,24 @@ tas(volatile slock_t *lock)`
`157`	`157`	`#endif/* sparc */`
`158`	`158`
`159`	`159`
	`160`	`+#if defined(__mc68000__)`
	`161`	`+#defineTAS(lock) tas(lock)`
	`162`	`+`
	`163`	`+static __inline__int`
	`164`	`+tas(volatileslock_t*lock)`
	`165`	`+{`
	`166`	`+registerintrv;`
	`167`	`+`
	`168`	`+__asm__ __volatile__ (`
	`169`	`+"tas %1; sne %0"`
	`170`	`+:"=d" (rv),"=m"(*lock)`
	`171`	`+:"1" (*lock)`
	`172`	`+:"cc" );`
	`173`	`+returnrv;`
	`174`	`+}`
	`175`	`+`
	`176`	`+#endif/* defined(__mc68000__) */`
	`177`	`+`
`160`	`178`
`161`	`179`	`#if defined(NEED_VAX_TAS_ASM)`
`162`	`180`	`/*`
`@@ -372,3 +390,4 @@ inttas(volatile slock_t lock);/ port/.../tas.s, or`
`372`	`390`
`373`	`391`	`#endif/* HAS_TEST_AND_SET */`
`374`	`392`	`#endif/* S_LOCK_H */`
	`393`	`+`

Comments

(0)