Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- ➜ zig-source git:(function-sections) ✗ git status
- On branch function-sections
- Changes to be committed:
- (use "git reset HEAD <file>..." to unstage)
- modified: src-self-hosted/compilation.zig
- modified: src-self-hosted/llvm.zig
- modified: src/zig_llvm.h
- ➜ zig-source git:(function-sections) ✗ git commit
- hint: Waiting for your editor to close the file... Gtk-Message: 17:47:11.948: Failed to load module "appmenu-gtk-module"
- Aborting commit due to empty commit message.
- ➜ zig-source git:(function-sections) ✗ git diff
- ➜ zig-source git:(function-sections) ✗ git commit
- hint: Waiting for your editor to close the file... Gtk-Message: 17:47:35.086: Failed to load module "appmenu-gtk-module"
- [function-sections 5902735e] Added the ZigLVVMCreateTargetMachine to self hosted zig code
- 3 files changed, 4 insertions(+), 3 deletions(-)
- ➜ zig-source git:(function-sections) git status
- On branch function-sections
- nothing to commit, working tree clean
- ➜ zig-source git:(function-sections) git fetch upstream
- remote: Enumerating objects: 103, done.
- remote: Counting objects: 100% (103/103), done.
- remote: Compressing objects: 100% (13/13), done.
- remote: Total 117 (delta 89), reused 103 (delta 89), pack-reused 14
- Receiving objects: 100% (117/117), 77.76 KiB | 503.00 KiB/s, done.
- Resolving deltas: 100% (89/89), completed with 50 local objects.
- From https://github.com/ziglang/zig
- 0a0c1168..0dd2e93e master -> upstream/master
- * [new branch] rewrite-coroutines -> upstream/rewrite-coroutines
- * [new branch] wyhash-additions -> upstream/wyhash-additions
- ➜ zig-source git:(function-sections) git checkout master
- Switched to branch 'master'
- Your branch is ahead of 'origin/master' by 235 commits.
- (use "git push" to publish your local commits)
- ➜ zig-source git:(master) git merge upstream/master
- Updating 0a0c1168..0dd2e93e
- Fast-forward
- CMakeLists.txt | 6 +--
- doc/langref.html.in | 26 ++++++------
- src/all_types.hpp | 4 +-
- src/analyze.cpp | 15 ++++---
- src/codegen.cpp | 25 +++++++-----
- std/json.zig | 4 +-
- std/mem.zig | 6 +++
- std/special/c.zig | 132 ++++++++++++++++++++++++++++++++++++++++++++++++-------------
- std/special/{bootstrap.zig => start.zig} | 7 ++--
- std/special/{bootstrap_lib.zig => start_lib.zig} | 0
- std/special/{bootstrap_windows_tls.zig => start_windows_tls.zig} | 0
- std/zig/bench.zig | 2 +-
- 12 files changed, 159 insertions(+), 68 deletions(-)
- rename std/special/{bootstrap.zig => start.zig} (95%)
- rename std/special/{bootstrap_lib.zig => start_lib.zig} (100%)
- rename std/special/{bootstrap_windows_tls.zig => start_windows_tls.zig} (100%)
- ➜ zig-source git:(master) git checkout function-sections
- Switched to branch 'function-sections'
- ➜ zig-source git:(function-sections) git rebase master
- First, rewinding head to replay your work on top of it...
- Applying: Added function-section functionality
- Applying: Added ZigLLVMCreateTargetMachine and pass function-sections flag
- Applying: Added the ZigLVVMCreateTargetMachine to self hosted zig code
- ➜ zig-source git:(function-sections) git push origin function-sections
- Username for 'https://github.com': timonkruiper
- Password for 'https://timonkruiper@github.com':
- To https://github.com/timonkruiper/zig.git
- ! [rejected] function-sections -> function-sections (non-fast-forward)
- error: failed to push some refs to 'https://github.com/timonkruiper/zig.git'
- hint: Updates were rejected because the tip of your current branch is behind
- hint: its remote counterpart. Integrate the remote changes (e.g.
- hint: 'git pull ...') before pushing again.
- hint: See the 'Note about fast-forwards' in 'git push --help' for details.
- ➜ zig-source git:(function-sections) git push --help
- ➜ zig-source git:(function-sections) git pull origin function-sections
- From https://github.com/timonkruiper/zig
- * branch function-sections -> FETCH_HEAD
- Auto-merging src/zig_llvm.h
- Auto-merging src/zig_llvm.cpp
- Auto-merging src/codegen.cpp
- Auto-merging src/all_types.hpp
- Auto-merging src-self-hosted/llvm.zig
- hint: Waiting for your editor to close the file... Gtk-Message: 17:51:44.101: Failed to load module "appmenu-gtk-module"
- Merge made by the 'recursive' strategy.
- src-self-hosted/llvm.zig | 1 +
- src/codegen.cpp | 6 +++---
- src/zig_llvm.cpp | 4 +++-
- src/zig_llvm.h | 2 +-
- 4 files changed, 8 insertions(+), 5 deletions(-)
- ➜ zig-source git:(function-sections) git status
- On branch function-sections
- nothing to commit, working tree clean
- ➜ zig-source git:(function-sections) git log
- ➜ zig-source git:(function-sections) git push origin function-sections
- Username for 'https://github.com': timonkruiper
- Password for 'https://timonkruiper@github.com':
- Enumerating objects: 174, done.
- Counting objects: 100% (137/137), done.
- Delta compression using up to 8 threads
- Compressing objects: 100% (54/54), done.
- Writing objects: 100% (90/90), 15.80 KiB | 3.16 MiB/s, done.
- Total 90 (delta 70), reused 51 (delta 36)
- remote: Resolving deltas: 100% (70/70), completed with 30 local objects.
- To https://github.com/timonkruiper/zig.git
- ffe618c1..73258ad1 function-sections -> function-sections
- ➜ zig-source git:(function-sections) git log --graph --decorate --pretty=oneline --abbrev-commit
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement