authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2016-05-11 14:44:10-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2016-05-11 14:44:10-07:00
log26718a619c572602c21c83b1588e50723447709a
tree6c28906895aaf119e7d344c58b5b0f2c2380fb7a
parent6b7ffd4cbe1006013cda4a36c9659c4822ae1b53

recognize ar program and pass --gc-sections to ld

See #54

10 files changed, 29 insertions(+), 4 deletions(-)

CMakeLists.txt+2
......@@ -18,6 +18,7 @@ set(ZIG_LIBC_LIB_DIR "" CACHE STRING "Default native target libc directory where
1818set(ZIG_LIBC_STATIC_LIB_DIR "" CACHE STRING "Default native target libc directory where crtbeginT.o can be found")
1919set(ZIG_LIBC_INCLUDE_DIR "/usr/include" CACHE STRING "Default native target libc include directory")
2020set(ZIG_LD_PATH "ld" CACHE STRING "Path to ld for the native target")
21set(ZIG_AR_PATH "ar" CACHE STRING "Path to ar for the native target")
2122set(ZIG_DYNAMIC_LINKER "" CACHE STRING "Override dynamic linker for native target")
2223
2324option(ZIG_TEST_COVERAGE "Build Zig with test coverage instrumentation" OFF)
......@@ -217,6 +218,7 @@ install(FILES "${CMAKE_SOURCE_DIR}/std/linux_i386.zig" DESTINATION "${ZIG_STD_DE
217218install(FILES "${CMAKE_SOURCE_DIR}/std/mem.zig" DESTINATION "${ZIG_STD_DEST}")
218219install(FILES "${CMAKE_SOURCE_DIR}/std/list.zig" DESTINATION "${ZIG_STD_DEST}")
219220install(FILES "${CMAKE_SOURCE_DIR}/std/hash_map.zig" DESTINATION "${ZIG_STD_DEST}")
221install(FILES "${CMAKE_SOURCE_DIR}/std/empty.zig" DESTINATION "${ZIG_STD_DEST}")
220222
221223add_executable(run_tests ${TEST_SOURCES})
222224target_link_libraries(run_tests)
src/all_types.hpp+1
......@@ -1214,6 +1214,7 @@ struct CodeGen {
12141214 Buf *libc_include_dir;
12151215 Buf *dynamic_linker;
12161216 Buf *linker_path;
1217 Buf *ar_path;
12171218 Buf triple_str;
12181219 bool is_release_build;
12191220 bool is_test_build;
src/codegen.cpp+6
......@@ -85,6 +85,7 @@ CodeGen *codegen_create(Buf *root_source_dir, const ZigTarget *target) {
8585 g->libc_static_lib_dir = buf_create_from_str("");
8686 g->libc_include_dir = buf_create_from_str("");
8787 g->linker_path = buf_create_from_str("");
88 g->ar_path = buf_create_from_str("");
8889 g->darwin_linker_version = buf_create_from_str("");
8990 } else {
9091 // native compilation, we can rely on the configuration stuff
......@@ -96,6 +97,7 @@ CodeGen *codegen_create(Buf *root_source_dir, const ZigTarget *target) {
9697 g->libc_static_lib_dir = buf_create_from_str(ZIG_LIBC_STATIC_LIB_DIR);
9798 g->libc_include_dir = buf_create_from_str(ZIG_LIBC_INCLUDE_DIR);
9899 g->linker_path = buf_create_from_str(ZIG_LD_PATH);
100 g->ar_path = buf_create_from_str(ZIG_AR_PATH);
99101 g->darwin_linker_version = buf_create_from_str(ZIG_HOST_LINK_VERSION);
100102
101103 if (g->zig_target.os == ZigLLVM_Darwin ||
......@@ -171,6 +173,10 @@ void codegen_set_linker_path(CodeGen *g, Buf *linker_path) {
171173 g->linker_path = linker_path;
172174}
173175
176void codegen_set_ar_path(CodeGen *g, Buf *ar_path) {
177 g->ar_path = ar_path;
178}
179
174180void codegen_add_lib_dir(CodeGen *g, const char *dir) {
175181 g->lib_dirs.append(dir);
176182}
src/codegen.hpp+1
......@@ -32,6 +32,7 @@ void codegen_set_libc_static_lib_dir(CodeGen *g, Buf *libc_static_lib_dir);
3232void codegen_set_libc_include_dir(CodeGen *codegen, Buf *libc_include_dir);
3333void codegen_set_dynamic_linker(CodeGen *g, Buf *dynamic_linker);
3434void codegen_set_linker_path(CodeGen *g, Buf *linker_path);
35void codegen_set_ar_path(CodeGen *g, Buf *ar_path);
3536void codegen_set_windows_subsystem(CodeGen *g, bool mwindows, bool mconsole);
3637void codegen_set_windows_unicode(CodeGen *g, bool municode);
3738void codegen_add_lib_dir(CodeGen *codegen, const char *dir);
src/config.h.in+1
......@@ -12,6 +12,7 @@
1212#define ZIG_LIBC_LIB_DIR "@ZIG_LIBC_LIB_DIR@"
1313#define ZIG_LIBC_STATIC_LIB_DIR "@ZIG_LIBC_STATIC_LIB_DIR@"
1414#define ZIG_LD_PATH "@ZIG_LD_PATH@"
15#define ZIG_AR_PATH "@ZIG_AR_PATH@"
1516#define ZIG_DYNAMIC_LINKER "@ZIG_DYNAMIC_LINKER@"
1617#define ZIG_HOST_LINK_VERSION "@ZIG_HOST_LINK_VERSION@"
1718
src/link.cpp+1
......@@ -152,6 +152,7 @@ static void construct_linker_job_linux(LinkJob *lj) {
152152 find_libc_lib_path(g);
153153 }
154154
155 lj->args.append("--gc-sections");
155156
156157 lj->args.append("-m");
157158 lj->args.append(getLDMOption(&g->zig_target));
src/main.cpp+6
......@@ -37,6 +37,7 @@ static int usage(const char *arg0) {
3737 " --libc-include-dir [path] directory where libc stdlib.h resides\n"
3838 " --dynamic-linker [path] set the path to ld.so\n"
3939 " --ld-path [path] set the path to the linker\n"
40 " --ar-path [path] set the path to ar\n"
4041 " -isystem [dir] add additional search path for other .h files\n"
4142 " -dirafter [dir] same as -isystem but do it last\n"
4243 " --library-path [dir] add a directory to the library search path\n"
......@@ -118,6 +119,7 @@ int main(int argc, char **argv) {
118119 const char *libc_include_dir = nullptr;
119120 const char *dynamic_linker = nullptr;
120121 const char *linker_path = nullptr;
122 const char *ar_path = nullptr;
121123 ZigList<const char *> clang_argv = {0};
122124 ZigList<const char *> lib_dirs = {0};
123125 ZigList<const char *> link_libs = {0};
......@@ -196,6 +198,8 @@ int main(int argc, char **argv) {
196198 dynamic_linker = argv[i];
197199 } else if (strcmp(arg, "--ld-path") == 0) {
198200 linker_path = argv[i];
201 } else if (strcmp(arg, "--ar-path") == 0) {
202 ar_path = argv[i];
199203 } else if (strcmp(arg, "-isystem") == 0) {
200204 clang_argv.append("-isystem");
201205 clang_argv.append(argv[i]);
......@@ -356,6 +360,8 @@ int main(int argc, char **argv) {
356360 codegen_set_dynamic_linker(g, buf_create_from_str(dynamic_linker));
357361 if (linker_path)
358362 codegen_set_linker_path(g, buf_create_from_str(linker_path));
363 if (ar_path)
364 codegen_set_ar_path(g, buf_create_from_str(ar_path));
359365 codegen_set_verbose(g, verbose);
360366 codegen_set_errmsg_color(g, color);
361367
std/empty.zig created
std/index.zig+6
......@@ -8,7 +8,13 @@ pub const net = @import("net.zig");
88pub const list = @import("list.zig");
99pub const hash_map = @import("hash_map.zig");
1010pub const mem = @import("mem.zig");
11pub const linux = switch(@compile_var("os")) {
12 linux => @import("linux.zig"),
13 else => null_import,
14};
1115
1216pub fn assert(b: bool) {
1317 if (!b) unreachable{}
1418}
19
20const null_import = @import("empty.zig");
std/io.zig+5-4
......@@ -119,10 +119,10 @@ pub struct OutStream {
119119 }
120120
121121 pub fn flush(os: &OutStream) -> %void {
122 const amt_written = linux.write(os.fd, &os.buffer[0], os.index);
123 os.index = 0;
124 if (amt_written < 0) {
125 return switch (-amt_written) {
122 const write_ret = linux.write(os.fd, &os.buffer[0], os.index);
123 const write_err = linux.get_errno(write_ret);
124 if (write_err > 0) {
125 return switch (write_err) {
126126 errno.EINVAL => unreachable{},
127127 errno.EDQUOT => error.DiskQuota,
128128 errno.EFBIG => error.FileTooBig,
......@@ -134,6 +134,7 @@ pub struct OutStream {
134134 else => error.Unexpected,
135135 }
136136 }
137 os.index = 0;
137138 }
138139
139140 pub fn close(os: &OutStream) -> %void {