diff options
| author | Richard Levitte <levitte@openssl.org> | 2011-03-20 13:15:37 +0000 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2011-03-20 13:15:37 +0000 |
| commit | 9d57828d66fb86d4e0989862c9c04188c45bb527 (patch) | |
| tree | 05d1f527ac741190b4df06b5309680160ceb9b70 /apps/makeapps.com | |
| parent | 9ed8dee71b5d078924e585d46cee8481ce050e4a (diff) | |
* apps/openssl.c: For VMS, take care of copying argv if needed much earlier,
directly in main(). 'if needed' also includes when argv is a 32 bit
pointer in an otherwise 64 bit environment.
* apps/makeapps.com: When using /POINTER_SIZE=64, try to use the additional
=ARGV, but only if it's supported. Fortunately, DCL is very helpful
telling us in this case.
Diffstat (limited to 'apps/makeapps.com')
| -rw-r--r-- | apps/makeapps.com | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/apps/makeapps.com b/apps/makeapps.com index 4b33f68af0..9611a48bb1 100644 --- a/apps/makeapps.com +++ b/apps/makeapps.com @@ -599,7 +599,27 @@ $ POINTER_SIZE = "/POINTER_SIZE=32" $ ELSE $ IF (P6 .EQS. "64") $ THEN -$ POINTER_SIZE = "/POINTER_SIZE=64=ARGV" +$ POINTER_SIZE = "/POINTER_SIZE=64" +$ SET NOON +$ DEFINE /USER SYS$OUTPUT NL: +$ DEFINE /USER SYS$ERROR NL: +$ CC /POINTER_SIZE=64=ARGV NL: +$ IF ($STATUS .AND. %X0FFF0000) .EQ. %X00030000 +$ THEN +$ ! If we got here, it means DCL complained like this: +$ ! %DCL-W-NOVALU, value not allowed - remove value specification +$ ! \64=\ +$ ! +$ ! If the compiler was run, logicals defined in /USER would +$ ! have been deassigned automatically. However, when DCL +$ ! complains, they aren't, so we do it here (it might be +$ ! unnecessary, but just in case there will be another error +$ ! message further on that we don't want to miss) +$ DEASSIGN/USER SYS$ERROR +$ DEASSIGN/USER SYS$OUTPUT +$ ELSE +$ POINTER_SIZE = POINTER_SIZE + "=ARGV" +$ ENDIF $ ARCHD = ARCH+ "_64" $ LIB32 = "" $ ELSE |