1diff -ru a/nspr/configure b/nspr/configure
2--- a/a/nspr/configure	2014-09-29 16:47:42.984012225 +0100
3+++ b/b/nspr/configure	2014-09-29 16:50:33.907375937 +0100
4@@ -6369,7 +6369,6 @@
5         AIX_LINK_OPTS='-brtl -bnso -berok'
6         ;;
7     esac
8-    CFLAGS="$CFLAGS -qro -qroconst"
9     AIX_WRAP='$(DIST)/lib/aixwrap.o'
10     AIX_TMP='./_aix_tmp.o'
11     if test -n "$USE_64"; then
12diff -ru a/nspr/configure.in b/nspr/configure.in
13--- a/a/nspr/configure.in	2014-09-29 16:46:35.257394860 +0100
14+++ b/b/nspr/configure.in	2014-09-29 16:50:33.908375942 +0100
15@@ -1229,7 +1229,8 @@
16     AC_DEFINE(XP_UNIX)
17     AC_DEFINE(AIX)
18     AC_DEFINE(SYSV)
19-    DSO_LDOPTS='-brtl -bnortllib -bM:SRE -bnoentry -bexpall -blibpath:/usr/lib:/lib'
20+    DSO_LDOPTS='-Wl,-brtl -Wl,-bnortllib -Wl,-blibpath:/usr/lib:/lib'
21+    MKSHLIB='$(CCC) -shared $(DSO_LDOPTS) -o $@'
22     AC_CHECK_HEADER(sys/atomic_op.h, AC_DEFINE(AIX_HAVE_ATOMIC_OP_H))
23     case "${target_os}" in
24     aix3.2*)
25@@ -1269,10 +1270,9 @@
26         AC_DEFINE(HAVE_SOCKLEN_T)
27         AC_DEFINE(HAVE_FCNTL_FILE_LOCKING)
28         USE_IPV6=1
29-        AIX_LINK_OPTS='-brtl -bnso -berok'
30+        AIX_LINK_OPTS='-Wl,-brtl -Wl,-bnso -Wl,-berok'
31         ;;
32     esac
33-    CFLAGS="$CFLAGS -qro -qroconst"
34     AIX_WRAP='$(DIST)/lib/aixwrap.o'
35     AIX_TMP='./_aix_tmp.o'
36     if test -n "$USE_64"; then
37diff -ru a/nspr/pr/src/Makefile.in b/nspr/pr/src/Makefile.in
38--- a/a/nspr/pr/src/Makefile.in	2014-09-29 16:46:35.281395079 +0100
39+++ b/b/nspr/pr/src/Makefile.in	2014-09-29 16:50:33.909375948 +0100
40@@ -74,7 +74,6 @@
41 endif	# SunOS
42
43 ifeq ($(OS_ARCH),AIX)
44-DSO_LDOPTS	+= -binitfini::_PR_Fini
45 OS_LIBS		= -lodm -lcfg
46 ifeq ($(CLASSIC_NSPR),1)
47 ifeq ($(OS_RELEASE),4.1)
48diff -ru a/nss/cmd/platlibs.mk b/nss/cmd/platlibs.mk
49--- a/a/nss/cmd/platlibs.mk	2014-09-29 16:47:42.987012253 +0100
50+++ b/b/nss/cmd/platlibs.mk	2014-09-29 16:50:33.910375955 +0100
51@@ -134,7 +134,7 @@
52 	$(NULL)
53
54 ifeq ($(OS_ARCH), AIX)
55-EXTRA_SHARED_LIBS += -brtl
56+EXTRA_SHARED_LIBS += -Wl,-brtl
57 endif
58
59 # $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS)
60@@ -180,7 +180,7 @@
61 	$(NULL)
62
63 ifeq ($(OS_ARCH), AIX)
64-EXTRA_SHARED_LIBS += -brtl
65+EXTRA_SHARED_LIBS += -Wl,-brtl
66 endif
67
68 # $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS)
69diff -ru a/nss/cmd/shlibsign/Makefile b/nss/cmd/shlibsign/Makefile
70--- a/a/nss/cmd/shlibsign/Makefile	2014-09-29 16:46:35.139393785 +0100
71+++ b/b/nss/cmd/shlibsign/Makefile	2014-09-29 16:50:33.910375955 +0100
72@@ -43,6 +43,9 @@
73
74 endif
75
76+ifeq ($(OS), AIX)
77+EXTRA_SHARED_LIBS += -lpthreads
78+endif
79
80 # sign any and all shared libraries that contain the word freebl
81 ifeq ($(NSS_BUILD_WITHOUT_SOFTOKEN),1)
82diff -ru a/nss/cmd/shlibsign/mangle/Makefile b/nss/cmd/shlibsign/mangle/Makefile
83--- a/a/nss/cmd/shlibsign/mangle/Makefile	2014-09-29 16:46:35.139393785 +0100
84+++ b/b/nss/cmd/shlibsign/mangle/Makefile	2014-09-29 16:50:33.910375955 +0100
85@@ -43,7 +43,9 @@
86
87 endif
88
89-
90+ifeq ($(OS), AIX)
91+EXTRA_SHARED_LIBS += -lpthreads
92+endif
93
94 #######################################################################
95 # (5) Execute "global" rules. (OPTIONAL)                              #
96diff -ru a/nss/coreconf/AIX.mk b/nss/coreconf/AIX.mk
97--- a/a/nss/coreconf/AIX.mk	2014-09-29 16:46:35.040392883 +0100
98+++ b/b/nss/coreconf/AIX.mk	2014-09-29 16:50:33.909375948 +0100
99@@ -30,35 +30,30 @@
100
101 DEFAULT_COMPILER = xlc_r
102
103-CC		= xlc_r
104-CCC		= xlC_r
105+CCC		= $(CXX)
106
107 CPU_ARCH	= rs6000
108
109 RANLIB		= ranlib
110
111 OS_CFLAGS	= -DAIX -DSYSV
112-OS_LIBS 	+= -blibpath:/usr/lib:/lib -lc -lm
113+OS_LIBS 	+= -Wl,-blibpath:/usr/lib:/lib -lc -lm
114
115-DSO_LDOPTS	= -brtl -bnortllib -bM:SRE -bnoentry
116-MKSHLIB 	= $(LD) $(DSO_LDOPTS) -blibpath:/usr/lib:/lib -lc -lm
117+DSO_LDOPTS	= -Wl,-brtl -Wl,-bnortllib
118+MKSHLIB 	= $(CC) --shared $(DSO_LDOPTS) -Wl,-blibpath:/usr/lib:/lib -lc -lm
119
120 AIX_WRAP	= $(DIST)/lib/aixwrap.o
121 AIX_TMP		= $(OBJDIR)/_aix_tmp.o
122
123 ifdef MAPFILE
124-DSO_LDOPTS	+= -bexport:$(MAPFILE)
125+DSO_LDOPTS	+= -Wl,-bexport:$(MAPFILE)
126 else
127-DSO_LDOPTS	+= -bexpall
128+DSO_LDOPTS	+= -Wl,-bexpall
129 endif
130
131 PROCESS_MAP_FILE = grep -v ';+' $< | grep -v ';-' | \
132                 sed -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,,' > $@
133
134-ifdef BUILD_OPT
135-	OPTIMIZER += -qmaxmem=-1
136-endif
137-
138 ifeq ($(USE_64), 1)
139 	OS_CFLAGS	+= -DAIX_64BIT
140 	OBJECT_MODE=64
141