@@ -42,7 +42,7 @@ config_setting(
4242 constraint_values = [
4343 "@platforms//os:macos" ,
4444 "@platforms//cpu:arm64" ,
45- ]
45+ ],
4646)
4747
4848config_setting (
@@ -164,25 +164,24 @@ config_setting(
164164filegroup (
165165 name = "headers" ,
166166 srcs = [
167- "Headers/DebugServer2/Base.h" ,
168- "Headers/DebugServer2/Constants.h" ,
169- "Headers/DebugServer2/Types.h" ,
170167 "Headers/DebugServer2/Architecture/CPUState.h" ,
168+ "Headers/DebugServer2/Architecture/RegisterLayout.h" ,
171169 "Headers/DebugServer2/Architecture/Registers.h" ,
172170 "Headers/DebugServer2/Architecture/RegistersDescriptors.h" ,
173- "Headers/DebugServer2/Architecture/RegisterLayout.h" ,
171+ "Headers/DebugServer2/Base.h" ,
172+ "Headers/DebugServer2/Constants.h" ,
174173 "Headers/DebugServer2/Core/BreakpointManager.h" ,
175174 "Headers/DebugServer2/Core/CPUTypes.h" ,
176175 "Headers/DebugServer2/Core/ErrorCodes.h" ,
177176 "Headers/DebugServer2/Core/HardwareBreakpointManager.h" ,
178177 "Headers/DebugServer2/Core/MessageQueue.h" ,
179178 "Headers/DebugServer2/Core/SessionThread.h" ,
180179 "Headers/DebugServer2/Core/SoftwareBreakpointManager.h" ,
181- "Headers/DebugServer2/GDBRemote/Mixins/FileOperationsMixin.h" ,
182- "Headers/DebugServer2/GDBRemote/Mixins/ProcessLaunchMixin.h" ,
183180 "Headers/DebugServer2/GDBRemote/Base.h" ,
184181 "Headers/DebugServer2/GDBRemote/DebugSessionImpl.h" ,
185182 "Headers/DebugServer2/GDBRemote/DummySessionDelegateImpl.h" ,
183+ "Headers/DebugServer2/GDBRemote/Mixins/FileOperationsMixin.h" ,
184+ "Headers/DebugServer2/GDBRemote/Mixins/ProcessLaunchMixin.h" ,
186185 "Headers/DebugServer2/GDBRemote/PacketProcessor.h" ,
187186 "Headers/DebugServer2/GDBRemote/PlatformSessionImpl.h" ,
188187 "Headers/DebugServer2/GDBRemote/ProtocolHelpers.h" ,
@@ -203,6 +202,7 @@ filegroup(
203202 "Headers/DebugServer2/Target/ProcessDecl.h" ,
204203 "Headers/DebugServer2/Target/Thread.h" ,
205204 "Headers/DebugServer2/Target/ThreadBase.h" ,
205+ "Headers/DebugServer2/Types.h" ,
206206 "Headers/DebugServer2/Utils/Backtrace.h" ,
207207 "Headers/DebugServer2/Utils/Bits.h" ,
208208 "Headers/DebugServer2/Utils/CompilerSupport.h" ,
@@ -228,8 +228,8 @@ filegroup(
228228 "Headers/DebugServer2/Architecture/ARM/CPUState.h" ,
229229 "Headers/DebugServer2/Architecture/ARM/SoftwareSingleStep.h" ,
230230 "Headers/DebugServer2/Architecture/ARM64/CPUState.h" ,
231- ":generated_ARM_reigster_definitions_header" ,
232231 ":generated_ARM64_register_definitions_header" ,
232+ ":generated_ARM_reigster_definitions_header" ,
233233 ],
234234 "@platforms//cpu:i386" : [
235235 "Headers/DebugServer2/Architecture/X86/CPUState.h" ,
@@ -240,8 +240,8 @@ filegroup(
240240 "Headers/DebugServer2/Architecture/X86/CPUState.h" ,
241241 "Headers/DebugServer2/Architecture/X86/RegisterCopy.h" ,
242242 "Headers/DebugServer2/Architecture/X86_64/CPUState.h" ,
243- ":generated_X86_register_definitions_header" ,
244243 ":generated_X86_64_register_definitions_header" ,
244+ ":generated_X86_register_definitions_header" ,
245245 ],
246246 "@platforms//cpu:riscv32" : [
247247 "Headers/DebugServer2/Architecture/RISCV/CPUState.h" ,
@@ -321,19 +321,18 @@ filegroup(
321321filegroup (
322322 name = "sources" ,
323323 srcs = [
324- "Sources/main.cpp" ,
325324 "Sources/Architecture/RegisterLayout.cpp" ,
326325 "Sources/Core/BreakpointManager.cpp" ,
327- "Sources/Core/HardwareBreakpointManager.cpp" ,
328- "Sources/Core/SoftwareBreakpointManager.cpp" ,
329326 "Sources/Core/CPUTypes.cpp" ,
330327 "Sources/Core/ErrorCodes.cpp" ,
328+ "Sources/Core/HardwareBreakpointManager.cpp" ,
331329 "Sources/Core/MessageQueue.cpp" ,
332330 "Sources/Core/SessionThread.cpp" ,
333- "Sources/GDBRemote/Mixins/FileOperationsMixin.hpp" ,
334- "Sources/GDBRemote/Mixins/ProcessLaunchMixin.hpp" ,
331+ "Sources/Core/SoftwareBreakpointManager.cpp" ,
335332 "Sources/GDBRemote/DebugSessionImpl.cpp" ,
336333 "Sources/GDBRemote/DummySessionDelegateImpl.cpp" ,
334+ "Sources/GDBRemote/Mixins/FileOperationsMixin.hpp" ,
335+ "Sources/GDBRemote/Mixins/ProcessLaunchMixin.hpp" ,
337336 "Sources/GDBRemote/PacketProcessor.cpp" ,
338337 "Sources/GDBRemote/PlatformSessionImpl.cpp" ,
339338 "Sources/GDBRemote/ProtocolInterpreter.cpp" ,
@@ -351,52 +350,53 @@ filegroup(
351350 "Sources/Utils/Log.cpp" ,
352351 "Sources/Utils/OptParse.cpp" ,
353352 "Sources/Utils/Stringify.cpp" ,
353+ "Sources/main.cpp" ,
354354 ] + select ({
355355 "@platforms//cpu:arm64" : [
356- ":generated_ARM_register_definitions_source" ,
357- ":generated_ARM64_register_definitions_source" ,
358356 "Sources/Architecture/ARM/ARMBranchInfo.cpp" ,
359357 "Sources/Architecture/ARM/SoftwareSingleStep.cpp" ,
360358 "Sources/Architecture/ARM/ThumbBranchInfo.cpp" ,
361359 "Sources/Core/ARM/HardwareBreakpointManager.cpp" ,
362360 "Sources/Core/ARM/SoftwareBreakpointManager.cpp" ,
363361 "Sources/Target/Common/ARM64/ProcessBaseARM64.cpp" ,
362+ ":generated_ARM64_register_definitions_source" ,
363+ ":generated_ARM_register_definitions_source" ,
364364 ],
365365 "@platforms//cpu:armv7" : [
366- ":generated_ARM_register_definitions_source" ,
367366 "Sources/Architecture/ARM/ARMBranchInfo.cpp" ,
368367 "Sources/Architecture/ARM/SoftwareSingleStep.cpp" ,
369368 "Sources/Architecture/ARM/ThumbBranchInfo.cpp" ,
370369 "Sources/Core/ARM/HardwareBreakpointManager.cpp" ,
371370 "Sources/Core/ARM/SoftwareBreakpointManager.cpp" ,
372371 "Sources/Target/Common/ARM/ProcessBaseARM.cpp" ,
372+ ":generated_ARM_register_definitions_source" ,
373373 ],
374374 "@platforms//cpu:i386" : [
375- ":generated_X86_register_definitions_source" ,
376375 "Sources/Core/X86/HardwareBreakpointManager.cpp" ,
377376 "Sources/Core/X86/SoftwareBreakpointManager.cpp" ,
378377 "Sources/Target/Common/X86/ProcessBaseX86.cpp" ,
378+ ":generated_X86_register_definitions_source" ,
379379 ],
380380 "@platforms//cpu:riscv32" : [
381- ":generated_RISCV32_register_definitions_source" ,
382381 "Sources/Architecture/RISCV/SoftwareSingleStep.cpp" ,
383382 "Sources/Core/RISCV/HardwareBreakpointManager.cpp" ,
384383 "Sources/Core/RISCV/SoftwareBreakpointManager.cpp" ,
385384 "Sources/Target/Common/RISCV/ProcessBaseRISCV.cpp" ,
385+ ":generated_RISCV32_register_definitions_source" ,
386386 ],
387387 "@platforms//cpu:riscv64" : [
388- ":generated_RISCV64_register_definitions_source" ,
389388 "Sources/Architecture/RISCV/SoftwareSingleStep.cpp" ,
390389 "Sources/Core/RISCV/HardwareBreakpointManager.cpp" ,
391390 "Sources/Core/RISCV/SoftwareBreakpointManager.cpp" ,
392391 "Sources/Target/Common/RISCV/ProcessBaseRISCV.cpp" ,
392+ ":generated_RISCV64_register_definitions_source" ,
393393 ],
394394 "@platforms//cpu:x86_64" : [
395- ":generated_X86_register_definitions_source" ,
396- ":generated_X86_64_register_definitions_source" ,
397395 "Sources/Core/X86/HardwareBreakpointManager.cpp" ,
398396 "Sources/Core/X86/SoftwareBreakpointManager.cpp" ,
399397 "Sources/Target/Common/X86_64/ProcessBaseX86_64.cpp" ,
398+ ":generated_X86_64_register_definitions_source" ,
399+ ":generated_X86_register_definitions_source" ,
400400 ],
401401 }) + selects .with_or ({
402402 "@platforms//os:windows" : [
@@ -508,7 +508,7 @@ cc_binary(
508508 ],
509509 copts = selects .with_or ({
510510 ("@bazel_tools//tools/cpp:clang-cl" , "@bazel_tools//tools/cpp:msvc" ): [
511- "/std:c++17"
511+ "/std:c++17" ,
512512 ],
513513 "//conditions:default" : ["-std=c++17" ],
514514 }),
0 commit comments