From: Rainer Tammer <tammer@tammer.net>
Date: Tue, 2 Dec 2008 11:10:35 +0000 (+0100)
Subject: Unwind change 31976 then apply
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=21efc95700e8bb4aff8b05f9b9541dde292aec92;p=p5sagit%2Fp5-mst-13.2.git

Unwind change 31976 then apply

Subject: Re: 5.8.9 RC1 / 5.10.x / bleed patches for gcc / AIX
Message-ID: <4935099B.8060004@tammer.net>
Date: Tue, 02 Dec 2008 11:10:35 +0100

p4raw-id: //depot/perl@34983
---

diff --git a/Makefile.SH b/Makefile.SH
index 5a2a63f..6a14e4f 100644
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -93,15 +93,30 @@ true)
 		shrpldflags="$shrpldflags -Wl,--image-base,0x57000000"
 		;;
 	aix*)
-		shrpldflags="-H512 -T512 -bhalt:4 -bM:SRE -bE:perl.exp"
-		case "$osvers" in
-		3*)	shrpldflags="$shrpldflags -e _nostart"
+		case "$cc" in
+		gcc*)
+			shrpldflags="-shared -Wl,-H512 -Wl,-T512 -Wl,-bhalt:4 -Wl,-bM:SRE -Wl,-bE:perl.exp"
+			case "$osvers" in
+			3*)	shrpldflags="$shrpldflags -e _nostart"
+				;;
+			*)	shrpldflags="$shrpldflags -Wl,-bnoentry"
+				;;
+			esac
+			shrpldflags="$shrpldflags $ldflags $perllibs $cryptlib"
+			linklibperl="-L $archlibexp/CORE -L `pwd | sed 's/\/UU$//'` -lperl"
 			;;
-		*)	shrpldflags="$shrpldflags -bnoentry"
+		*)
+			shrpldflags="-H512 -T512 -bhalt:4 -bM:SRE -bE:perl.exp"
+			case "$osvers" in
+			3*)	shrpldflags="$shrpldflags -e _nostart"
+				;;
+			*)	shrpldflags="$shrpldflags -b noentry"
+				;;
+			esac
+			shrpldflags="$shrpldflags $ldflags $perllibs $cryptlib"
+			linklibperl="-L $archlibexp/CORE -L `pwd | sed 's/\/UU$//'` -lperl"
 			;;
 		esac
-	        shrpldflags="$shrpldflags $ldflags $perllibs $cryptlib"
-		linklibperl="-L $archlibexp/CORE -L `pwd | sed 's/\/UU$//'` -lperl"
 		;;
 	hpux*)
 		linklibperl="-L `pwd | sed 's/\/UU$//'` -Wl,+s -Wl,+b$archlibexp/CORE -lperl"