diff options
| author | Richard Levitte <levitte@openssl.org> | 2017-03-15 17:10:48 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2017-03-15 17:16:37 +0100 |
| commit | a2880aec7314823ce1df48c501d8c5c2a0456918 (patch) | |
| tree | be07a34eb7a3a9746b56a5a89bfb48bc4e9833bf | |
| parent | d1da335c5514f9ba8b5115faab208a8046a5bc56 (diff) | |
VMS: turning off CALL_DEBUG isn't possible on Alpha
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2962)
| -rw-r--r-- | Configurations/descrip.mms.tmpl | 21 | ||||
| -rw-r--r-- | NOTES.VMS | 8 |
2 files changed, 22 insertions, 7 deletions
diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl index 166c6c6a40..b6eb94a580 100644 --- a/Configurations/descrip.mms.tmpl +++ b/Configurations/descrip.mms.tmpl @@ -661,7 +661,7 @@ EOF $x =~ s|(\.OLB)|$1/LIB|; "WRITE OPT_FILE \"$x\"" } @deps) || "\@ !"; - return <<"EOF"; + return <<"EOF" $shlib.EXE : $lib.OLB $deps $ordinalsfile \$(PERL) $mkdef_pl "$mkdef_key" "VMS" > $shlib.SYMVEC-tmp \$(PERL) $translatesyms_pl \$(BLDDIR)CXX\$DEMANGLER_DB. < $shlib.SYMVEC-tmp > $shlib.SYMVEC @@ -673,10 +673,13 @@ $shlib.EXE : $lib.OLB $deps $ordinalsfile $write_opt CLOSE OPT_FILE LINK \$(LDFLAGS)/SHARE=\$\@ $shlib.OPT/OPT \$(EX_LIBS) - SET IMAGE/FLAGS=(NOCALL_DEBUG) \$\@ DELETE $shlib.SYMVEC;* PURGE $shlib.EXE,$shlib.OPT,$shlib.MAP EOF + . ($config{target} =~ m|alpha| ? "" : <<"EOF" + SET IMAGE/FLAGS=(NOCALL_DEBUG) \$\@ +EOF + ); } sub obj2dso { my %args = @_; @@ -705,7 +708,7 @@ EOF $x =~ s|(\.OLB)|$1/LIB|; "WRITE OPT_FILE \"$x\"" } @deps) || "\@ !"; - return <<"EOF"; + return <<"EOF" $lib.EXE : $deps OPEN/WRITE/SHARE=READ OPT_FILE $lib.OPT TYPE $engine_opt /OUTPUT=OPT_FILE: @@ -713,9 +716,12 @@ $lib.EXE : $deps $write_opt2 CLOSE OPT_FILE LINK \$(LDFLAGS)/SHARE=\$\@ $lib.OPT/OPT \$(EX_LIBS) - SET IMAGE/FLAGS=(NOCALL_DEBUG) \$\@ - PURGE $lib.EXE,$lib.OPT,$lib.MAP EOF + . ($config{target} =~ m|alpha| ? "" : <<"EOF" + SET IMAGE/FLAGS=(NOCALL_DEBUG) \$\@ +EOF + ); } sub obj2lib { my %args = @_; @@ -770,7 +776,7 @@ EOF # by default), and so someone building doesn't have to worry where it # isn't necessary. If there are other warnings, however, we show them # and let it break the build. - return <<"EOF"; + return <<"EOF" $bin.EXE : $deps OPEN/WRITE/SHARE=READ OPT_FILE $bin.OPT $write_opt1 @@ -795,9 +801,12 @@ $bin.EXE : $deps -@ IF .NOT. link_severity THEN TYPE $bin.LINKLOG -@ DELETE $bin.LINKLOG;* @ IF .NOT. link_severity THEN SPAWN/WAIT/NOLOG EXIT 'link_status' - SET IMAGE/FLAGS=(NOCALL_DEBUG) $bin.EXE - PURGE $bin.EXE,$bin.OPT EOF + . ($config{target} =~ m|alpha| ? "" : <<"EOF" + SET IMAGE/FLAGS=(NOCALL_DEBUG) \$\@ +EOF + ); } sub in2script { my %args = @_; @@ -64,13 +64,19 @@ prompt. Unfortunately, this disrupts all other uses, such as running test programs in the test framework. + Generally speaking, if you build for debugging, only use the programs + directly for debugging. Do not try to use them from a script, such + as running the test suite. + + *The following is not available on Alpha* + As a compromise, we're turning off the flag that makes the debugger start automatically. If there is a program that you need to debug, you need to turn that flag back on first, for example: $ set image /flag=call_debug [.test]evp_test.exe - Then just run it and you will find yourself in a debuggin session. + Then just run it and you will find yourself in a debugging session. When done, we recomment that you turn that flag back off: $ set image /flag=nocall_debug [.test]evp_test.exe |