diff options
author | Richard Levitte <levitte@openssl.org> | 2011-03-25 16:21:08 +0000 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2011-03-25 16:21:08 +0000 |
commit | ecff2e5ce197f76355cfe120a98dc7efcc21fc69 (patch) | |
tree | abc629a39ee9a7ed805bef1da2c61d4fe658eeff /test/maketests.com | |
parent | c9d630dab68b51bc8826e822dcf9ef712a916c3a (diff) |
Corrections to the VMS build system.
Submitted by Steven M. Schweda <sms@antinode.info>
Diffstat (limited to 'test/maketests.com')
-rw-r--r-- | test/maketests.com | 59 |
1 files changed, 30 insertions, 29 deletions
diff --git a/test/maketests.com b/test/maketests.com index 1e803a2b5f..9b64cba234 100644 --- a/test/maketests.com +++ b/test/maketests.com @@ -38,11 +38,12 @@ $! P4, if defined, sets a compiler thread NOT needed on OpenVMS 7.1 (and up) $! $! $! P5, if defined, specifies the C pointer size. Ignored on VAX. +$! ("64=ARGV" gives more efficient code with HP C V7.3 or newer.) $! Supported values are: $! -$! "" Compile with default (/NOPOINTER_SIZE) -$! 32 Compile with /POINTER_SIZE=32 (SHORT) -$! 64 Compile with /POINTER_SIZE=64[=ARGV] (LONG[=ARGV]) +$! "" Compile with default (/NOPOINTER_SIZE) +$! 32 Compile with /POINTER_SIZE=32 (SHORT) +$! 64 Compile with /POINTER_SIZE=64[=ARGV] (LONG[=ARGV]) $! (Automatically select ARGV if compiler supports it.) $! 64= Compile with /POINTER_SIZE=64 (LONG). $! 64=ARGV Compile with /POINTER_SIZE=64=ARGV (LONG=ARGV). @@ -537,7 +538,7 @@ $ THEN $! $ IF (P5 .EQS. "32") $ THEN -$ POINTER_SIZE = "/POINTER_SIZE=32" +$ POINTER_SIZE = " /POINTER_SIZE=32" $ ELSE $ POINTER_SIZE = F$EDIT( P5, "COLLAPSE, UPCASE") $ IF ((POINTER_SIZE .EQS. "64") .OR. - @@ -548,32 +549,32 @@ $ ARCHD = ARCH+ "_64" $ LIB32 = "" $ IF (F$EXTRACT( 2, 1, POINTER_SIZE) .EQS. "=") $ THEN -$! Explicit user choice: "64" or "64=ARGV". -$ IF (POINTER_SIZE .EQS. "64=") THEN POINTER_SIZE = "64" +$! Explicit user choice: "64" or "64=ARGV". +$ IF (POINTER_SIZE .EQS. "64=") THEN POINTER_SIZE = "64" $ ELSE -$ SET NOON +$ SET NOON $ DEFINE /USER_MODE SYS$OUTPUT NL: $ DEFINE /USER_MODE SYS$ERROR NL: $ CC /NOLIST /NOOBJECT /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) +$ 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_MODE SYS$ERROR $ DEASSIGN /USER_MODE SYS$OUTPUT -$ ELSE -$ POINTER_SIZE = POINTER_SIZE + "=ARGV" -$ ENDIF -$ SET ON +$ ELSE +$ POINTER_SIZE = POINTER_SIZE + "=ARGV" +$ ENDIF +$ SET ON $ ENDIF -$ POINTER_SIZE = "/POINTER_SIZE=''POINTER_SIZE'" +$ POINTER_SIZE = " /POINTER_SIZE=''POINTER_SIZE'" $ ELSE $! $! Tell The User Entered An Invalid Option. @@ -706,7 +707,7 @@ $ CCDEFS = "TCPIP_TYPE_''P3'" $ IF F$TYPE(USER_CCDEFS) .NES. "" THEN CCDEFS = CCDEFS + "," + USER_CCDEFS $ CCEXTRAFLAGS = "" $ IF F$TYPE(USER_CCFLAGS) .NES. "" THEN CCEXTRAFLAGS = USER_CCFLAGS -$ CCDISABLEWARNINGS = "LONGLONGTYPE,LONGLONGSUFX,FOUNDCR" +$ CCDISABLEWARNINGS = "" !!! "LONGLONGTYPE,LONGLONGSUFX,FOUNDCR" $ IF F$TYPE(USER_CCDISABLEWARNINGS) .NES. "" THEN - CCDISABLEWARNINGS = CCDISABLEWARNINGS + "," + USER_CCDISABLEWARNINGS $! @@ -786,9 +787,9 @@ $! $ CC = "CC" $ IF ARCH.EQS."VAX" .AND. F$TRNLNM("DECC$CC_DEFAULT").NES."/DECC" - THEN CC = "CC /DECC" -$ CC = CC + "/''CC_OPTIMIZE' /''DEBUGGER' /STANDARD=RELAXED"+ - +$ CC = CC + " /''CC_OPTIMIZE' /''DEBUGGER' /STANDARD=RELAXED"+ - "''POINTER_SIZE' /NOLIST /PREFIX=ALL" + - - "/INCLUDE=(''CC_INCLUDES')" + CCEXTRAFLAGS + " /INCLUDE=(''CC_INCLUDES') " + CCEXTRAFLAGS $! $! Define The Linker Options File Name. $! @@ -875,14 +876,14 @@ $ THEN $ CC4DISABLEWARNINGS = "DOLLARID" $ ELSE $ CC4DISABLEWARNINGS = CCDISABLEWARNINGS + ",DOLLARID" -$ CCDISABLEWARNINGS = "/WARNING=(DISABLE=(" + CCDISABLEWARNINGS + "))" +$ CCDISABLEWARNINGS = " /WARNING=(DISABLE=(" + CCDISABLEWARNINGS + "))" $ ENDIF -$ CC4DISABLEWARNINGS = "/WARNING=(DISABLE=(" + CC4DISABLEWARNINGS + "))" +$ CC4DISABLEWARNINGS = " /WARNING=(DISABLE=(" + CC4DISABLEWARNINGS + "))" $ ELSE $ CCDISABLEWARNINGS = "" $ CC4DISABLEWARNINGS = "" $ ENDIF -$ CC = CC + "/DEFINE=(" + CCDEFS + ")" + CCDISABLEWARNINGS +$ CC = CC + " /DEFINE=(" + CCDEFS + ")" + CCDISABLEWARNINGS $! $! Show user the result $! |