Skip to content

Commit 062ae7d

Browse files
Do not explcitly set GDB's target architecture
GDB does it itself and it works fine in most cases. The user can still set it if really needed for corner cases. For eng/ide/ada_language_server#1590
1 parent cc4b80f commit 062ae7d

File tree

2 files changed

+20
-3
lines changed

2 files changed

+20
-3
lines changed

integration/vscode/ada/src/debugConfigProvider.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,6 @@ export function initializeConfig(main: AdaMain, name?: string): AdaConfig {
182182
type: ADA_DEBUG_BACKEND_TYPE,
183183
name: name ?? (main ? `Ada: Debug main - ${main.mainRelPath()}` : 'Ada: Debugger Launch'),
184184
request: 'launch',
185-
targetArchitecture: process.arch,
186185
cwd: '${workspaceFolder}',
187186
program: main
188187
? `\${workspaceFolder}/${main.execRelPath()}`

integration/vscode/ada/test/general/debug.test.ts

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ suite('Dbg Cfgs', function () {
1919
type: 'cppdbg',
2020
name: 'Ada: Debug main - src/main1.adb',
2121
request: 'launch',
22-
targetArchitecture: 'x64',
2322
cwd: '${workspaceFolder}',
2423
program: '${workspaceFolder}/obj/main1exec' + exe,
2524
stopAtEntry: false,
@@ -33,6 +32,11 @@ suite('Dbg Cfgs', function () {
3332
text: '-enable-pretty-printing',
3433
ignoreFailures: true,
3534
},
35+
{
36+
description: 'Disable questions on multiple matches',
37+
ignoreFailures: false,
38+
text: 'set multiple-symbols cancel',
39+
},
3640
],
3741
miDebuggerPath: getOrFindGdb() ?? '<undefined>',
3842
},
@@ -49,14 +53,18 @@ suite('Dbg Cfgs', function () {
4953
text: '-enable-pretty-printing',
5054
ignoreFailures: true,
5155
},
56+
{
57+
description: 'Disable questions on multiple matches',
58+
ignoreFailures: false,
59+
text: 'set multiple-symbols cancel',
60+
},
5261
],
5362
miDebuggerPath: getOrFindGdb() ?? '<undefined>',
5463
},
5564
{
5665
type: 'cppdbg',
5766
name: 'Ada: Debug main - src/test.adb',
5867
request: 'launch',
59-
targetArchitecture: 'x64',
6068
cwd: '${workspaceFolder}',
6169
program: '${workspaceFolder}/obj/test' + exe,
6270
stopAtEntry: false,
@@ -70,6 +78,11 @@ suite('Dbg Cfgs', function () {
7078
text: '-enable-pretty-printing',
7179
ignoreFailures: true,
7280
},
81+
{
82+
description: 'Disable questions on multiple matches',
83+
ignoreFailures: false,
84+
text: 'set multiple-symbols cancel',
85+
},
7386
],
7487
miDebuggerPath: getOrFindGdb() ?? '<undefined>',
7588
},
@@ -86,6 +99,11 @@ suite('Dbg Cfgs', function () {
8699
text: '-enable-pretty-printing',
87100
ignoreFailures: true,
88101
},
102+
{
103+
description: 'Disable questions on multiple matches',
104+
ignoreFailures: false,
105+
text: 'set multiple-symbols cancel',
106+
},
89107
],
90108
miDebuggerPath: getOrFindGdb() ?? '<undefined>',
91109
},

0 commit comments

Comments
 (0)