aboutsummaryrefslogtreecommitdiff
path: root/src/target.zig
diff options
context:
space:
mode:
authorAndrew Kelley <andrew@ziglang.org>2023-03-03 12:08:18 -0700
committerAndrew Kelley <andrew@ziglang.org>2023-03-03 12:08:18 -0700
commitdf4cfc2ecf498bf4615ccbaa93438849322bbd18 (patch)
treea71611e86cacd8e021190cc4755574c514acb5c7 /src/target.zig
parent72443fb88cfddad8a58868c150eaf5818826cb21 (diff)
parent75ff34db9e93056482233f8476a06f78b4a2f3c2 (diff)
downloadzig-df4cfc2ecf498bf4615ccbaa93438849322bbd18.tar.gz
zig-df4cfc2ecf498bf4615ccbaa93438849322bbd18.zip
Merge remote-tracking branch 'origin/master' into llvm16
Diffstat (limited to 'src/target.zig')
-rw-r--r--src/target.zig5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/target.zig b/src/target.zig
index 8cbddb4d0c..f785082bd4 100644
--- a/src/target.zig
+++ b/src/target.zig
@@ -648,8 +648,9 @@ pub fn defaultAddressSpace(
function,
},
) AddressSpace {
- _ = target;
- _ = context;
+ // The default address space for functions on AVR is .flash to produce
+ // correct fixups into progmem.
+ if (context == .function and target.cpu.arch == .avr) return .flash;
return .generic;
}