Use a unified libgcc rather than a seperate one for threaded and

non-threaded programs.  This provides threaded programs with the
needed exception frame symbols.

parts submitted by:	Max Khon <fjoe@iclub.nsu.ru>
PR:	23252

9 files changed, 14 insertions, 18 deletions

diff --git a/lib/libpam/modules/pam_cleartext_pass_ok/Makefile b/lib/libpam/modules/pam_cleartext_pass_ok/Makefile
index 1c39ce9..be964816 100644
--- a/lib/libpam/modules/pam_cleartext_pass_ok/Makefile
+++ b/lib/libpam/modules/pam_cleartext_pass_ok/Makefile
@@ -31,8 +31,8 @@ SHLIB_NAME=	pam_cleartext_pass_ok.so
 SRCS=		pam_cleartext_pass_ok.c
 CFLAGS+=	-I${PAMDIR}/libpam/include
 CFLAGS+=	-Wall
-DPADD=		${LIBSKEY} ${LIBGCC_PIC}
-LDADD=		-lskey -lgcc_pic
+DPADD=		${LIBSKEY}
+LDADD=		-lskey
 INTERNALLIB=	yes
 INTERNALSTATICLIB=yes
 
diff --git a/lib/libpam/modules/pam_deny/Makefile b/lib/libpam/modules/pam_deny/Makefile
index 17b1447..9374a40 100644
--- a/lib/libpam/modules/pam_deny/Makefile
+++ b/lib/libpam/modules/pam_deny/Makefile
@@ -33,8 +33,6 @@ SHLIB_NAME=	pam_deny.so
 SRCS=		pam_deny.c
 CFLAGS+=	-Wall
 CFLAGS+=	-I${PAMDIR}/libpam/include
-DPADD+=		${LIBGCC_PIC}
-LDADD+=		-lgcc_pic
 INTERNALLIB=	yes
 INTERNALSTATICLIB=yes
 
diff --git a/lib/libpam/modules/pam_kerberosIV/Makefile b/lib/libpam/modules/pam_kerberosIV/Makefile
index b487946..6b4f124 100644
--- a/lib/libpam/modules/pam_kerberosIV/Makefile
+++ b/lib/libpam/modules/pam_kerberosIV/Makefile
@@ -39,8 +39,8 @@ LDADD+=		-lkrb
 DPADD+=		${LIBCRYPTO}
 LDADD+=		-lcrypto
 .endif
-DPADD+=		${LIBGCC_PIC} ${LIBCOM_ERR}
-LDADD+=		-lgcc_pic -lcom_err
+DPADD+=		${LIBCOM_ERR}
+LDADD+=		-lcom_err
 INTERNALLIB=	yes
 INTERNALSTATICLIB=yes
 
diff --git a/lib/libpam/modules/pam_opie/Makefile b/lib/libpam/modules/pam_opie/Makefile
index 4b7c0e2..64723cc 100644
--- a/lib/libpam/modules/pam_opie/Makefile
+++ b/lib/libpam/modules/pam_opie/Makefile
@@ -33,8 +33,8 @@ SRCS=		pam_opie.c
 CFLAGS+=	-Wall -g
 CFLAGS+=	-I${PAMDIR}/libpam/include
 CFLAGS+=	-I${.CURDIR}/../../libpam
-DPADD+=		${LIBOPIE} ${LIBGCC_PIC}
-LDADD+=		-lopie -lgcc_pic
+DPADD+=		${LIBOPIE}
+LDADD+=		-lopie
 INTERNALLIB=	yes
 INTERNALSTATICLIB=yes
 
diff --git a/lib/libpam/modules/pam_permit/Makefile b/lib/libpam/modules/pam_permit/Makefile
index 8863ff5..0c254fe 100644
--- a/lib/libpam/modules/pam_permit/Makefile
+++ b/lib/libpam/modules/pam_permit/Makefile
@@ -34,8 +34,6 @@ SRCS=		pam_permit.c
 CFLAGS+=	-Wall
 CFLAGS+=	-I${PAMDIR}/libpam/include
 CFLAGS+=	-I${.CURDIR}/../../libpam
-DPADD+=		${LIBGCC_PIC}
-LDADD+=		-lgcc_pic
 INTERNALLIB=	yes
 INTERNALSTATICLIB=yes
 
diff --git a/lib/libpam/modules/pam_radius/Makefile b/lib/libpam/modules/pam_radius/Makefile
index 48bd39a..25cb860 100644
--- a/lib/libpam/modules/pam_radius/Makefile
+++ b/lib/libpam/modules/pam_radius/Makefile
@@ -32,8 +32,8 @@ SRCS=		pam_radius.c
 CFLAGS+=	-Wall
 CFLAGS+=	-I${PAMDIR}/libpam/include
 CFLAGS+=	-I${.CURDIR}/../../libpam
-DPADD+=		${LIBRADIUS} ${LIBGCC_PIC}
-LDADD+=		-lradius -lgcc_pic
+DPADD+=		${LIBRADIUS}
+LDADD+=		-lradius
 INTERNALLIB=    yes
 INTERNALSTATICLIB=yes
 
diff --git a/lib/libpam/modules/pam_skey/Makefile b/lib/libpam/modules/pam_skey/Makefile
index bf6af9e..9ae24b1 100644
--- a/lib/libpam/modules/pam_skey/Makefile
+++ b/lib/libpam/modules/pam_skey/Makefile
@@ -32,8 +32,8 @@ SRCS=		pam_skey.c
 CFLAGS+=	-Wall
 CFLAGS+=	-I${PAMDIR}/libpam/include
 CFLAGS+=	-I${.CURDIR}/../../libpam
-DPADD+=		${LIBSKEY} ${LIBGCC_PIC}
-LDADD+=		-lskey -lgcc_pic
+DPADD+=		${LIBSKEY}
+LDADD+=		-lskey
 INTERNALLIB=	yes
 INTERNALSTATICLIB=yes
 
diff --git a/lib/libpam/modules/pam_tacplus/Makefile b/lib/libpam/modules/pam_tacplus/Makefile
index 6430ca8..3c812c4 100644
--- a/lib/libpam/modules/pam_tacplus/Makefile
+++ b/lib/libpam/modules/pam_tacplus/Makefile
@@ -32,8 +32,8 @@ SRCS=		pam_tacplus.c
 CFLAGS+=	-Wall
 CFLAGS+=	-I${PAMDIR}/libpam/include
 CFLAGS+=	-I${.CURDIR}/../../libpam
-DPADD+=		${LIBTACPLUS} ${LIBGCC_PIC}
-LDADD+=		-ltacplus -lgcc_pic
+DPADD+=		${LIBTACPLUS}
+LDADD+=		-ltacplus
 INTERNALLIB=	yes
 INTERNALSTATICLIB=yes
 
diff --git a/lib/libpam/modules/pam_unix/Makefile b/lib/libpam/modules/pam_unix/Makefile
index 7ef7ce3..4b6aade 100644
--- a/lib/libpam/modules/pam_unix/Makefile
+++ b/lib/libpam/modules/pam_unix/Makefile
@@ -32,8 +32,8 @@ SRCS=		pam_unix.c
 CFLAGS+=	-Wall
 CFLAGS+=	-I${PAMDIR}/libpam/include
 CFLAGS+=	-I${.CURDIR}/../../libpam
-DPADD+=		${LIBUTIL} ${LIBGCC_PIC} ${LIBCRYPT}
-LDADD+=		-lutil -lgcc_pic -lcrypt
+DPADD+=		${LIBUTIL} ${LIBCRYPT}
+LDADD+=		-lutil -lcrypt
 INTERNALLIB=	yes
 INTERNALSTATICLIB=yes