From: David Edelsohn <edelsohn@gnu.org>
Date: Thu, 13 Mar 2008 19:08:16 +0000 (+0000)
Subject: shlibpath.m4: Add AIX 6 support.
X-Git-Tag: prereleases/gcc-4.2.4-rc1~79
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74284b0b75525a0c7ba1b56e7f2788e623f41746;p=thirdparty%2Fgcc.git

shlibpath.m4: Add AIX 6 support.

2008-01-24  David Edelsohn  <edelsohn@gnu.org>

        * shlibpath.m4: Add AIX 6 support.
        * configure: Regenerate.

From-SVN: r133185
---

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 1e76e6a27e9d..b2944a7f0d2d 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,11 @@
+2008-03-13  David Edelsohn  <edelsohn@gnu.org>
+
+	Backport from mainline:
+	2008-01-24  David Edelsohn  <edelsohn@gnu.org>
+
+	* shlibpath.m4: Add AIX 6 support.
+	* configure: Regenerate.
+
 2008-02-01  Release Manager
 
 	* GCC 4.2.3 released.
diff --git a/libjava/configure b/libjava/configure
index c987edc73787..7b6b89cc04cf 100755
--- a/libjava/configure
+++ b/libjava/configure
@@ -4375,7 +4375,7 @@ aix3*)
   soname_spec='${libname}${release}${shared_ext}$major'
   ;;
 
-aix4* | aix5*)
+aix[4-9]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
diff --git a/libjava/shlibpath.m4 b/libjava/shlibpath.m4
index 4bdd362ff5e0..7fada302420d 100644
--- a/libjava/shlibpath.m4
+++ b/libjava/shlibpath.m4
@@ -71,7 +71,7 @@ aix3*)
   soname_spec='${libname}${release}${shared_ext}$major'
   ;;
 
-aix4* | aix5*)
+aix[4-9]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no