From 9f443034ba5510b73a87f0631f0bf6592221984e Mon Sep 17 00:00:00 2001
From: rokath <th@seerose.net>
Date: Sat, 23 Dec 2023 16:56:29 +0100
Subject: [PATCH] Adapted to Debian

---
 examples/vsCode_Nucleo-G0B1_instrumented/Makefile    |  9 +++++----
 examples/vsCode_Nucleo-G0B1_instrumented/clang0.mak  | 10 ++++++----
 .../gccLinksClangWarning.txt                         | 12 ++----------
 3 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/examples/vsCode_Nucleo-G0B1_instrumented/Makefile b/examples/vsCode_Nucleo-G0B1_instrumented/Makefile
index 07a37ebad..1a62d2f59 100644
--- a/examples/vsCode_Nucleo-G0B1_instrumented/Makefile
+++ b/examples/vsCode_Nucleo-G0B1_instrumented/Makefile
@@ -1,10 +1,11 @@
 
 
 # Put ARM Clang first in path temporary to avoid compiler variants issues.
-export PATH := C:\bin\ArmClang\bin:$(PATH)
+#export PATH := C:\bin\ArmClang\bin:$(PATH)
 
 # ARM Clang uses the ARM GNU toolchain libraries and finds them over C_INCLUDE_PATH.
-export C_INCLUDE_PATH := C:\bin\ArmGNUToolchain\arm-none-eabi\include
+#export C_INCLUDE_PATH := C:\bin\ArmGNUToolchain\arm-none-eabi\include
+export C_INCLUDE_PATH := /usr/include/newlib/
 
 MAKEFILE = Makefile mcu.mak flags.mak gcc0.mak gcc1.mak clang0.mak clang1.mak
 VERBOSE = # -v
@@ -175,8 +176,8 @@ clean:
 version:
 	@which arm-none-eabi-gcc
 	@arm-none-eabi-gcc --version
-	@which clang
-	@clang --version
+	@which $(CLANG_CC)
+	@$(CLANG_CC) --version
  
 # openocdflashgcc: all
 # 	openocd -f interface/jlink.cfg -f target/stm32g0x.cfg -c "program $(GCC_BUILD)/$(TARGET).elf verify reset exit"
diff --git a/examples/vsCode_Nucleo-G0B1_instrumented/clang0.mak b/examples/vsCode_Nucleo-G0B1_instrumented/clang0.mak
index 7bfe80f7d..9222dc7ea 100644
--- a/examples/vsCode_Nucleo-G0B1_instrumented/clang0.mak
+++ b/examples/vsCode_Nucleo-G0B1_instrumented/clang0.mak
@@ -2,10 +2,12 @@
 # Build path
 CLANG_BUILD = build.clang
 
-CLANG_CC = clang
-CLANG_AS = clang -x assembler-with-cpp
-CLANG_CP = llvm-objcopy
-CLANG_SZ = llvm-size
+VERSION = -17 # When a default version is used, this should be empty.
+
+CLANG_CC = clang$(VERSION)
+CLANG_AS = clang$(VERSION) -x assembler-with-cpp
+CLANG_CP = llvm-objcopy$(VERSION)
+CLANG_SZ = llvm-size$(VERSION)
 CLANG_HEX = $(CLANG_CP) -O ihex
 CLANG_BIN = $(CLANG_CP) -O binary -S
 
diff --git a/examples/vsCode_Nucleo-G0B1_instrumented/gccLinksClangWarning.txt b/examples/vsCode_Nucleo-G0B1_instrumented/gccLinksClangWarning.txt
index 163fa0d84..b3af7d3ea 100644
--- a/examples/vsCode_Nucleo-G0B1_instrumented/gccLinksClangWarning.txt
+++ b/examples/vsCode_Nucleo-G0B1_instrumented/gccLinksClangWarning.txt
@@ -1,10 +1,2 @@
-c:/bin/armgnutoolchain/bin/../lib/gcc/arm-none-eabi/12.3.1/../../../../arm-none-eabi/bin/ld.exe: c:/bin/armgnutoolchain/bin/../lib/gcc/arm-none-eabi/12.3.1/thumb/v6-m/nofp\libc_nano.a(libc_a-closer.o): in function `_close_r':
-closer.c:(.text._close_r+0xc): warning: _close is not implemented and will always fail
-c:/bin/armgnutoolchain/bin/../lib/gcc/arm-none-eabi/12.3.1/../../../../arm-none-eabi/bin/ld.exe: c:/bin/armgnutoolchain/bin/../lib/gcc/arm-none-eabi/12.3.1/thumb/v6-m/nofp\libc_nano.a(libc_a-lseekr.o): in function `_lseek_r':
-lseekr.c:(.text._lseek_r+0x10): warning: _lseek is not implemented and will always fail
-c:/bin/armgnutoolchain/bin/../lib/gcc/arm-none-eabi/12.3.1/../../../../arm-none-eabi/bin/ld.exe: c:/bin/armgnutoolchain/bin/../lib/gcc/arm-none-eabi/12.3.1/thumb/v6-m/nofp\libc_nano.a(libc_a-readr.o): in function `_read_r':
-readr.c:(.text._read_r+0x10): warning: _read is not implemented and will always fail
-c:/bin/armgnutoolchain/bin/../lib/gcc/arm-none-eabi/12.3.1/../../../../arm-none-eabi/bin/ld.exe: c:/bin/armgnutoolchain/bin/../lib/gcc/arm-none-eabi/12.3.1/thumb/v6-m/nofp\libc_nano.a(libc_a-writer.o): in function `_write_r':
-writer.c:(.text._write_r+0x10): warning: _write is not implemented and will always fail
-c:/bin/armgnutoolchain/bin/../lib/gcc/arm-none-eabi/12.3.1/../../../../arm-none-eabi/bin/ld.exe: warning: c:/bin/armgnutoolchain/bin/../lib/gcc/arm-none-eabi/12.3.1/thumb/v6-m/nofp/crtn.o: missing .note.GNU-stack section implies executable stack
-c:/bin/armgnutoolchain/bin/../lib/gcc/arm-none-eabi/12.3.1/../../../../arm-none-eabi/bin/ld.exe: NOTE: This behaviour is deprecated and will be removed in a future version of the linker
+/usr/lib/gcc/arm-none-eabi/12.2.1/../../../arm-none-eabi/bin/ld: warning: /usr/lib/gcc/arm-none-eabi/12.2.1/thumb/v6-m/nofp/crtn.o: missing .note.GNU-stack section implies executable stack
+/usr/lib/gcc/arm-none-eabi/12.2.1/../../../arm-none-eabi/bin/ld: NOTE: This behaviour is deprecated and will be removed in a future version of the linker