diff options
| author | Richard Levitte <levitte@openssl.org> | 2017-03-14 22:00:13 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2017-03-14 22:27:17 +0100 |
| commit | 2de2df7fe8986e6e25afa72a5fe6a92272eaa4ff (patch) | |
| tree | 2c94c7e8980c85e51490205ba43c46899e9b4908 | |
| parent | 22df22e7c3de7e577bbf4db04e21def38b303c8e (diff) | |
VMS: Change debug linking method to generate a separate Debug Symbol File
That makes it possible to run images without automagically ending up
in a debug session, while still being able to debug when required.
All .DSF files must reside in the same directory to be useful.
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2947)
| -rw-r--r-- | Configurations/10-main.conf | 4 | ||||
| -rw-r--r-- | Configurations/descrip.mms.tmpl | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf index 91dd65f6e1..c3d2e94792 100644 --- a/Configurations/10-main.conf +++ b/Configurations/10-main.conf @@ -1785,8 +1785,8 @@ sub vms_info { debug => "/NOOPTIMIZE/DEBUG", release => "/OPTIMIZE/NODEBUG"), defines => add("OPENSSL_USE_NODELETE"), - lflags => picker(default => "/MAP", - debug => "/DEBUG/TRACEBACK", + lflags => picker(default => "/MAP='F\$PARSE(\".MAP\",\"\$\@\")'", + debug => "/DSF='F\$PARSE(\"\$(BLDDIR).DSF\",\"\$\@\")'/TRACEBACK", release => "/NODEBUG/NOTRACEBACK"), lib_cflags => add("/NAMES=(AS_IS,SHORTENED)/EXTERN_MODEL=STRICT_REFDEF"), # no_inst_bin_cflags is used instead of bin_cflags by descrip.mms.tmpl diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl index cde5144a69..a57188d86f 100644 --- a/Configurations/descrip.mms.tmpl +++ b/Configurations/descrip.mms.tmpl @@ -314,11 +314,11 @@ uninstall : uninstall_docs uninstall_sw # use $(LIBS), $(PROGRAMS), $(GENERATED) and $(ENGINES)directly. libclean : {- join("\n\t", map { "- DELETE $_.OLB;*" } @{$unified_info{libraries}}) || "@ !" -} - {- join("\n\t", map { "- DELETE $_.EXE;*,$_.MAP;*,$_.OPT;*" } @shlibs) || "@ !" -} + {- join("\n\t", map { "- DELETE $_.EXE;*,$_.DSF;*,$_.MAP;*,$_.OPT;*" } @shlibs) || "@ !" -} clean : libclean - {- join("\n\t", map { "- DELETE $_.EXE;*,$_.OPT;*" } @{$unified_info{programs}}) || "@ !" -} - {- join("\n\t", map { "- DELETE $_.EXE;*,$_.OPT;*" } @{$unified_info{engines}}) || "@ !" -} + {- join("\n\t", map { "- DELETE $_.EXE;*,$_.DSF;*,$_.OPT;*" } @{$unified_info{programs}}) || "@ !" -} + {- join("\n\t", map { "- DELETE $_.EXE;*,$_.DSF;*,$_.OPT;*" } @{$unified_info{engines}}) || "@ !" -} {- join("\n\t", map { "- DELETE $_;*" } @{$unified_info{scripts}}) || "@ !" -} {- join("\n\t", map { "- DELETE $_;*" } @generated) || "@ !" -} - DELETE [...]*.MAP;* @@ -672,7 +672,7 @@ $shlib.EXE : $lib.OLB $deps $ordinalsfile WRITE OPT_FILE "$lib.OLB/LIBRARY" $write_opt CLOSE OPT_FILE - LINK /MAP=$shlib.MAP /FULL/SHARE=$shlib.EXE $shlib.OPT/OPT \$(EX_LIBS) + LINK \$(LDFLAGS)/SHARE=\$\@ $shlib.OPT/OPT \$(EX_LIBS) DELETE $shlib.SYMVEC;* PURGE $shlib.EXE,$shlib.OPT,$shlib.MAP EOF @@ -711,7 +711,7 @@ $lib.EXE : $deps $write_opt1 $write_opt2 CLOSE OPT_FILE - LINK /MAP=$lib.MAP /FULL/SHARE=$lib.EXE $lib.OPT/OPT \$(EX_LIBS) + LINK \$(LDFLAGS)/SHARE=\$\@ $lib.OPT/OPT \$(EX_LIBS) - PURGE $lib.EXE,$lib.OPT,$lib.MAP EOF } @@ -775,7 +775,7 @@ $bin.EXE : $deps $write_opt2 CLOSE OPT_FILE - pipe SPAWN/WAIT/NOLOG/OUT=$bin.LINKLOG - - LINK/EXEC=$bin.EXE \$(LDFLAGS) $bin.OPT/OPT \$(EX_LIBS) ; - + LINK \$(LDFLAGS)/EXEC=\$\@ $bin.OPT/OPT \$(EX_LIBS) ; - link_status = \$status ; link_severity = link_status .AND. 7 @ search_severity = 1 -@ IF link_severity .EQ. 0 THEN - |