aboutsummaryrefslogtreecommitdiff
path: root/src/build_settings.cpp
diff options
context:
space:
mode:
authorgingerBill <bill@gingerbill.org>2022-01-15 17:53:18 +0000
committergingerBill <bill@gingerbill.org>2022-01-15 17:53:18 +0000
commitf0529535e02ab175bca3f7ff8c3bc2112d949236 (patch)
tree055c4369c5eb25decf656f53a19a0c022d57e98f /src/build_settings.cpp
parent3f59c45740403e538a23f50c2fe4cd25e815531b (diff)
`ODIN_ENDIAN` changed to an enum constant; `ODIN_ENUM_STRING` is the new string version of the old constant
Diffstat (limited to 'src/build_settings.cpp')
-rw-r--r--src/build_settings.cpp20
1 files changed, 9 insertions, 11 deletions
diff --git a/src/build_settings.cpp b/src/build_settings.cpp
index 5e4534517..b4a934ec8 100644
--- a/src/build_settings.cpp
+++ b/src/build_settings.cpp
@@ -170,7 +170,6 @@ struct BuildContext {
// Constants
String ODIN_OS; // target operating system
String ODIN_ARCH; // target architecture
- String ODIN_ENDIAN; // target endian
String ODIN_VENDOR; // compiler vendor
String ODIN_VERSION; // compiler version
String ODIN_ROOT; // Odin ROOT
@@ -269,7 +268,7 @@ bool global_ignore_warnings(void) {
}
-gb_global TargetMetrics target_windows_i386 = {
+gb_global TargetMetrics target_windows_386 = {
TargetOs_windows,
TargetArch_i386,
4,
@@ -285,7 +284,7 @@ gb_global TargetMetrics target_windows_amd64 = {
str_lit("e-m:w-i64:64-f80:128-n8:16:32:64-S128"),
};
-gb_global TargetMetrics target_linux_i386 = {
+gb_global TargetMetrics target_linux_386 = {
TargetOs_linux,
TargetArch_i386,
4,
@@ -328,7 +327,7 @@ gb_global TargetMetrics target_darwin_arm64 = {
str_lit("e-m:o-i64:64-i128:128-n32:64-S128"), // TODO(bill): Is this correct?
};
-gb_global TargetMetrics target_freebsd_i386 = {
+gb_global TargetMetrics target_freebsd_386 = {
TargetOs_freebsd,
TargetArch_i386,
4,
@@ -401,12 +400,12 @@ gb_global NamedTargetMetrics named_targets[] = {
{ str_lit("darwin_amd64"), &target_darwin_amd64 },
{ str_lit("darwin_arm64"), &target_darwin_arm64 },
{ str_lit("essence_amd64"), &target_essence_amd64 },
- { str_lit("linux_i386"), &target_linux_i386 },
+ { str_lit("linux_386"), &target_linux_386 },
{ str_lit("linux_amd64"), &target_linux_amd64 },
{ str_lit("linux_arm64"), &target_linux_arm64 },
- { str_lit("windows_i386"), &target_windows_i386 },
+ { str_lit("windows_386"), &target_windows_386 },
{ str_lit("windows_amd64"), &target_windows_amd64 },
- { str_lit("freebsd_i386"), &target_freebsd_i386 },
+ { str_lit("freebsd_386"), &target_freebsd_386 },
{ str_lit("freebsd_amd64"), &target_freebsd_amd64 },
{ str_lit("freestanding_wasm32"), &target_freestanding_wasm32 },
{ str_lit("wasi_wasm32"), &target_wasi_wasm32 },
@@ -879,13 +878,13 @@ void init_build_context(TargetMetrics *cross_target) {
#endif
#else
#if defined(GB_SYSTEM_WINDOWS)
- metrics = &target_windows_i386;
+ metrics = &target_windows_386;
#elif defined(GB_SYSTEM_OSX)
#error "Build Error: Unsupported architecture"
#elif defined(GB_SYSTEM_FREEBSD)
- metrics = &target_freebsd_i386;
+ metrics = &target_freebsd_386;
#else
- metrics = &target_linux_i386;
+ metrics = &target_linux_386;
#endif
#endif
@@ -904,7 +903,6 @@ void init_build_context(TargetMetrics *cross_target) {
bc->metrics = *metrics;
bc->ODIN_OS = target_os_names[metrics->os];
bc->ODIN_ARCH = target_arch_names[metrics->arch];
- bc->ODIN_ENDIAN = target_endian_names[target_endians[metrics->arch]];
bc->endian_kind = target_endians[metrics->arch];
bc->word_size = metrics->word_size;
bc->max_align = metrics->max_align;