NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commit2c713d6

committed

Remove theoretically-unnecessary special case for icc.

Intel's icc is generally able to swallow asm blocks written for gcc.We have a few places that don't seem to know that, though. Experimentwith removing the special case for icc in ia64_get_bsp(); if the buildfarmlikes this, I'll try more cleanup. This is a good test case because itinvolves a "stop" notation that seems like it might not be very portable.

1 parenta65e086 commit2c713d6Copy full SHA for 2c713d6

File tree

1 file changed

-11

lines changed

src/backend/tcop
- postgres.c

1 file changed

-11

lines changed

`‎src/backend/tcop/postgres.c`

Lines changed: 5 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -2997,33 +2997,27 @@ ProcessInterrupts(void)`
`2997`	`2997`	`/*`
`2998`	`2998`	`* IA64-specific code to fetch the AR.BSP register for stack depth checks.`
`2999`	`2999`	`*`
`3000`		`- * We currently support gcc, icc, and HP-UX inline assembly here.`
	`3000`	`+ * We currently support gcc, icc, and HP-UX's native compiler here.`
`3001`	`3001`	`*/`
`3002`	`3002`	`#if defined(__ia64__)\|\| defined(__ia64)`
`3003`	`3003`
`3004`		`-#if defined(__hpux)&& !defined(__GNUC__)&& !defined__INTEL_COMPILER`
	`3004`	`+#if defined(__hpux)&& !defined(__GNUC__)&& !defined(__INTEL_COMPILER)`
	`3005`	`+/* Assume it's HP-UX native compiler */`
`3005`	`3006`	`#include<ia64/sys/inline.h>`
`3006`	`3007`	`#defineia64_get_bsp() ((char *) (_Asm_mov_from_ar(_AREG_BSP, _NO_FENCE)))`
`3007`	`3008`	`#else`
`3008`		`-`
`3009`		`-#ifdef__INTEL_COMPILER`
`3010`		`-#include<asm/ia64regs.h>`
`3011`		`-#endif`
`3012`		`-`
	`3009`	`+/* Use inline assembly; works with gcc and icc */`
`3013`	`3010`	`static __inline__char*`
`3014`	`3011`	`ia64_get_bsp(void)`
`3015`	`3012`	`{`
`3016`	`3013`	`char*ret;`
`3017`	`3014`
`3018`		`-#ifndef__INTEL_COMPILER`
`3019`	`3015`	`/* the ;; is a "stop", seems to be required before fetching BSP */`
`3020`	`3016`	`__asm____volatile__(`
`3021`	`3017`	`";;\n"`
`3022`	`3018`	`"mov%0=ar.bsp\n"`
`3023`	`3019`	`:"=r"(ret));`
`3024`		`-#else`
`3025`		`-ret= (char*)__getReg(_IA64_REG_AR_BSP);`
`3026`		`-#endif`
	`3020`	`+`
`3027`	`3021`	`returnret;`
`3028`	`3022`	`}`
`3029`	`3023`	`#endif`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit2c713d6

File tree

1 file changed

1 file changed

`‎src/backend/tcop/postgres.c`

0 commit comments