Changeset bc73be3 in mainline for .gitignore

Timestamp:

2019-06-27T08:51:20Z (7 years ago)

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

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

Children:

8add15e0

Parents:

ad40b74b (diff), aeba767 (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.

Message:

cpp: merge and resolve conflicts

File:

• .gitignore (modified) (10 diffs)

.gitignore

@@ -24 +24 @@
 autotool/
 boot/arch/arm32/_link.ld
+boot/arch/arm64/_link.ld
 boot/arch/ia64/_link.ld
 boot/arch/mips32/_link.ld
@@ -49 +50 @@
 kernel/arch/amd64/_link.ld
 kernel/arch/arm32/_link.ld
+kernel/arch/arm64/_link.ld
 kernel/arch/ia32/_link.ld
 kernel/arch/ia64/_link.ld
@@ -90 +92 @@
 uspace/app/bithenge/bithenge
 uspace/app/blkdump/blkdump
-uspace/app/bnchmark/bnchmark
 uspace/app/contacts/contacts
 uspace/app/corecfg/corecfg
@@ -107 +108 @@
 uspace/app/getterm/getterm
 uspace/app/gunzip/gunzip
+uspace/app/hbench/hbench
 uspace/app/inet/inet
 uspace/app/init/init
@@ -131 +133 @@
 uspace/app/nterm/nterm
 uspace/app/pci/pci
-uspace/app/perf/perf
 uspace/app/ping/ping
 uspace/app/ping6/ping6
@@ -173 +174 @@
 uspace/dist/app/bithenge
 uspace/dist/app/blkdump
-uspace/dist/app/bnchmark
 uspace/dist/app/corecfg
 uspace/dist/app/cpptest
@@ -313 +313 @@
 uspace/drv/char/ns8250/ns8250
 uspace/drv/char/pc-lpt/pc-lpt
+uspace/drv/char/pl011/pl011
 uspace/drv/char/pl050/pl050
 uspace/drv/char/ps2mouse/ps2mouse
@@ -326 +327 @@
 uspace/drv/hid/xtkbd/xtkbd
 uspace/drv/intctl/apic/apic
+uspace/drv/intctl/gicv2/gicv2
 uspace/drv/intctl/i8259/i8259
 uspace/drv/intctl/icp-ic/icp-ic
@@ -336 +338 @@
 uspace/drv/nic/virtio-net/virtio-net
 uspace/drv/platform/amdm37x/amdm37x
+uspace/drv/platform/arm64virt/arm64virt
 uspace/drv/platform/icp/icp
 uspace/drv/platform/mac/mac
@@ -351 +354 @@
 uspace/drv/time/cmos-rtc/cmos-rtc
 uspace/export
-uspace/lib/c/arch/abs32le/_link-dlexe.ld
-uspace/lib/c/arch/abs32le/_link-loader.ld
-uspace/lib/c/arch/abs32le/_link-shlib.ld
-uspace/lib/c/arch/abs32le/_link.ld
-uspace/lib/c/arch/amd64/_link-dlexe.ld
-uspace/lib/c/arch/amd64/_link-loader.ld
-uspace/lib/c/arch/amd64/_link-shlib.ld
-uspace/lib/c/arch/amd64/_link.ld
-uspace/lib/c/arch/arm32/_link-dlexe.ld
-uspace/lib/c/arch/arm32/_link-loader.ld
-uspace/lib/c/arch/arm32/_link-shlib.ld
-uspace/lib/c/arch/arm32/_link.ld
-uspace/lib/c/arch/ia32/_link-dlexe.ld
-uspace/lib/c/arch/ia32/_link-loader.ld
-uspace/lib/c/arch/ia32/_link-shlib.ld
-uspace/lib/c/arch/ia32/_link.ld
-uspace/lib/c/arch/ia64/_link-dlexe.ld
-uspace/lib/c/arch/ia64/_link-loader.ld
-uspace/lib/c/arch/ia64/_link-shlib.ld
-uspace/lib/c/arch/ia64/_link.ld
-uspace/lib/c/arch/mips32/_link-dlexe.ld
-uspace/lib/c/arch/mips32/_link-loader.ld
-uspace/lib/c/arch/mips32/_link-shlib.ld
-uspace/lib/c/arch/mips32/_link.ld
-uspace/lib/c/arch/mips32eb/_link-dlexe.ld
-uspace/lib/c/arch/mips32eb/_link-loader.ld
-uspace/lib/c/arch/mips32eb/_link-shlib.ld
-uspace/lib/c/arch/mips32eb/_link.ld
-uspace/lib/c/arch/ppc32/_link-dlexe.ld
-uspace/lib/c/arch/ppc32/_link-loader.ld
-uspace/lib/c/arch/ppc32/_link-shlib.ld
-uspace/lib/c/arch/ppc32/_link.ld
-uspace/lib/c/arch/sparc64/_link-dlexe.ld
-uspace/lib/c/arch/sparc64/_link-loader.ld
-uspace/lib/c/arch/sparc64/_link-shlib.ld
-uspace/lib/c/arch/sparc64/_link.ld
 uspace/lib/c/test-libc
 uspace/lib/label/test-liblabel