Skip to content

Commit 3556211

Browse files
authored
Merge pull request #1295 from phil-opp/update-data-layout
Update data layouts of custom targets to LLVM 18
2 parents 59f84c2 + c31dcb4 commit 3556211

File tree

9 files changed

+25
-25
lines changed

9 files changed

+25
-25
lines changed

blog/content/edition-1/extra/naked-exceptions/03-returning-from-exceptions/index.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -505,7 +505,7 @@ A minimal target specification that describes the `x86_64-unknown-linux-gnu` tar
505505
```json
506506
{
507507
"llvm-target": "x86_64-unknown-linux-gnu",
508-
"data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128",
508+
"data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128",
509509
"target-endian": "little",
510510
"target-pointer-width": "64",
511511
"target-c-int-width": "32",
@@ -527,7 +527,7 @@ In order to disable the multimedia extensions, we create a new target named `x86
527527
```json
528528
{
529529
"llvm-target": "x86_64-unknown-linux-gnu",
530-
"data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128",
530+
"data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128",
531531
"target-endian": "little",
532532
"target-pointer-width": "64",
533533
"target-c-int-width": "32",

blog/content/edition-1/posts/03-set-up-rust/index.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ Rust allows us to define [custom targets] through a JSON configuration file. A m
9898
```json
9999
{
100100
"llvm-target": "x86_64-unknown-linux-gnu",
101-
"data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128",
101+
"data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128",
102102
"linker-flavor": "gcc",
103103
"target-endian": "little",
104104
"target-pointer-width": "64",
@@ -133,7 +133,7 @@ For our target system, we define the following JSON configuration in a file name
133133
```json
134134
{
135135
"llvm-target": "x86_64-unknown-none",
136-
"data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128",
136+
"data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128",
137137
"linker-flavor": "gcc",
138138
"target-endian": "little",
139139
"target-pointer-width": "64",

blog/content/edition-2/posts/02-minimal-rust-kernel/index.fa.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ rtl = true
122122
```json
123123
{
124124
"llvm-target": "x86_64-unknown-linux-gnu",
125-
"data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128",
125+
"data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128",
126126
"arch": "x86_64",
127127
"target-endian": "little",
128128
"target-pointer-width": "64",
@@ -145,7 +145,7 @@ rtl = true
145145
```json
146146
{
147147
"llvm-target": "x86_64-unknown-none",
148-
"data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128",
148+
"data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128",
149149
"arch": "x86_64",
150150
"target-endian": "little",
151151
"target-pointer-width": "64",
@@ -204,7 +204,7 @@ For more information, see our post on [disabling SIMD](@/edition-2/posts/02-mini
204204
```json
205205
{
206206
"llvm-target": "x86_64-unknown-none",
207-
"data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128",
207+
"data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128",
208208
"arch": "x86_64",
209209
"target-endian": "little",
210210
"target-pointer-width": "64",

blog/content/edition-2/posts/02-minimal-rust-kernel/index.fr.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ Pour notre système cible toutefois, nous avons besoin de paramètres de configu
118118
```json
119119
{
120120
"llvm-target": "x86_64-unknown-linux-gnu",
121-
"data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128",
121+
"data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128",
122122
"arch": "x86_64",
123123
"target-endian": "little",
124124
"target-pointer-width": "64",
@@ -141,7 +141,7 @@ Nous pouvons aussi cibler les systèmes `x86_64` avec notre noyau, donc notre sp
141141
```json
142142
{
143143
"llvm-target": "x86_64-unknown-none",
144-
"data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128",
144+
"data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128",
145145
"arch": "x86_64",
146146
"target-endian": "little",
147147
"target-pointer-width": "64",
@@ -201,7 +201,7 @@ Notre fichier de spécification de cible ressemble maintenant à ceci :
201201
```json
202202
{
203203
"llvm-target": "x86_64-unknown-none",
204-
"data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128",
204+
"data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128",
205205
"arch": "x86_64",
206206
"target-endian": "little",
207207
"target-pointer-width": "64",

blog/content/edition-2/posts/02-minimal-rust-kernel/index.ja.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ Cargoは`--target`パラメータを使ってさまざまなターゲットを
116116
```json
117117
{
118118
"llvm-target": "x86_64-unknown-linux-gnu",
119-
"data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128",
119+
"data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128",
120120
"arch": "x86_64",
121121
"target-endian": "little",
122122
"target-pointer-width": "64",
@@ -139,7 +139,7 @@ Cargoは`--target`パラメータを使ってさまざまなターゲットを
139139
```json
140140
{
141141
"llvm-target": "x86_64-unknown-none",
142-
"data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128",
142+
"data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128",
143143
"arch": "x86_64",
144144
"target-endian": "little",
145145
"target-pointer-width": "64",
@@ -198,7 +198,7 @@ SIMDを無効化することによる問題に、`x86_64`における浮動小
198198
```json
199199
{
200200
"llvm-target": "x86_64-unknown-none",
201-
"data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128",
201+
"data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128",
202202
"arch": "x86_64",
203203
"target-endian": "little",
204204
"target-pointer-width": "64",

blog/content/edition-2/posts/02-minimal-rust-kernel/index.ko.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ Cargo는 `--target` 인자를 통해 여러 컴파일 대상 시스템들을 지
124124
```json
125125
{
126126
"llvm-target": "x86_64-unknown-linux-gnu",
127-
"data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128",
127+
"data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128",
128128
"arch": "x86_64",
129129
"target-endian": "little",
130130
"target-pointer-width": "64",
@@ -148,7 +148,7 @@ Cargo는 `--target` 인자를 통해 여러 컴파일 대상 시스템들을 지
148148
```json
149149
{
150150
"llvm-target": "x86_64-unknown-none",
151-
"data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128",
151+
"data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128",
152152
"arch": "x86_64",
153153
"target-endian": "little",
154154
"target-pointer-width": "64",
@@ -209,7 +209,7 @@ SIMD 레지스터 값들을 메모리에 백업하고 또 다시 복구하는
209209
```json
210210
{
211211
"llvm-target": "x86_64-unknown-none",
212-
"data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128",
212+
"data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128",
213213
"arch": "x86_64",
214214
"target-endian": "little",
215215
"target-pointer-width": "64",

blog/content/edition-2/posts/02-minimal-rust-kernel/index.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ For our target system, however, we require some special configuration parameters
112112
```json
113113
{
114114
"llvm-target": "x86_64-unknown-linux-gnu",
115-
"data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128",
115+
"data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128",
116116
"arch": "x86_64",
117117
"target-endian": "little",
118118
"target-pointer-width": "64",
@@ -135,7 +135,7 @@ We also target `x86_64` systems with our kernel, so our target specification wil
135135
```json
136136
{
137137
"llvm-target": "x86_64-unknown-none",
138-
"data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128",
138+
"data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128",
139139
"arch": "x86_64",
140140
"target-endian": "little",
141141
"target-pointer-width": "64",
@@ -195,7 +195,7 @@ Our target specification file now looks like this:
195195
```json
196196
{
197197
"llvm-target": "x86_64-unknown-none",
198-
"data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128",
198+
"data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128",
199199
"arch": "x86_64",
200200
"target-endian": "little",
201201
"target-pointer-width": "64",

blog/content/edition-2/posts/02-minimal-rust-kernel/index.ru.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ Cargo поддерживает различные целевые системы
119119
```json
120120
{
121121
"llvm-target": "x86_64-unknown-linux-gnu",
122-
"data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128",
122+
"data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128",
123123
"arch": "x86_64",
124124
"target-endian": "little",
125125
"target-pointer-width": "64",
@@ -142,7 +142,7 @@ Cargo поддерживает различные целевые системы
142142
```json
143143
{
144144
"llvm-target": "x86_64-unknown-none",
145-
"data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128",
145+
"data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128",
146146
"arch": "x86_64",
147147
"target-endian": "little",
148148
"target-pointer-width": "64",
@@ -202,7 +202,7 @@ Cargo поддерживает различные целевые системы
202202
```json
203203
{
204204
"llvm-target": "x86_64-unknown-none",
205-
"data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128",
205+
"data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128",
206206
"arch": "x86_64",
207207
"target-endian": "little",
208208
"target-pointer-width": "64",

blog/content/edition-2/posts/02-minimal-rust-kernel/index.zh-CN.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ Nightly 版本的编译器允许我们在源码的开头插入**特性标签**
9292
```json
9393
{
9494
"llvm-target": "x86_64-unknown-linux-gnu",
95-
"data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128",
95+
"data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128",
9696
"arch": "x86_64",
9797
"target-endian": "little",
9898
"target-pointer-width": "64",
@@ -112,7 +112,7 @@ Nightly 版本的编译器允许我们在源码的开头插入**特性标签**
112112
```json
113113
{
114114
"llvm-target": "x86_64-unknown-none",
115-
"data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128",
115+
"data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128",
116116
"arch": "x86_64",
117117
"target-endian": "little",
118118
"target-pointer-width": "64",
@@ -166,7 +166,7 @@ Nightly 版本的编译器允许我们在源码的开头插入**特性标签**
166166
```json
167167
{
168168
"llvm-target": "x86_64-unknown-none",
169-
"data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128",
169+
"data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128",
170170
"arch": "x86_64",
171171
"target-endian": "little",
172172
"target-pointer-width": "64",

0 commit comments

Comments
 (0)