Skip to content
Snippets Groups Projects
Commit 9bad4c3d authored by Florian Fischer's avatar Florian Fischer
Browse files

Merge branch 'fix-context-alignment' into 'master'

[meson] fix context_alignas option

See merge request i4/manycore/emper!334
parents 15185449 c9eab3b7
No related branches found
No related tags found
No related merge requests found
...@@ -80,9 +80,9 @@ context_alignment = get_option('context_alignment') ...@@ -80,9 +80,9 @@ context_alignment = get_option('context_alignment')
if context_alignment == 'none' if context_alignment == 'none'
context_alignas = '' context_alignas = ''
elif context_alignment == 'cache_line_size' elif context_alignment == 'cache_line_size'
context_alignas = 'alignas(' + cache_line_size + ')' context_alignas = 'alignas(@0@)'.format(assume_cache_line_size)
elif context_alignment == 'page_size' elif context_alignment == 'page_size'
context_alignas = 'alignas(' + page_size + ')' context_alignas = 'alignas(@0@)'.format(assume_page_size)
else else
error('Unknown context alignment option: ' + context_alignment) error('Unknown context alignment option: ' + context_alignment)
endif endif
......
...@@ -256,7 +256,7 @@ option( ...@@ -256,7 +256,7 @@ option(
type: 'combo', type: 'combo',
description: 'Use the select mechanism to determine the alignment of contexts', description: 'Use the select mechanism to determine the alignment of contexts',
choices: ['none', 'cache_line_size', 'page_size'], choices: ['none', 'cache_line_size', 'page_size'],
value: 'none', value: 'cache_line_size',
) )
option( option(
'assume_cache_line_size', 'assume_cache_line_size',
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment