Changeset 3e828ea in mainline for uspace/dist

Timestamp:

2019-09-23T12:49:29Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

9be2358

Parents:

9259d20 (diff), 1a4ec93f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Jiri Svoboda <jiri@…> (2019-09-22 12:49:07)

git-committer:

Jiri Svoboda <jiri@…> (2019-09-23 12:49:29)

Message:

Merge changes from master, especially Meson build

Location:

uspace/dist/src/c/demos

Files:

• edit/build (modified) (1 diff)
• hello/build (modified) (1 diff)
• hello/build.gcc (modified) (1 diff)
• tetris/build (modified) (1 diff)
• tetris/build.gcc (modified) (1 diff)
• top/build (modified) (1 diff)

uspace/dist/src/c/demos/edit/build

@@ -11 +11 @@
 as -o search.o search.s
 
-ld -T /inc/_link.ld -o edit_ sheet.o edit.o search.o /lib/libc.a /lib/libsoftint.a
+ld -T /inc/_link.ld -o edit_ sheet.o edit.o search.o /lib/libc.a -lgcc

uspace/dist/src/c/demos/hello/build

@@ -2 +2 @@
 cc -S -o hello.s hello.i
 as -o hello.o hello.s
-ld -T /inc/_link.ld -o hello hello.o /lib/libc.a /lib/libsoftint.a
+ld -T /inc/_link.ld -o hello hello.o /lib/libc.a -lgcc

uspace/dist/src/c/demos/hello/build.gcc

@@ -1 @@
-gcc -nostdlib -nostdinc -I/inc/c -Wl,-T/inc/_link.ld -L/lib -lc -lsoftint -o hello hello.c
+gcc -nostdlib -nostdinc -I/inc/c -Wl,-T/inc/_link.ld -L/lib -lc -lgcc -o hello hello.c
 

uspace/dist/src/c/demos/tetris/build

@@ -14 +14 @@
 as -o tetris.o tetris.s
 
-ld -T /inc/_link.ld -o tetris_ scores.o screen.o shapes.o tetris.o /lib/libc.a /lib/libsoftint.a
+ld -T /inc/_link.ld -o tetris_ scores.o screen.o shapes.o tetris.o /lib/libc.a -lgcc

uspace/dist/src/c/demos/tetris/build.gcc

@@ -3 +3 @@
 gcc -nostdinc -I/inc/c -c -Drestrict= shapes.c
 gcc -nostdinc -I/inc/c -c -Drestrict= tetris.c
-gcc -nostdlib -Wl,-T/inc/_link.ld -L/lib -o tetris_ scores.o screen.o shapes.o tetris.o -lc -lsoftint
+gcc -nostdlib -Wl,-T/inc/_link.ld -L/lib -o tetris_ scores.o screen.o shapes.o tetris.o -lc -lgcc
 

uspace/dist/src/c/demos/top/build

@@ -8 +8 @@
 as -o top.o top.s
 
-ld -T /inc/_link.ld -o top_ screen.o top.o /lib/libc.a /lib/libsoftint.a
+ld -T /inc/_link.ld -o top_ screen.o top.o /lib/libc.a -lgcc