ELT-patches/aixrtl: support new soname-enabled shared library style with (shr.o) archive member (#213277)

25 files changed, 28 insertions, 179 deletions

diff --git a/eclass/ELT-patches/aixrtl/1.4d-cmds-c b/eclass/ELT-patches/aixrtl/1.4d-cmds-c
index ec1c8cd7381c..1311c16ccecf 100644
--- a/eclass/ELT-patches/aixrtl/1.4d-cmds-c
+++ b/eclass/ELT-patches/aixrtl/1.4d-cmds-c
@@ -3,7 +3,7 @@
 @@ -4678,5 +4688,5 @@
         hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
 -	archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-+	archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"'~${STRIP} -e $output_objdir/$soname~{ echo "#!$soname"; cat $export_symbols; } > $output_objdir/$libname.imp~$RM $output_objdir/$realname; $AR $AR_FLAGS $output_objdir/$realname $output_objdir/$libname.imp $output_objdir/$soname~set dummy $linknames; linknames=; shift; '"while eval 'test \$''# -gt 0'; do eval 'test \"x\$''1\" = \"x\$soname\"' || eval 'linknames=\"\$''linknames \$''1\"'; shift; done"
++	archive_expsym_cmds="\$CC"' -o $output_objdir/$realname ${wl}-soname "${wl}$soname" $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
         else
  	if test "$host_cpu" = ia64; then
  	  hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
diff --git a/eclass/ELT-patches/aixrtl/1.4d-cmds-cxx b/eclass/ELT-patches/aixrtl/1.4d-cmds-cxx
index 1eb99f97bf53..2268b1f12133 100644
--- a/eclass/ELT-patches/aixrtl/1.4d-cmds-cxx
+++ b/eclass/ELT-patches/aixrtl/1.4d-cmds-cxx
@@ -4,7 +4,7 @@
        hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
  
 -      archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-+      archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"'~${STRIP} -e $output_objdir/$soname~{ echo "#!$soname"; cat $export_symbols; } > $output_objdir/$libname.imp~$RM $output_objdir/$realname; $AR $AR_FLAGS $output_objdir/$realname $output_objdir/$libname.imp $output_objdir/$soname~set dummy $linknames; linknames=; shift; '"while eval 'test \$''# -gt 0'; do eval 'test \"x\$''1\" = \"x\$soname\"' || eval 'linknames=\"\$''linknames \$''1\"'; shift; done"
++      archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$realname ${wl}-soname "${wl}$soname" $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
       else
        if test "$host_cpu" = ia64; then
  	hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
diff --git a/eclass/ELT-patches/aixrtl/1.4d-noundef-c b/eclass/ELT-patches/aixrtl/1.4d-noundef-c
deleted file mode 100644
index e4fe86e16810..000000000000
--- a/eclass/ELT-patches/aixrtl/1.4d-noundef-c
+++ /dev/null
@@ -1,9 +0,0 @@
---- configure
-+++ configure
-@@ -4678,5 +4678,5 @@
-       if test "$aix_use_runtimelinking" = yes; then
- 	# Warning - without using the other runtime loading flags (-brtl),
- 	# -berok will link without error, but may produce a broken library.
--	allow_undefined_flag='-berok'
-+	allow_undefined_flag=unsupported
-        # Determine the default libpath from the value encoded in an empty executable.
diff --git a/eclass/ELT-patches/aixrtl/1.4d-noundef-cxx b/eclass/ELT-patches/aixrtl/1.4d-noundef-cxx
deleted file mode 100644
index b997057598ff..000000000000
--- a/eclass/ELT-patches/aixrtl/1.4d-noundef-cxx
+++ /dev/null
@@ -1,9 +0,0 @@
---- configure
-+++ configure
-@@ -2508,5 +2508,5 @@
-     if test "$aix_use_runtimelinking" = yes; then
-       # Warning - without using the other runtime loading flags (-brtl),
-       # -berok will link without error, but may produce a broken library.
--      allow_undefined_flag_CXX='-berok'
-+      allow_undefined_flag_CXX=unsupported
-       # Determine the default libpath from the value encoded in an empty executable.
diff --git a/eclass/ELT-patches/aixrtl/1.4d-postinst b/eclass/ELT-patches/aixrtl/1.4d-postinst
deleted file mode 100644
index cb6de550dc86..000000000000
--- a/eclass/ELT-patches/aixrtl/1.4d-postinst
+++ /dev/null
@@ -1,15 +0,0 @@
---- configure
-+++ configure
-@@ -1029,7 +1029,11 @@
-       # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-       # instead of lib<name>.a to let people know that these are not
-       # typical AIX shared libraries.
--      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+      library_names_spec='${libname}${release}${shared_ext}${versuffix}.a ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+      soname_spec='${libname}${release}${shared_ext}$major'
-+      # we ship the shared object as part of the import archive,
-+      # and unpack the shared object for standalone access.
-+      postinstall_cmds='rm -f $destdir/$dlname~$AR x $destdir/$realname $destdir/$dlname'
-     else
-       # We preserve .a as extension for shared libraries through AIX4.2
-       # and later when we are not doing run time linking.
diff --git a/eclass/ELT-patches/aixrtl/1.4d-sonamespec b/eclass/ELT-patches/aixrtl/1.4d-sonamespec
new file mode 100644
index 000000000000..9cf22d73cf26
--- /dev/null
+++ b/eclass/ELT-patches/aixrtl/1.4d-sonamespec
@@ -0,0 +1,10 @@
+--- configure
++++ configure
+@@ -1029,6 +1029,7 @@
+       # instead of lib<name>.a to let people know that these are not
+       # typical AIX shared libraries.
+       library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++      soname_spec='${libname}${release}${shared_ext}$major(shr.o)'
+     else
+       # We preserve .a as extension for shared libraries through AIX4.2
+       # and later when we are not doing run time linking.
diff --git a/eclass/ELT-patches/aixrtl/1.4d-with-G-gcc b/eclass/ELT-patches/aixrtl/1.4d-with-G-gcc
deleted file mode 100644
index 478685ad4dc9..000000000000
--- a/eclass/ELT-patches/aixrtl/1.4d-with-G-gcc
+++ /dev/null
@@ -1,12 +0,0 @@
---- configure
-+++ configure
-@@ -4657,6 +4657,9 @@
- 	  fi
- 	esac
- 	shared_flag='-shared'
-+	if test "$aix_use_runtimelinking" = yes; then
-+	  shared_flag="$shared_flag "'${wl}-G ${wl}-bernotok'
-+	fi
-       else
- 	# not using gcc
- 	if test "$host_cpu" = ia64; then
diff --git a/eclass/ELT-patches/aixrtl/1.4d-with-G-gxx b/eclass/ELT-patches/aixrtl/1.4d-with-G-gxx
deleted file mode 100644
index 845438416dbe..000000000000
--- a/eclass/ELT-patches/aixrtl/1.4d-with-G-gxx
+++ /dev/null
@@ -1,12 +0,0 @@
---- configure
-+++ configure
-@@ -2487,6 +2487,9 @@
- 	fi
-       esac
-       shared_flag='-shared'
-+      if test "$aix_use_runtimelinking" = yes; then
-+	shared_flag="$shared_flag "'${wl}-G ${wl}-bernotok'
-+      fi
-     else
-       # not using gcc
-       if test "$host_cpu" = ia64; then
diff --git a/eclass/ELT-patches/aixrtl/1.4d-with-G-xlc b/eclass/ELT-patches/aixrtl/1.4d-with-G-xlc
deleted file mode 100644
index cfcfb5baf337..000000000000
--- a/eclass/ELT-patches/aixrtl/1.4d-with-G-xlc
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure
-+++ configure
-@@ -4665,7 +4665,7 @@
- 	  shared_flag='-G'
- 	else
-   	if test "$aix_use_runtimelinking" = yes; then
--	    shared_flag='${wl}-G'
-+	    shared_flag='${wl}-G ${wl}-bernotok'
- 	  else
- 	    shared_flag='${wl}-bM:SRE'
-   	fi
diff --git a/eclass/ELT-patches/aixrtl/1.4d-with-G-xlcxx b/eclass/ELT-patches/aixrtl/1.4d-with-G-xlcxx
deleted file mode 100644
index 8d0959098f22..000000000000
--- a/eclass/ELT-patches/aixrtl/1.4d-with-G-xlcxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure
-+++ configure
-@@ -2495,7 +2495,7 @@
- 	shared_flag='-G'
-       else
- 	if test "$aix_use_runtimelinking" = yes; then
--	  shared_flag='${wl}-G'
-+	  shared_flag='${wl}-G ${wl}-bernotok'
- 	else
- 	  shared_flag='${wl}-bM:SRE'
- 	fi
diff --git a/eclass/ELT-patches/aixrtl/1.5-postinst b/eclass/ELT-patches/aixrtl/1.5-postinst
deleted file mode 100644
index f6212322acc2..000000000000
--- a/eclass/ELT-patches/aixrtl/1.5-postinst
+++ /dev/null
@@ -1,15 +0,0 @@
---- configure
-+++ configure
-@@ -1156,7 +1156,11 @@
-       # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-       # instead of lib<name>.a to let people know that these are not
-       # typical AIX shared libraries.
--      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+      library_names_spec='${libname}${release}${shared_ext}${versuffix}.a ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+      soname_spec='${libname}${release}${shared_ext}$major'
-+      # we ship the shared object as part of the import archive,
-+      # and unpack the shared object for standalone access.
-+      postinstall_cmds='rm -f $destdir/$dlname~$AR x $destdir/$realname $destdir/$dlname'
-     else
-       # We preserve .a as extension for shared libraries through AIX4.2
-       # and later when we are not doing run time linking.
diff --git a/eclass/ELT-patches/aixrtl/1.5-sonamespec b/eclass/ELT-patches/aixrtl/1.5-sonamespec
new file mode 100644
index 000000000000..c55a9eb73c97
--- /dev/null
+++ b/eclass/ELT-patches/aixrtl/1.5-sonamespec
@@ -0,0 +1,10 @@
+--- configure
++++ configure
+@@ -1156,6 +1156,7 @@
+       # instead of lib<name>.a to let people know that these are not
+       # typical AIX shared libraries.
+       library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++      soname_spec='${libname}${release}${shared_ext}$major(shr.o)'
+     else
+       # We preserve .a as extension for shared libraries through AIX4.2
+       # and later when we are not doing run time linking.
diff --git a/eclass/ELT-patches/aixrtl/1.5.12-with-G-gcc b/eclass/ELT-patches/aixrtl/1.5.12-with-G-gcc
deleted file mode 100644
index 7fe024ffd6ff..000000000000
--- a/eclass/ELT-patches/aixrtl/1.5.12-with-G-gcc
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure
-+++ configure
-@@ -5403,7 +5403,7 @@
- 	esac
- 	shared_flag='-shared'
- 	if test "$aix_use_runtimelinking" = yes; then
--	  shared_flag="$shared_flag "'${wl}-G'
-+	  shared_flag="$shared_flag "'${wl}-G ${wl}-bernotok'
- 	fi
-       else
- 	# not using gcc
diff --git a/eclass/ELT-patches/aixrtl/1.5.12-with-G-gxx b/eclass/ELT-patches/aixrtl/1.5.12-with-G-gxx
deleted file mode 100644
index c9db9c1cb5e6..000000000000
--- a/eclass/ELT-patches/aixrtl/1.5.12-with-G-gxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure
-+++ configure
-@@ -2797,7 +2797,7 @@
-       esac
-       shared_flag='-shared'
-       if test "$aix_use_runtimelinking" = yes; then
--	shared_flag="$shared_flag "'${wl}-G'
-+	shared_flag="$shared_flag "'${wl}-G ${wl}-bernotok'
-       fi
-     else
-       # not using gcc
diff --git a/eclass/ELT-patches/aixrtl/1.5.22-cmds-c b/eclass/ELT-patches/aixrtl/1.5.22-cmds-c
index e90153e2b67c..76af9f3cf8bc 100644
--- a/eclass/ELT-patches/aixrtl/1.5.22-cmds-c
+++ b/eclass/ELT-patches/aixrtl/1.5.22-cmds-c
@@ -5,7 +5,7 @@
  
         hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
 -	archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-+	archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"'~${STRIP} -e $output_objdir/$soname~{ echo "#!$soname"; cat $export_symbols; } > $output_objdir/$libname.imp~rm -f $output_objdir/$realname; $AR $AR_FLAGS $output_objdir/$realname $output_objdir/$libname.imp $output_objdir/$soname~set dummy $linknames; linknames=; shift; '"while eval 'test \$''# -gt 0'; do eval 'test \"x\$''1\" = \"x\$soname\"' || eval 'linknames=\"\$''linknames \$''1\"'; shift; done"
++	archive_expsym_cmds="\$CC"' -o $output_objdir/$realname ${wl}-soname "${wl}$soname" $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
         else
  	if test "$host_cpu" = ia64; then
  	  hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
diff --git a/eclass/ELT-patches/aixrtl/1.5.22-cmds-cxx b/eclass/ELT-patches/aixrtl/1.5.22-cmds-cxx
index 5154cd546da4..2b9136ca35b9 100644
--- a/eclass/ELT-patches/aixrtl/1.5.22-cmds-cxx
+++ b/eclass/ELT-patches/aixrtl/1.5.22-cmds-cxx
@@ -4,7 +4,7 @@
        hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
  
 -      archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-+      archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"'~${STRIP} -e $output_objdir/$soname~{ echo "#!$soname"; cat $export_symbols; } > $output_objdir/$libname.imp~$RM $output_objdir/$realname; $AR $AR_FLAGS $output_objdir/$realname $output_objdir/$libname.imp $output_objdir/$soname~set dummy $linknames; linknames=; shift; '"while eval 'test \$''# -gt 0'; do eval 'test \"x\$''1\" = \"x\$soname\"' || eval 'linknames=\"\$''linknames \$''1\"'; shift; done"
++      archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$realname ${wl}-soname "${wl}$soname" $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
       else
        if test "$host_cpu" = ia64; then
  	hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
diff --git a/eclass/ELT-patches/aixrtl/1.5.22-with-G-xlc b/eclass/ELT-patches/aixrtl/1.5.22-with-G-xlc
deleted file mode 100644
index e1dcb9ad5504..000000000000
--- a/eclass/ELT-patches/aixrtl/1.5.22-with-G-xlc
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure
-+++ configure
-@@ -5737,7 +5741,7 @@
- 	  shared_flag='-G'
- 	else
- 	  if test "$aix_use_runtimelinking" = yes; then
--	    shared_flag='${wl}-G'
-+	    shared_flag='${wl}-G ${wl}-bernotok'
- 	  else
- 	    shared_flag='${wl}-bM:SRE'
- 	  fi
diff --git a/eclass/ELT-patches/aixrtl/2.1b-cmds-c b/eclass/ELT-patches/aixrtl/2.1b-cmds-c
index 9ade6c8db785..7abec29bc39d 100644
--- a/eclass/ELT-patches/aixrtl/2.1b-cmds-c
+++ b/eclass/ELT-patches/aixrtl/2.1b-cmds-c
@@ -5,7 +5,7 @@
  
          hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
 -        archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-+        archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"'~${STRIP} -e $output_objdir/$soname~{ echo "#!$soname"; cat $export_symbols; } > $output_objdir/$libname.imp~$RM $output_objdir/$realname; $AR $AR_FLAGS $output_objdir/$realname $output_objdir/$libname.imp $output_objdir/$soname~set dummy $linknames; linknames=; shift; '"while eval 'test \$''# -gt 0'; do eval 'test \"x\$''1\" = \"x\$soname\"' || eval 'func_append linknames \" \$''1\"'; shift; done"
++        archive_expsym_cmds='$CC -o $output_objdir/$realname ${wl}-soname "${wl}$soname" $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
        else
  	if test "$host_cpu" = ia64; then
  	  hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
diff --git a/eclass/ELT-patches/aixrtl/2.1b-cmds-cxx b/eclass/ELT-patches/aixrtl/2.1b-cmds-cxx
index b56facc6a712..78e260017655 100644
--- a/eclass/ELT-patches/aixrtl/2.1b-cmds-cxx
+++ b/eclass/ELT-patches/aixrtl/2.1b-cmds-cxx
@@ -5,7 +5,7 @@
            hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
  
 -          archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-+          archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"'~${STRIP} -e $output_objdir/$soname~{ echo "#!$soname"; cat $export_symbols; } > $output_objdir/$libname.imp~$RM $output_objdir/$realname; $AR $AR_FLAGS $output_objdir/$realname $output_objdir/$libname.imp $output_objdir/$soname~set dummy $linknames; linknames=; shift; '"while eval 'test \$''# -gt 0'; do eval 'test \"x\$''1\" = \"x\$soname\"' || eval 'func_append linknames \" \$''1\"'; shift; done"
++          archive_expsym_cmds_CXX='$CC -o $output_objdir/$realname ${wl}-soname "${wl}$soname" $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
          else
            if test "$host_cpu" = ia64; then
  	    hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
diff --git a/eclass/ELT-patches/aixrtl/2.1b-noundef-c b/eclass/ELT-patches/aixrtl/2.1b-noundef-c
deleted file mode 100644
index d29b123031bb..000000000000
--- a/eclass/ELT-patches/aixrtl/2.1b-noundef-c
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure
-+++ configure
-@@ -4622,7 +4622,7 @@
-       if test "$aix_use_runtimelinking" = yes; then
- 	# Warning - without using the other runtime loading flags (-brtl),
- 	# -berok will link without error, but may produce a broken library.
--	allow_undefined_flag='-berok'
-+	allow_undefined_flag=unsupported
-         # Determine the default libpath from the value encoded in an
-         # empty executable.
-         cat >conftest.$ac_ext <<_ACEOF
diff --git a/eclass/ELT-patches/aixrtl/2.1b-noundef-cxx b/eclass/ELT-patches/aixrtl/2.1b-noundef-cxx
deleted file mode 100644
index d7863daf565b..000000000000
--- a/eclass/ELT-patches/aixrtl/2.1b-noundef-cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure
-+++ configure
-@@ -5567,7 +5567,7 @@
-         if test "$aix_use_runtimelinking" = yes; then
-           # Warning - without using the other runtime loading flags (-brtl),
-           # -berok will link without error, but may produce a broken library.
--          allow_undefined_flag_CXX='-berok'
-+          allow_undefined_flag_CXX=unsupported
-           # Determine the default libpath from the value encoded in an empty
-           # executable.
-           cat >conftest.$ac_ext <<_ACEOF
diff --git a/eclass/ELT-patches/aixrtl/2.1b-with-G-gxx b/eclass/ELT-patches/aixrtl/2.1b-with-G-gxx
deleted file mode 100644
index 04190aa9389f..000000000000
--- a/eclass/ELT-patches/aixrtl/2.1b-with-G-gxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure
-+++ configure
-@@ -5479,7 +5479,7 @@
-           esac
-           shared_flag='-shared'
- 	  if test "$aix_use_runtimelinking" = yes; then
--	    shared_flag="$shared_flag "'${wl}-G'
-+	    shared_flag="$shared_flag "'${wl}-G ${wl}-bernotok'
- 	  fi
-         else
-           # not using gcc
diff --git a/eclass/ELT-patches/aixrtl/2.1b-with-G-xlcxx b/eclass/ELT-patches/aixrtl/2.1b-with-G-xlcxx
deleted file mode 100644
index 8fba1321800c..000000000000
--- a/eclass/ELT-patches/aixrtl/2.1b-with-G-xlcxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure
-+++ configure
-@@ -5554,7 +5554,7 @@
- 	  shared_flag='-G'
-           else
- 	    if test "$aix_use_runtimelinking" = yes; then
--	      shared_flag='${wl}-G'
-+	      shared_flag='${wl}-G ${wl}-bernotok'
- 	    else
- 	      shared_flag='${wl}-bM:SRE'
- 	    fi
diff --git a/eclass/ELT-patches/aixrtl/2.2.8-cmds-c b/eclass/ELT-patches/aixrtl/2.2.8-cmds-c
index 1ddbbbced869..9853548ed2dd 100644
--- a/eclass/ELT-patches/aixrtl/2.2.8-cmds-c
+++ b/eclass/ELT-patches/aixrtl/2.2.8-cmds-c
@@ -5,7 +5,7 @@
  
          hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
 -        archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-+        archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"'~${STRIP} -e $output_objdir/$soname~{ echo "#!$soname"; cat $export_symbols; } > $output_objdir/$libname.imp~$RM $output_objdir/$realname; $AR $AR_FLAGS $output_objdir/$realname $output_objdir/$libname.imp $output_objdir/$soname~set dummy $linknames; linknames=; shift; '"while eval 'test \$''# -gt 0'; do eval 'test \"x\$''1\" = \"x\$soname\"' || eval 'func_append linknames \" \$''1\"'; shift; done"
++        archive_expsym_cmds='$CC -o $output_objdir/$realname ${wl}-soname "${wl}$soname" $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
        else
  	if test "$host_cpu" = ia64; then
  	  hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
diff --git a/eclass/ELT-patches/aixrtl/2.2.8-cmds-cxx b/eclass/ELT-patches/aixrtl/2.2.8-cmds-cxx
index 0791bcc2fbaa..8ea6e81712eb 100644
--- a/eclass/ELT-patches/aixrtl/2.2.8-cmds-cxx
+++ b/eclass/ELT-patches/aixrtl/2.2.8-cmds-cxx
@@ -5,7 +5,7 @@
            hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
  
 -          archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-+          archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"'~${STRIP} -e $output_objdir/$soname~{ echo "#!$soname"; cat $export_symbols; } > $output_objdir/$libname.imp~$RM $output_objdir/$realname; $AR $AR_FLAGS $output_objdir/$realname $output_objdir/$libname.imp $output_objdir/$soname~set dummy $linknames; linknames=; shift; '"while eval 'test \$''# -gt 0'; do eval 'test \"x\$''1\" = \"x\$soname\"' || eval 'func_append linknames \" \$''1\"'; shift; done"
++          archive_expsym_cmds_CXX='$CC -o $output_objdir/$realname ${wl}-soname "${wl}$soname" $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
          else
            if test "$host_cpu" = ia64; then
  	    hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'