| author |  Andrew Kelley <andrew@ziglang.org> 2016-02-16 20:03:41-07:00 |
| committer | Andrew Kelley <andrew@ziglang.org> 2016-02-16 20:03:41-07:00 |
| log | 58c13aa949a571f4605ae1392cfd1e086fb820a7 |
| tree | d4f768df798852790c058810a3b7bd6758fccb01 |
| parent | afa5d1ea1223b8eab475c4186faed4385ac95da0 |
rename 'environ' to 'env_type'
environ appears to clash with another symbol in mingw land7 files changed, 20 insertions(+), 20 deletions(-)
src/codegen.cpp+1-1
| ... | @@ -3586,7 +3586,7 @@ static void define_builtin_types(CodeGen *g) { | ... | @@ -3586,7 +3586,7 @@ static void define_builtin_types(CodeGen *g) { |
| 3586 | type_enum_field->name = buf_create_from_str(ZigLLVMGetEnvironmentTypeName(environ_type)); | 3586 | type_enum_field->name = buf_create_from_str(ZigLLVMGetEnvironmentTypeName(environ_type)); |
| 3587 | type_enum_field->value = i; | 3587 | type_enum_field->value = i; |
| 3588 | 3588 | ||
| 3589 | if (environ_type == g->zig_target.environ) { | 3589 | if (environ_type == g->zig_target.env_type) { |
| 3590 | g->target_environ_index = i; | 3590 | g->target_environ_index = i; |
| 3591 | } | 3591 | } |
| 3592 | } | 3592 | } |
src/link.cpp+6-6
| ... | @@ -68,7 +68,7 @@ static Buf *build_o(CodeGen *parent_gen, const char *oname) { | ... | @@ -68,7 +68,7 @@ static Buf *build_o(CodeGen *parent_gen, const char *oname) { |
| 68 | } | 68 | } |
| 69 | 69 | ||
| 70 | static const char *get_o_file_extension(CodeGen *g) { | 70 | static 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) { |
| 72 | return ".obj"; | 72 | return ".obj"; |
| 73 | } else { | 73 | } else { |
| 74 | return ".o"; | 74 | return ".o"; |
| ... | @@ -136,7 +136,7 @@ static const char *getLDMOption(const ZigTarget *t) { | ... | @@ -136,7 +136,7 @@ static const char *getLDMOption(const ZigTarget *t) { |
| 136 | case ZigLLVM_systemz: | 136 | case ZigLLVM_systemz: |
| 137 | return "elf64_s390"; | 137 | return "elf64_s390"; |
| 138 | case ZigLLVM_x86_64: | 138 | case ZigLLVM_x86_64: |
| 139 | if (t->environ == ZigLLVM_GNUX32) { | 139 | if (t->env_type == ZigLLVM_GNUX32) { |
| 140 | return "elf32_x86_64"; | 140 | return "elf32_x86_64"; |
| 141 | } | 141 | } |
| 142 | return "elf_x86_64"; | 142 | return "elf_x86_64"; |
| ... | @@ -272,8 +272,8 @@ static void construct_linker_job_linux(LinkJob *lj) { | ... | @@ -272,8 +272,8 @@ static void construct_linker_job_linux(LinkJob *lj) { |
| 272 | } | 272 | } |
| 273 | 273 | ||
| 274 | static bool is_target_cyg_mingw(const ZigTarget *target) { | 274 | static bool is_target_cyg_mingw(const ZigTarget *target) { |
| 275 | return (target->os == ZigLLVM_Win32 && target->environ == ZigLLVM_Cygnus) || | 275 | return (target->os == ZigLLVM_Win32 && target->env_type == ZigLLVM_Cygnus) || |
| 276 | (target->os == ZigLLVM_Win32 && target->environ == ZigLLVM_GNU); | 276 | (target->os == ZigLLVM_Win32 && target->env_type == ZigLLVM_GNU); |
| 277 | } | 277 | } |
| 278 | 278 | ||
| 279 | static void construct_linker_job_mingw(LinkJob *lj) { | 279 | static void construct_linker_job_mingw(LinkJob *lj) { |
| ... | @@ -370,7 +370,7 @@ static void construct_linker_job_mingw(LinkJob *lj) { | ... | @@ -370,7 +370,7 @@ static void construct_linker_job_mingw(LinkJob *lj) { |
| 370 | lj->args.append("-lmingw32"); | 370 | lj->args.append("-lmingw32"); |
| 371 | 371 | ||
| 372 | lj->args.append("-lgcc"); | 372 | 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); |
| 374 | bool is_cyg_ming = is_target_cyg_mingw(&g->zig_target); | 374 | bool is_cyg_ming = is_target_cyg_mingw(&g->zig_target); |
| 375 | if (!g->is_static && !is_android) { | 375 | if (!g->is_static && !is_android) { |
| 376 | if (!is_cyg_ming) { | 376 | if (!is_cyg_ming) { |
| ... | @@ -675,7 +675,7 @@ static void construct_linker_job(LinkJob *lj) { | ... | @@ -675,7 +675,7 @@ static void construct_linker_job(LinkJob *lj) { |
| 675 | case ZigLLVM_Solaris: | 675 | case ZigLLVM_Solaris: |
| 676 | zig_panic("TODO construct Solaris linker job"); | 676 | zig_panic("TODO construct Solaris linker job"); |
| 677 | case ZigLLVM_Win32: | 677 | case ZigLLVM_Win32: |
| 678 | switch (lj->codegen->zig_target.environ) { | 678 | switch (lj->codegen->zig_target.env_type) { |
| 679 | default: | 679 | default: |
| 680 | if (lj->codegen->zig_target.oformat == ZigLLVM_ELF) { | 680 | if (lj->codegen->zig_target.oformat == ZigLLVM_ELF) { |
| 681 | zig_panic("TODO construct Generic_ELF linker job"); | 681 | zig_panic("TODO construct Generic_ELF linker job"); |
src/main.cpp+2-2
| ... | @@ -81,7 +81,7 @@ static int print_target_list(FILE *f) { | ... | @@ -81,7 +81,7 @@ static int print_target_list(FILE *f) { |
| 81 | int environ_count = target_environ_count(); | 81 | int environ_count = target_environ_count(); |
| 82 | for (int i = 0; i < environ_count; i += 1) { | 82 | for (int i = 0; i < environ_count; i += 1) { |
| 83 | ZigLLVM_EnvironmentType environ_type = get_target_environ(i); | 83 | 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)" : ""; |
| 85 | fprintf(f, " %s%s\n", ZigLLVMGetEnvironmentTypeName(environ_type), native_str); | 85 | fprintf(f, " %s%s\n", ZigLLVMGetEnvironmentTypeName(environ_type), native_str); |
| 86 | } | 86 | } |
| 87 | 87 | ||
| ... | @@ -278,7 +278,7 @@ int main(int argc, char **argv) { | ... | @@ -278,7 +278,7 @@ int main(int argc, char **argv) { |
| 278 | } | 278 | } |
| 279 | } | 279 | } |
| 280 | if (target_environ) { | 280 | if (target_environ) { |
| 281 | if (parse_target_environ(target_environ, &target->environ)) { | 281 | if (parse_target_environ(target_environ, &target->env_type)) { |
| 282 | fprintf(stderr, "invalid --target-environ argument\n"); | 282 | fprintf(stderr, "invalid --target-environ argument\n"); |
| 283 | return usage(arg0); | 283 | return usage(arg0); |
| 284 | } | 284 | } |
src/target.cpp+6-6
| ... | @@ -168,7 +168,7 @@ void get_native_target(ZigTarget *target) { | ... | @@ -168,7 +168,7 @@ void get_native_target(ZigTarget *target) { |
| 168 | &target->arch.sub_arch, | 168 | &target->arch.sub_arch, |
| 169 | &target->vendor, | 169 | &target->vendor, |
| 170 | &target->os, | 170 | &target->os, |
| 171 | &target->environ, | 171 | &target->env_type, |
| 172 | &target->oformat); | 172 | &target->oformat); |
| 173 | } | 173 | } |
| 174 | 174 | ||
| ... | @@ -177,7 +177,7 @@ void get_unknown_target(ZigTarget *target) { | ... | @@ -177,7 +177,7 @@ void get_unknown_target(ZigTarget *target) { |
| 177 | target->arch.sub_arch = ZigLLVM_NoSubArch; | 177 | target->arch.sub_arch = ZigLLVM_NoSubArch; |
| 178 | target->vendor = ZigLLVM_UnknownVendor; | 178 | target->vendor = ZigLLVM_UnknownVendor; |
| 179 | target->os = ZigLLVM_UnknownOS; | 179 | target->os = ZigLLVM_UnknownOS; |
| 180 | target->environ = ZigLLVM_UnknownEnvironment; | 180 | target->env_type = ZigLLVM_UnknownEnvironment; |
| 181 | target->oformat = ZigLLVM_UnknownObjectFormat; | 181 | target->oformat = ZigLLVM_UnknownObjectFormat; |
| 182 | } | 182 | } |
| 183 | 183 | ||
| ... | @@ -217,10 +217,10 @@ int parse_target_os(const char *str, ZigLLVM_OSType *out_os) { | ... | @@ -217,10 +217,10 @@ int parse_target_os(const char *str, ZigLLVM_OSType *out_os) { |
| 217 | 217 | ||
| 218 | int parse_target_environ(const char *str, ZigLLVM_EnvironmentType *out_environ) { | 218 | int parse_target_environ(const char *str, ZigLLVM_EnvironmentType *out_environ) { |
| 219 | for (int i = 0; i < array_length(environ_list); i += 1) { | 219 | for (int i = 0; i < array_length(environ_list); i += 1) { |
| 220 | ZigLLVM_EnvironmentType environ = environ_list[i]; | 220 | ZigLLVM_EnvironmentType env_type = environ_list[i]; |
| 221 | const char *environ_name = ZigLLVMGetEnvironmentTypeName(environ); | 221 | const char *environ_name = ZigLLVMGetEnvironmentTypeName(env_type); |
| 222 | if (strcmp(environ_name, str) == 0) { | 222 | if (strcmp(environ_name, str) == 0) { |
| 223 | *out_environ = environ; | 223 | *out_environ = env_type; |
| 224 | return 0; | 224 | return 0; |
| 225 | } | 225 | } |
| 226 | } | 226 | } |
| ... | @@ -237,7 +237,7 @@ void init_all_targets(void) { | ... | @@ -237,7 +237,7 @@ void init_all_targets(void) { |
| 237 | 237 | ||
| 238 | void get_target_triple(Buf *triple, const ZigTarget *target) { | 238 | void get_target_triple(Buf *triple, const ZigTarget *target) { |
| 239 | ZigLLVMGetTargetTriple(triple, target->arch.arch, target->arch.sub_arch, | 239 | 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); |
| 241 | } | 241 | } |
| 242 | 242 | ||
| 243 | static bool is_os_darwin(ZigTarget *target) { | 243 | static bool is_os_darwin(ZigTarget *target) { |
src/target.hpp+2-2
| ... | @@ -21,7 +21,7 @@ struct ZigTarget { | ... | @@ -21,7 +21,7 @@ struct ZigTarget { |
| 21 | ArchType arch; | 21 | ArchType arch; |
| 22 | ZigLLVM_VendorType vendor; | 22 | ZigLLVM_VendorType vendor; |
| 23 | ZigLLVM_OSType os; | 23 | ZigLLVM_OSType os; |
| 24 | ZigLLVM_EnvironmentType environ; | 24 | ZigLLVM_EnvironmentType env_type; |
| 25 | ZigLLVM_ObjectFormatType oformat; | 25 | ZigLLVM_ObjectFormatType oformat; |
| 26 | }; | 26 | }; |
| 27 | 27 | ||
| ... | @@ -57,7 +57,7 @@ void get_unknown_target(ZigTarget *target); | ... | @@ -57,7 +57,7 @@ void get_unknown_target(ZigTarget *target); |
| 57 | 57 | ||
| 58 | int parse_target_arch(const char *str, ArchType *arch); | 58 | int parse_target_arch(const char *str, ArchType *arch); |
| 59 | int parse_target_os(const char *str, ZigLLVM_OSType *os); | 59 | int parse_target_os(const char *str, ZigLLVM_OSType *os); |
| 60 | int parse_target_environ(const char *str, ZigLLVM_EnvironmentType *environ); | 60 | int parse_target_environ(const char *str, ZigLLVM_EnvironmentType *env_type); |
| 61 | 61 | ||
| 62 | void init_all_targets(void); | 62 | void init_all_targets(void); |
| 63 | 63 |
src/zig_llvm.cpp+2-2
| ... | @@ -538,8 +538,8 @@ const char *ZigLLVMGetOSTypeName(ZigLLVM_OSType os) { | ... | @@ -538,8 +538,8 @@ const char *ZigLLVMGetOSTypeName(ZigLLVM_OSType os) { |
| 538 | return Triple::getOSTypeName((Triple::OSType)os); | 538 | return Triple::getOSTypeName((Triple::OSType)os); |
| 539 | } | 539 | } |
| 540 | 540 | ||
| 541 | const char *ZigLLVMGetEnvironmentTypeName(ZigLLVM_EnvironmentType environ) { | 541 | const char *ZigLLVMGetEnvironmentTypeName(ZigLLVM_EnvironmentType env_type) { |
| 542 | return Triple::getEnvironmentTypeName((Triple::EnvironmentType)environ); | 542 | return Triple::getEnvironmentTypeName((Triple::EnvironmentType)env_type); |
| 543 | } | 543 | } |
| 544 | 544 | ||
| 545 | void ZigLLVMGetNativeTarget(ZigLLVM_ArchType *arch_type, ZigLLVM_SubArchType *sub_arch_type, | 545 | void 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); | ... | @@ -291,7 +291,7 @@ const char *ZigLLVMGetArchTypeName(ZigLLVM_ArchType arch); |
| 291 | const char *ZigLLVMGetSubArchTypeName(ZigLLVM_SubArchType sub_arch); | 291 | const char *ZigLLVMGetSubArchTypeName(ZigLLVM_SubArchType sub_arch); |
| 292 | const char *ZigLLVMGetVendorTypeName(ZigLLVM_VendorType vendor); | 292 | const char *ZigLLVMGetVendorTypeName(ZigLLVM_VendorType vendor); |
| 293 | const char *ZigLLVMGetOSTypeName(ZigLLVM_OSType os); | 293 | const char *ZigLLVMGetOSTypeName(ZigLLVM_OSType os); |
| 294 | const char *ZigLLVMGetEnvironmentTypeName(ZigLLVM_EnvironmentType environ); | 294 | const char *ZigLLVMGetEnvironmentTypeName(ZigLLVM_EnvironmentType env_type); |
| 295 | 295 | ||
| 296 | /* | 296 | /* |
| 297 | * This stuff is not LLVM API but it depends on the LLVM C++ API so we put it here. | 297 | * This stuff is not LLVM API but it depends on the LLVM C++ API so we put it here. |