diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h
index 0e7ba0c5d458265acaf07c9f33f7c4fbb507c925..b26c63029adac9f5616452cf8e0446d47d29a315 100644
--- a/src/include/storage/s_lock.h
+++ b/src/include/storage/s_lock.h
@@ -63,7 +63,7 @@
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- *	  $Id: s_lock.h,v 1.106 2003/04/20 21:54:34 tgl Exp $
+ *	  $Id: s_lock.h,v 1.107 2003/06/05 16:07:25 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -76,7 +76,7 @@
 #if defined(HAS_TEST_AND_SET)
 
 
-#if defined(__GNUC__)
+#if defined(__GNUC__) || defined(__ICC)
 /*************************************************************************
  * All the gcc inlines
  */
diff --git a/src/makefiles/Makefile.linux b/src/makefiles/Makefile.linux
index c40355240b2a54eb5f4ea5250b1a607a350bfba1..e48ad5a6b105015b973ecef105c22166addf8e71 100644
--- a/src/makefiles/Makefile.linux
+++ b/src/makefiles/Makefile.linux
@@ -1,5 +1,5 @@
 AROPT = crs
-export_dynamic = -export-dynamic
+export_dynamic = -Wl,-E
 rpath = -Wl,-rpath,$(libdir)
 shlib_symbolic = -Wl,-Bsymbolic
 allow_nonpic_in_shlib = yes