Commiteaae21f

committed

Fixes for alphalinux port by abrams@philos.umass.edu

1 parent9d90de5 commiteaae21fCopy full SHA for eaae21f

File tree

+20

-7

lines changed

+20

-7

lines changed

Lines changed: 9 additions & 5 deletions

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/backend/storage/ipc/Attic/s_lock.c,v 1.16 1997/08/12 22:53:55 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/storage/ipc/Attic/s_lock.c,v 1.17 1997/08/17 02:39:54 scrappy Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -44,7 +44,11 @@`
`44`	`44`
`45`	`45`	`#if defined(HAS_TEST_AND_SET)`
`46`	`46`
	`47`	`+# if defined(__alpha__)&& defined(linux)`
	`48`	`+externlonginttas(slock_t*lock);`
	`49`	`+# else`
`47`	`50`	`externinttas(slock_t*lock);`
	`51`	`+#endif`
`48`	`52`
`49`	`53`	`#if defined (nextstep)`
`50`	`54`	`/*`
`@@ -126,7 +130,7 @@ S_LOCK_FREE(slock_t *lock)`
`126`	`130`	`* (see storage/ipc.h).`
`127`	`131`	`*/`
`128`	`132`
`129`		`-#if defined(alpha)&& !defined(linuxalpha)`
	`133`	`+#if defined(__alpha__)`
`130`	`134`
`131`	`135`	`void`
`132`	`136`	`S_LOCK(slock_t*lock)`
`@@ -409,9 +413,9 @@ S_INIT_LOCK(slock_t *lock)`
`409`	`413`	`#endif/* NEED_I386_TAS_ASM */`
`410`	`414`
`411`	`415`
`412`		`-#if defined(linuxalpha)`
	`416`	`+#if defined(__alpha__)&& defined(linux)`
`413`	`417`
`414`		`-int`
	`418`	`+longint`
`415`	`419`	`tas(slock_t*m)`
`416`	`420`	`{`
`417`	`421`	`slock_tres;`
`@@ -451,7 +455,7 @@ S_INIT_LOCK(slock_t *lock)`
`451`	`455`	`S_UNLOCK(lock);`
`452`	`456`	`}`
`453`	`457`
`454`		`-#endif`
	`458`	`+#endif/* defined(__alpha__) && defined(linux) */`
`455`	`459`
`456`	`460`	`#if defined(linux)&& defined(sparc)`
`457`	`461`

Lines changed: 10 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,6 @@`
`12`	`12`
`13`	`13`	`# if defined(PPC)`
`14`	`14`	`typedefunsignedintslock_t;`
`15`		`-# else`
`16`		`-typedefunsignedcharslock_t;`
`17`	`15`	`# endif`
`18`	`16`
`19`	`17`	`# if defined(PPC)`
`@@ -24,3 +22,13 @@`
`24`	`22`	`# if defined(sparc)`
`25`	`23`	`# undef NEED_I386_TAS_ASM`
`26`	`24`	`# endif`
	`25`	`+`
	`26`	`+`
	`27`	`+# if defined(__alpha__)`
	`28`	`+# undef NEED_I386_TAS_ASM`
	`29`	`+# endif`
	`30`	`+# if defined(__alpha__)`
	`31`	`+typedeflongintslock_t;`
	`32`	`+# else`
	`33`	`+typedefunsignedcharslock_t;`
	`34`	`+# endif`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,3 +8,4 @@ i386-unknown-netbsd=netbsd`
`8`	`8`	`mips-sgi-irix5=irix5`
`9`	`9`	`sparc-sun-solaris2=sparc_solaris-gcc`
`10`	`10`	`sparc-unknown-linux-gnu=linux-elf`
	`11`	`+alpha-unknown-linux-gnu=linuxalpha`

Comments

(0)