authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2016-02-16 20:03:41-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2016-02-16 20:03:41-07:00
log58c13aa949a571f4605ae1392cfd1e086fb820a7
treed4f768df798852790c058810a3b7bd6758fccb01
parentafa5d1ea1223b8eab475c4186faed4385ac95da0

rename 'environ' to 'env_type'

environ appears to clash with another symbol in mingw land

7 files changed, 20 insertions(+), 20 deletions(-)

src/codegen.cpp+1-1
......@@ -3586,7 +3586,7 @@ static void define_builtin_types(CodeGen *g) {
35863586 type_enum_field->name = buf_create_from_str(ZigLLVMGetEnvironmentTypeName(environ_type));
35873587 type_enum_field->value = i;
35883588
3589 if (environ_type == g->zig_target.environ) {
3589 if (environ_type == g->zig_target.env_type) {
35903590 g->target_environ_index = i;
35913591 }
35923592 }
src/link.cpp+6-6
......@@ -68,7 +68,7 @@ static Buf *build_o(CodeGen *parent_gen, const char *oname) {
6868}
6969
7070static const char *get_o_file_extension(CodeGen *g) {
71 if (g->zig_target.environ == ZigLLVM_MSVC) {
71 if (g->zig_target.env_type == ZigLLVM_MSVC) {
7272 return ".obj";
7373 } else {
7474 return ".o";
......@@ -136,7 +136,7 @@ static const char *getLDMOption(const ZigTarget *t) {
136136 case ZigLLVM_systemz:
137137 return "elf64_s390";
138138 case ZigLLVM_x86_64:
139 if (t->environ == ZigLLVM_GNUX32) {
139 if (t->env_type == ZigLLVM_GNUX32) {
140140 return "elf32_x86_64";
141141 }
142142 return "elf_x86_64";
......@@ -272,8 +272,8 @@ static void construct_linker_job_linux(LinkJob *lj) {
272272}
273273
274274static bool is_target_cyg_mingw(const ZigTarget *target) {
275 return (target->os == ZigLLVM_Win32 && target->environ == ZigLLVM_Cygnus) ||
276 (target->os == ZigLLVM_Win32 && target->environ == ZigLLVM_GNU);
275 return (target->os == ZigLLVM_Win32 && target->env_type == ZigLLVM_Cygnus) ||
276 (target->os == ZigLLVM_Win32 && target->env_type == ZigLLVM_GNU);
277277}
278278
279279static void construct_linker_job_mingw(LinkJob *lj) {
......@@ -370,7 +370,7 @@ static void construct_linker_job_mingw(LinkJob *lj) {
370370 lj->args.append("-lmingw32");
371371
372372 lj->args.append("-lgcc");
373 bool is_android = (g->zig_target.environ == ZigLLVM_Android);
373 bool is_android = (g->zig_target.env_type == ZigLLVM_Android);
374374 bool is_cyg_ming = is_target_cyg_mingw(&g->zig_target);
375375 if (!g->is_static && !is_android) {
376376 if (!is_cyg_ming) {
......@@ -675,7 +675,7 @@ static void construct_linker_job(LinkJob *lj) {
675675 case ZigLLVM_Solaris:
676676 zig_panic("TODO construct Solaris linker job");
677677 case ZigLLVM_Win32:
678 switch (lj->codegen->zig_target.environ) {
678 switch (lj->codegen->zig_target.env_type) {
679679 default:
680680 if (lj->codegen->zig_target.oformat == ZigLLVM_ELF) {
681681 zig_panic("TODO construct Generic_ELF linker job");
src/main.cpp+2-2
......@@ -81,7 +81,7 @@ static int print_target_list(FILE *f) {
8181 int environ_count = target_environ_count();
8282 for (int i = 0; i < environ_count; i += 1) {
8383 ZigLLVM_EnvironmentType environ_type = get_target_environ(i);
84 const char *native_str = (native.environ == environ_type) ? " (native)" : "";
84 const char *native_str = (native.env_type == environ_type) ? " (native)" : "";
8585 fprintf(f, " %s%s\n", ZigLLVMGetEnvironmentTypeName(environ_type), native_str);
8686 }
8787
......@@ -278,7 +278,7 @@ int main(int argc, char **argv) {
278278 }
279279 }
280280 if (target_environ) {
281 if (parse_target_environ(target_environ, &target->environ)) {
281 if (parse_target_environ(target_environ, &target->env_type)) {
282282 fprintf(stderr, "invalid --target-environ argument\n");
283283 return usage(arg0);
284284 }
src/target.cpp+6-6
......@@ -168,7 +168,7 @@ void get_native_target(ZigTarget *target) {
168168 &target->arch.sub_arch,
169169 &target->vendor,
170170 &target->os,
171 &target->environ,
171 &target->env_type,
172172 &target->oformat);
173173}
174174
......@@ -177,7 +177,7 @@ void get_unknown_target(ZigTarget *target) {
177177 target->arch.sub_arch = ZigLLVM_NoSubArch;
178178 target->vendor = ZigLLVM_UnknownVendor;
179179 target->os = ZigLLVM_UnknownOS;
180 target->environ = ZigLLVM_UnknownEnvironment;
180 target->env_type = ZigLLVM_UnknownEnvironment;
181181 target->oformat = ZigLLVM_UnknownObjectFormat;
182182}
183183
......@@ -217,10 +217,10 @@ int parse_target_os(const char *str, ZigLLVM_OSType *out_os) {
217217
218218int parse_target_environ(const char *str, ZigLLVM_EnvironmentType *out_environ) {
219219 for (int i = 0; i < array_length(environ_list); i += 1) {
220 ZigLLVM_EnvironmentType environ = environ_list[i];
221 const char *environ_name = ZigLLVMGetEnvironmentTypeName(environ);
220 ZigLLVM_EnvironmentType env_type = environ_list[i];
221 const char *environ_name = ZigLLVMGetEnvironmentTypeName(env_type);
222222 if (strcmp(environ_name, str) == 0) {
223 *out_environ = environ;
223 *out_environ = env_type;
224224 return 0;
225225 }
226226 }
......@@ -237,7 +237,7 @@ void init_all_targets(void) {
237237
238238void get_target_triple(Buf *triple, const ZigTarget *target) {
239239 ZigLLVMGetTargetTriple(triple, target->arch.arch, target->arch.sub_arch,
240 target->vendor, target->os, target->environ, target->oformat);
240 target->vendor, target->os, target->env_type, target->oformat);
241241}
242242
243243static bool is_os_darwin(ZigTarget *target) {
src/target.hpp+2-2
......@@ -21,7 +21,7 @@ struct ZigTarget {
2121 ArchType arch;
2222 ZigLLVM_VendorType vendor;
2323 ZigLLVM_OSType os;
24 ZigLLVM_EnvironmentType environ;
24 ZigLLVM_EnvironmentType env_type;
2525 ZigLLVM_ObjectFormatType oformat;
2626};
2727
......@@ -57,7 +57,7 @@ void get_unknown_target(ZigTarget *target);
5757
5858int parse_target_arch(const char *str, ArchType *arch);
5959int parse_target_os(const char *str, ZigLLVM_OSType *os);
60int parse_target_environ(const char *str, ZigLLVM_EnvironmentType *environ);
60int parse_target_environ(const char *str, ZigLLVM_EnvironmentType *env_type);
6161
6262void init_all_targets(void);
6363
src/zig_llvm.cpp+2-2
......@@ -538,8 +538,8 @@ const char *ZigLLVMGetOSTypeName(ZigLLVM_OSType os) {
538538 return Triple::getOSTypeName((Triple::OSType)os);
539539}
540540
541const char *ZigLLVMGetEnvironmentTypeName(ZigLLVM_EnvironmentType environ) {
542 return Triple::getEnvironmentTypeName((Triple::EnvironmentType)environ);
541const char *ZigLLVMGetEnvironmentTypeName(ZigLLVM_EnvironmentType env_type) {
542 return Triple::getEnvironmentTypeName((Triple::EnvironmentType)env_type);
543543}
544544
545545void ZigLLVMGetNativeTarget(ZigLLVM_ArchType *arch_type, ZigLLVM_SubArchType *sub_arch_type,
src/zig_llvm.hpp+1-1
......@@ -291,7 +291,7 @@ const char *ZigLLVMGetArchTypeName(ZigLLVM_ArchType arch);
291291const char *ZigLLVMGetSubArchTypeName(ZigLLVM_SubArchType sub_arch);
292292const char *ZigLLVMGetVendorTypeName(ZigLLVM_VendorType vendor);
293293const char *ZigLLVMGetOSTypeName(ZigLLVM_OSType os);
294const char *ZigLLVMGetEnvironmentTypeName(ZigLLVM_EnvironmentType environ);
294const char *ZigLLVMGetEnvironmentTypeName(ZigLLVM_EnvironmentType env_type);
295295
296296/*
297297 * This stuff is not LLVM API but it depends on the LLVM C++ API so we put it here.