From 71d21577de945a1fdf16f85a30d756c8d1aeaee3 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Tue, 21 Dec 2004 18:47:42 +0000
Subject: [PATCH] Add '-Wl,' prefix to linker switches consistently.  Remove
 shlib_symbolic macros, which aren't used anywhere and haven't been for some
 time.

---
 src/makefiles/Makefile.bsdi     | 3 +--
 src/makefiles/Makefile.freebsd  | 5 ++---
 src/makefiles/Makefile.hpux     | 1 -
 src/makefiles/Makefile.irix     | 1 -
 src/makefiles/Makefile.linux    | 1 -
 src/makefiles/Makefile.netbsd   | 3 +--
 src/makefiles/Makefile.openbsd  | 3 +--
 src/makefiles/Makefile.osf      | 2 +-
 src/makefiles/Makefile.sco      | 1 -
 src/makefiles/Makefile.solaris  | 5 ++---
 src/makefiles/Makefile.unixware | 1 -
 11 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/src/makefiles/Makefile.bsdi b/src/makefiles/Makefile.bsdi
index 0257f6367a..a9d709d137 100644
--- a/src/makefiles/Makefile.bsdi
+++ b/src/makefiles/Makefile.bsdi
@@ -15,8 +15,7 @@ endif
 ifeq ($(DLSUFFIX), .so)
 CFLAGS_SL = -fpic
 rpath = -Wl,-rpath,$(rpathdir)
-export_dynamic = -export-dynamic
-shlib_symbolic = -Wl,-Bsymbolic
+export_dynamic = -Wl,-export-dynamic
 else
 CFLAGS_SL =
 endif
diff --git a/src/makefiles/Makefile.freebsd b/src/makefiles/Makefile.freebsd
index 8f41ea4d86..e5a489e2a8 100644
--- a/src/makefiles/Makefile.freebsd
+++ b/src/makefiles/Makefile.freebsd
@@ -1,9 +1,8 @@
 AROPT = cr
 
 ifdef ELF_SYSTEM
-export_dynamic = -export-dynamic
-rpath = -R$(rpathdir)
-shlib_symbolic = -Wl,-Bsymbolic -lc
+export_dynamic = -Wl,-export-dynamic
+rpath = -Wl,-R$(rpathdir)
 endif
 
 DLSUFFIX = .so
diff --git a/src/makefiles/Makefile.hpux b/src/makefiles/Makefile.hpux
index f8be012b9f..dc2e3406f6 100644
--- a/src/makefiles/Makefile.hpux
+++ b/src/makefiles/Makefile.hpux
@@ -33,7 +33,6 @@ endif
 
 # set up appropriate options for shared library builds
 export_dynamic = -Wl,-E
-shlib_symbolic = -Bsymbolic
 
 INSTALL_SHLIB_OPTS = -m 555
 
diff --git a/src/makefiles/Makefile.irix b/src/makefiles/Makefile.irix
index 4486ed05e0..162982b6ac 100644
--- a/src/makefiles/Makefile.irix
+++ b/src/makefiles/Makefile.irix
@@ -1,7 +1,6 @@
 MK_NO_LORDER= true
 AROPT = crs
 rpath = -Wl,-rpath,$(rpathdir)
-shlib_symbolic = -Wl,-B,symbolic
 
 DLSUFFIX = .so
 # PIC is default
diff --git a/src/makefiles/Makefile.linux b/src/makefiles/Makefile.linux
index c473214466..6dd9c6ebbb 100644
--- a/src/makefiles/Makefile.linux
+++ b/src/makefiles/Makefile.linux
@@ -1,7 +1,6 @@
 AROPT = crs
 export_dynamic = -Wl,-E
 rpath = -Wl,-rpath,$(rpathdir)
-shlib_symbolic = -Wl,-Bsymbolic
 allow_nonpic_in_shlib = yes
 DLSUFFIX = .so
 
diff --git a/src/makefiles/Makefile.netbsd b/src/makefiles/Makefile.netbsd
index 2b6a1e13fd..b40ed8826e 100644
--- a/src/makefiles/Makefile.netbsd
+++ b/src/makefiles/Makefile.netbsd
@@ -3,9 +3,8 @@ AROPT = cr
 ifdef ELF_SYSTEM
 export_dynamic = -Wl,-E
 rpath = -Wl,-R$(rpathdir)
-shlib_symbolic = -Wl,-Bsymbolic -lc
 else
-rpath = -R$(rpathdir)
+rpath = -Wl,-R$(rpathdir)
 endif
 
 DLSUFFIX = .so
diff --git a/src/makefiles/Makefile.openbsd b/src/makefiles/Makefile.openbsd
index e35739573c..3308834c05 100644
--- a/src/makefiles/Makefile.openbsd
+++ b/src/makefiles/Makefile.openbsd
@@ -2,8 +2,7 @@ AROPT = cr
 
 ifdef ELF_SYSTEM
 export_dynamic = -Wl,-E
-rpath = -R$(rpathdir)
-shlib_symbolic = -Wl,-Bsymbolic
+rpath = -Wl,-R$(rpathdir)
 endif
 
 DLSUFFIX = .so
diff --git a/src/makefiles/Makefile.osf b/src/makefiles/Makefile.osf
index ebd6c30149..912134ea9a 100644
--- a/src/makefiles/Makefile.osf
+++ b/src/makefiles/Makefile.osf
@@ -1,7 +1,7 @@
 AROPT = crs
 DLSUFFIX = .so
 CFLAGS_SL =
-rpath = -rpath $(rpathdir)
+rpath = -Wl,-rpath -Wl,$(rpathdir)
 
 %.so: %.o
 	$(LD) -shared -expect_unresolved '*' -o $@ $<
diff --git a/src/makefiles/Makefile.sco b/src/makefiles/Makefile.sco
index 0d8a7c8b23..05ed940ee3 100644
--- a/src/makefiles/Makefile.sco
+++ b/src/makefiles/Makefile.sco
@@ -1,6 +1,5 @@
 AROPT = cr
 export_dynamic = -Wl,-Bexport
-shlib_symbolic = -Wl,-Bsymbolic
 
 DLSUFFIX = .so
 ifeq ($(GCC), yes)
diff --git a/src/makefiles/Makefile.solaris b/src/makefiles/Makefile.solaris
index 2ff7e28c90..534bf40d09 100644
--- a/src/makefiles/Makefile.solaris
+++ b/src/makefiles/Makefile.solaris
@@ -1,4 +1,4 @@
-# $PostgreSQL: pgsql/src/makefiles/Makefile.solaris,v 1.11 2004/11/19 00:41:39 tgl Exp $
+# $PostgreSQL: pgsql/src/makefiles/Makefile.solaris,v 1.12 2004/12/21 18:47:42 tgl Exp $
 
 AROPT = crs
 
@@ -6,9 +6,8 @@ ifeq ($(with_gnu_ld), yes)
 export_dynamic = -Wl,-E
 rpath = -Wl,-rpath,$(rpathdir)
 else
-rpath = -R$(rpathdir)
+rpath = -Wl,-R$(rpathdir)
 endif
-shlib_symbolic = -Wl,-Bsymbolic
 
 DLSUFFIX = .so
 ifeq ($(GCC), yes)
diff --git a/src/makefiles/Makefile.unixware b/src/makefiles/Makefile.unixware
index 7120601f68..cf446e1c0c 100644
--- a/src/makefiles/Makefile.unixware
+++ b/src/makefiles/Makefile.unixware
@@ -12,7 +12,6 @@ else
 	rpath = -Wl,-R$(rpathdir)
 endif
 endif
-shlib_symbolic = -Wl,-Bsymbolic
 
 DLSUFFIX = .so
 ifeq ($(GCC), yes)