aboutsummaryrefslogtreecommitdiff
path: root/cc/cc-test/src
diff options
context:
space:
mode:
authorDaniel Mueller <deso@posteo.net>2020-04-04 14:39:19 -0700
committerDaniel Mueller <deso@posteo.net>2020-04-04 14:39:19 -0700
commitd0d9683df8398696147e7ee1fcffb2e4e957008c (patch)
tree4baa76712a76f4d072ee3936c07956580b230820 /cc/cc-test/src
parent203e691f46d591a2cc8acdfd850fa9f5b0fb8a98 (diff)
downloadnitrocli-d0d9683df8398696147e7ee1fcffb2e4e957008c.tar.gz
nitrocli-d0d9683df8398696147e7ee1fcffb2e4e957008c.tar.bz2
Remove vendored dependencies
While it appears that by now we actually can get successful builds without Cargo insisting on Internet access by virtue of using the --frozen flag, maintaining vendored dependencies is somewhat of a pain point. This state will also get worse with upcoming changes that replace argparse in favor of structopt and pull in a slew of new dependencies by doing so. Then there is also the repository structure aspect, which is non-standard due to the way we vendor dependencies and a potential source of confusion. In order to fix these problems, this change removes all the vendored dependencies we have. Delete subrepo argparse/:argparse Delete subrepo base32/:base32 Delete subrepo cc/:cc Delete subrepo cfg-if/:cfg-if Delete subrepo getrandom/:getrandom Delete subrepo lazy-static/:lazy-static Delete subrepo libc/:libc Delete subrepo nitrokey-sys/:nitrokey-sys Delete subrepo nitrokey/:nitrokey Delete subrepo rand/:rand
Diffstat (limited to 'cc/cc-test/src')
-rw-r--r--cc/cc-test/src/NMakefile14
-rw-r--r--cc/cc-test/src/aarch64.S10
-rw-r--r--cc/cc-test/src/bar1.c7
-rw-r--r--cc/cc-test/src/bar2.c6
-rw-r--r--cc/cc-test/src/baz.cpp9
-rw-r--r--cc/cc-test/src/expand.c4
-rw-r--r--cc/cc-test/src/foo.c9
-rw-r--r--cc/cc-test/src/i686.S9
-rw-r--r--cc/cc-test/src/i686.asm9
-rw-r--r--cc/cc-test/src/include/foo.h0
-rw-r--r--cc/cc-test/src/lib.rs16
-rw-r--r--cc/cc-test/src/msvc.c7
-rw-r--r--cc/cc-test/src/opt_linkage.c5
-rw-r--r--cc/cc-test/src/windows.c3
-rw-r--r--cc/cc-test/src/x86_64.S9
-rw-r--r--cc/cc-test/src/x86_64.asm8
16 files changed, 0 insertions, 125 deletions
diff --git a/cc/cc-test/src/NMakefile b/cc/cc-test/src/NMakefile
deleted file mode 100644
index 03c73df..0000000
--- a/cc/cc-test/src/NMakefile
+++ /dev/null
@@ -1,14 +0,0 @@
-all: $(OUT_DIR)/msvc.lib $(OUT_DIR)/msvc.exe
-
-$(OUT_DIR)/msvc.lib: $(OUT_DIR)/msvc.o
- lib -nologo -out:$(OUT_DIR)/msvc.lib $(OUT_DIR)/msvc.o
- rc -h
-
-$(OUT_DIR)/msvc.o: src/msvc.c
- $(CC) -nologo -c -Fo:$@ src/msvc.c -MD
-
-$(OUT_DIR)/msvc.exe: $(OUT_DIR)/msvc2.o
- $(CC) -nologo -Fo:$@ $(OUT_DIR)/msvc2.o
-
-$(OUT_DIR)/msvc2.o: src/msvc.c
- $(CC) -nologo -c -Fo:$@ src/msvc.c -DMAIN -MD
diff --git a/cc/cc-test/src/aarch64.S b/cc/cc-test/src/aarch64.S
deleted file mode 100644
index 1d9062d..0000000
--- a/cc/cc-test/src/aarch64.S
+++ /dev/null
@@ -1,10 +0,0 @@
-.globl asm
-asm:
- mov w0, 7
- ret
-
-.globl _asm
-_asm:
- mov w0, 7
- ret
-
diff --git a/cc/cc-test/src/bar1.c b/cc/cc-test/src/bar1.c
deleted file mode 100644
index 605be33..0000000
--- a/cc/cc-test/src/bar1.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <stdint.h>
-#include "foo.h"
-
-int32_t bar1() {
- return 5;
-}
-
diff --git a/cc/cc-test/src/bar2.c b/cc/cc-test/src/bar2.c
deleted file mode 100644
index 9be4291..0000000
--- a/cc/cc-test/src/bar2.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <stdint.h>
-
-int32_t bar2() {
- return 6;
-}
-
diff --git a/cc/cc-test/src/baz.cpp b/cc/cc-test/src/baz.cpp
deleted file mode 100644
index 2d4b959..0000000
--- a/cc/cc-test/src/baz.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <stdint.h>
-
-extern "C" int32_t
-baz() {
- int *a = new int(8);
- int b = *a;
- delete a;
- return b;
-}
diff --git a/cc/cc-test/src/expand.c b/cc/cc-test/src/expand.c
deleted file mode 100644
index 2b492a2..0000000
--- a/cc/cc-test/src/expand.c
+++ /dev/null
@@ -1,4 +0,0 @@
-#define HELLO hello
-#define WORLD world
-
-HELLO WORLD
diff --git a/cc/cc-test/src/foo.c b/cc/cc-test/src/foo.c
deleted file mode 100644
index 541e62c..0000000
--- a/cc/cc-test/src/foo.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <stdint.h>
-
-#ifdef FOO
-#if BAR == 1
-int32_t foo() {
- return 4;
-}
-#endif
-#endif
diff --git a/cc/cc-test/src/i686.S b/cc/cc-test/src/i686.S
deleted file mode 100644
index 3ed9e86..0000000
--- a/cc/cc-test/src/i686.S
+++ /dev/null
@@ -1,9 +0,0 @@
-.globl asm
-asm:
- mov $7, %eax
- ret
-
-.globl _asm
-_asm:
- mov $7, %eax
- ret
diff --git a/cc/cc-test/src/i686.asm b/cc/cc-test/src/i686.asm
deleted file mode 100644
index 6bf9676..0000000
--- a/cc/cc-test/src/i686.asm
+++ /dev/null
@@ -1,9 +0,0 @@
-.586
-.MODEL FLAT, C
-.CODE
-
-asm PROC
- MOV EAX, 7
- RET
-asm ENDP
-END
diff --git a/cc/cc-test/src/include/foo.h b/cc/cc-test/src/include/foo.h
deleted file mode 100644
index e69de29..0000000
--- a/cc/cc-test/src/include/foo.h
+++ /dev/null
diff --git a/cc/cc-test/src/lib.rs b/cc/cc-test/src/lib.rs
deleted file mode 100644
index b42ebf7..0000000
--- a/cc/cc-test/src/lib.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-extern "C" {
- pub fn foo() -> i32;
-
- pub fn bar1() -> i32;
- pub fn bar2() -> i32;
-
- pub fn asm() -> i32;
-
- pub fn baz() -> i32;
-
- #[cfg(windows)]
- pub fn windows();
-
- #[cfg(target_env = "msvc")]
- pub fn msvc();
-}
diff --git a/cc/cc-test/src/msvc.c b/cc/cc-test/src/msvc.c
deleted file mode 100644
index dbbc494..0000000
--- a/cc/cc-test/src/msvc.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <windows.h>
-
-void msvc() {}
-
-#ifdef MAIN
-int main() {}
-#endif
diff --git a/cc/cc-test/src/opt_linkage.c b/cc/cc-test/src/opt_linkage.c
deleted file mode 100644
index a74af8c..0000000
--- a/cc/cc-test/src/opt_linkage.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <stdint.h>
-
-int32_t answer() {
- return 42;
-}
diff --git a/cc/cc-test/src/windows.c b/cc/cc-test/src/windows.c
deleted file mode 100644
index 0896aa0..0000000
--- a/cc/cc-test/src/windows.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include <windows.h>
-
-void windows() {}
diff --git a/cc/cc-test/src/x86_64.S b/cc/cc-test/src/x86_64.S
deleted file mode 100644
index 3ed9e86..0000000
--- a/cc/cc-test/src/x86_64.S
+++ /dev/null
@@ -1,9 +0,0 @@
-.globl asm
-asm:
- mov $7, %eax
- ret
-
-.globl _asm
-_asm:
- mov $7, %eax
- ret
diff --git a/cc/cc-test/src/x86_64.asm b/cc/cc-test/src/x86_64.asm
deleted file mode 100644
index 1c03101..0000000
--- a/cc/cc-test/src/x86_64.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-_TEXT SEGMENT
-
-asm PROC
- MOV EAX, 7
- RET
-asm ENDP
-
-END