Skip to content

Commit ffc933e

Browse files
committed
Update README and Makefile for improved clarity and functionality
- Added a new section in the README to specify compatible versions of the ViOS toolchain components, enhancing user guidance. - Included version badges for Libc, Binutils, and ViOS to improve visibility of component versions. - Modified the Makefile for the c_print program to include the crt0.o object file, ensuring proper assembly and linking of the program. - Updated the clean target in the Makefile to remove the newly added crt0.o object file, maintaining a clean build environment.
1 parent 86e57ea commit ffc933e

2 files changed

Lines changed: 17 additions & 2 deletions

File tree

README.md

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,21 @@
1919

2020
---
2121

22+
### ViOS Toolchain Versions
23+
24+
The following components are versioned together and must be used in compatible versions:
25+
26+
![GitHub Release](https://img.shields.io/github/v/release/pinkqween/vios-libc?label=Libc%20Version)
27+
![GitHub Release](https://img.shields.io/github/v/release/pinkqween/vios-binutils?label=Binutils%20Version)
28+
![GitHub Release](https://img.shields.io/github/v/release/pinkqween/vios?label=ViOS%20Version)
29+
30+
---
31+
2232
## 🔧 Build Status
2333

24-
[![Build: OS](https://github.com/PinkQween/ViOS/actions/workflows/build.yml/badge.svg)](https://github.com/PinkQween/ViOS/actions/workflows/build.yml)
2534
[![Build: Libc](https://github.com/PinkQween/ViOS-Libc/actions/workflows/build.yml/badge.svg)](https://github.com/PinkQween/ViOS-Libc/actions/workflows/build.yml)
35+
[![Build: Binutils](https://github.com/PinkQween/ViOS-Libc/actions/workflows/build.yml/badge.svg)](https://github.com/PinkQween/ViOS-binutils/actions/workflows/build.yml)
36+
[![Build: OS (ViOS)](https://github.com/PinkQween/ViOS/actions/workflows/build.yml/badge.svg)](https://github.com/PinkQween/ViOS/actions/workflows/build.yml)
2637

2738
---
2839

assets/programs/c_print/Makefile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ VIOS_LIB_PATH := $(VIOS_LIBC_PATH)/lib/libViOSlibc.a
66
CPP_TARGET = c_print.elf
77
CPP_SRC = src/main.c
88
CPP_OBJ = c_print.o
9+
CRT0_OBJ = crt0.o
910
CPP = i686-elf-g++
1011
CPPFLAGS = -g -ffreestanding -falign-jumps -falign-functions -falign-labels -falign-loops -fstrength-reduce -fomit-frame-pointer -finline-functions -Wno-unused-function -fno-builtin -Werror -Wno-unused-label -Wno-cpp -Wno-unused-parameter -nostdlib -nostartfiles -nodefaultlibs -Wall -O0 -I$(VIOS_INCLUDE_PATH)
1112
LIBS = $(VIOS_LIB_PATH)
@@ -18,5 +19,8 @@ $(CPP_TARGET): $(CPP_OBJ)
1819
$(CPP_OBJ): $(CPP_SRC)
1920
$(CPP) $(CPPFLAGS) -std=gnu++11 -c $< -o $@
2021

22+
$(CRT0_OBJ): src/crt0.s
23+
nasm -f elf32 $< -o $@
24+
2125
clean:
22-
rm -f $(CPP_OBJ) $(CPP_TARGET)
26+
rm -f $(CPP_OBJ) $(CRT0_OBJ) $(CPP_TARGET)

0 commit comments

Comments
 (0)