[LLD][COFF] Emit ARM64X relocations for CHPE ExtraRFETable entries #126713
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@llvm/pr-subscribers-lld-coff Author: Jacek Caban (cjacek) ChangesIn the native view, ExtraEFRTable references the x86 exception table. The EC view references the ARM exception table, as it did before this change. Full diff: https://github.com/llvm/llvm-project/pull/126713.diff 2 Files Affected:
diff --git a/lld/COFF/Writer.cpp b/lld/COFF/Writer.cpp
index 484ac9cdcaf9ea..05edbd3e07b420 100644
--- a/lld/COFF/Writer.cpp
+++ b/lld/COFF/Writer.cpp
@@ -343,6 +343,9 @@ class Writer {
// x86_64 .pdata sections on ARM64EC/ARM64X targets.
ChunkRange hybridPdata;
+ // CHPE metadata symbol on ARM64C target.
+ DefinedRegular *chpeSym = nullptr;
+
COFFLinkerContext &ctx;
};
} // anonymous namespace
@@ -2360,16 +2363,17 @@ void Writer::setECSymbols() {
return a.first->getRVA() < b.first->getRVA();
});
+ ChunkRange &chpePdata = ctx.hybridSymtab ? hybridPdata : pdata;
Symbol *rfeTableSym = symtab->findUnderscore("__arm64x_extra_rfe_table");
replaceSymbol<DefinedSynthetic>(rfeTableSym, "__arm64x_extra_rfe_table",
- pdata.first);
+ chpePdata.first);
- if (pdata.first) {
+ if (chpePdata.first) {
Symbol *rfeSizeSym =
symtab->findUnderscore("__arm64x_extra_rfe_table_size");
cast<DefinedAbsolute>(rfeSizeSym)
- ->setVA(pdata.last->getRVA() + pdata.last->getSize() -
- pdata.first->getRVA());
+ ->setVA(chpePdata.last->getRVA() + chpePdata.last->getSize() -
+ chpePdata.first->getRVA());
}
Symbol *rangesCountSym =
@@ -2423,12 +2427,22 @@ void Writer::setECSymbols() {
offsetof(data_directory, Size),
symtab->edataEnd->getRVA() - symtab->edataStart->getRVA() +
symtab->edataEnd->getSize());
- if (hybridPdata.first)
+ if (hybridPdata.first) {
ctx.dynamicRelocs->set(
dataDirOffset64 + EXCEPTION_TABLE * sizeof(data_directory) +
offsetof(data_directory, Size),
hybridPdata.last->getRVA() - hybridPdata.first->getRVA() +
hybridPdata.last->getSize());
+ if (chpeSym) {
+ size_t size = 0;
+ if (pdata.first)
+ size = pdata.last->getRVA() - pdata.first->getRVA() +
+ pdata.last->getSize();
+ ctx.dynamicRelocs->set(chpeSym->getRVA() +
+ offsetof(chpe_metadata, ExtraRFETableSize),
+ size);
+ }
+ }
}
}
@@ -2664,6 +2678,14 @@ void Writer::createDynamicRelocs() {
coffHeaderOffset + offsetof(coff_file_header, Machine),
AMD64);
+ if (ctx.symtab.entry != ctx.hybridSymtab->entry ||
+ pdata.first != hybridPdata.first) {
+ chpeSym = cast_or_null<DefinedRegular>(
+ ctx.hybridSymtab->findUnderscore("__chpe_metadata"));
+ if (!chpeSym)
+ Warn(ctx) << "'__chpe_metadata' is missing for ARM64X target";
+ }
+
if (ctx.symtab.entry != ctx.hybridSymtab->entry) {
ctx.dynamicRelocs->add(IMAGE_DVRT_ARM64X_FIXUP_TYPE_VALUE, sizeof(uint32_t),
peHeaderOffset +
@@ -2671,14 +2693,11 @@ void Writer::createDynamicRelocs() {
cast_or_null<Defined>(ctx.hybridSymtab->entry));
// Swap the alternate entry point in the CHPE metadata.
- Symbol *s = ctx.hybridSymtab->findUnderscore("__chpe_metadata");
- if (auto chpeSym = cast_or_null<DefinedRegular>(s))
+ if (chpeSym)
ctx.dynamicRelocs->add(
IMAGE_DVRT_ARM64X_FIXUP_TYPE_VALUE, sizeof(uint32_t),
Arm64XRelocVal(chpeSym, offsetof(chpe_metadata, AlternateEntryPoint)),
cast_or_null<Defined>(ctx.symtab.entry));
- else
- Warn(ctx) << "'__chpe_metadata' is missing for ARM64X target";
}
if (ctx.symtab.edataStart != ctx.hybridSymtab->edataStart) {
@@ -2705,6 +2724,18 @@ void Writer::createDynamicRelocs() {
dataDirOffset64 +
EXCEPTION_TABLE * sizeof(data_directory) +
offsetof(data_directory, Size));
+
+ // Swap ExtraRFETable in the CHPE metadata.
+ if (chpeSym) {
+ ctx.dynamicRelocs->add(
+ IMAGE_DVRT_ARM64X_FIXUP_TYPE_VALUE, sizeof(uint32_t),
+ Arm64XRelocVal(chpeSym, offsetof(chpe_metadata, ExtraRFETable)),
+ pdata.first);
+ // The Size value is assigned after addresses are finalized.
+ ctx.dynamicRelocs->add(
+ IMAGE_DVRT_ARM64X_FIXUP_TYPE_VALUE, sizeof(uint32_t),
+ Arm64XRelocVal(chpeSym, offsetof(chpe_metadata, ExtraRFETableSize)));
+ }
}
// Set the hybrid load config to the EC load config.
diff --git a/lld/test/COFF/pdata-arm64ec.test b/lld/test/COFF/pdata-arm64ec.test
index fbec797525f7f8..cf59330b235437 100644
--- a/lld/test/COFF/pdata-arm64ec.test
+++ b/lld/test/COFF/pdata-arm64ec.test
@@ -58,18 +58,26 @@ Mixed arm64x code:
RUN: lld-link -out:test4.dll -machine:arm64x arm64-func-sym.obj arm64ec-func-sym.obj \
RUN: x86_64-func-sym.obj loadconfig-arm64.obj loadconfig-arm64ec.obj -dll -noentry
-RUN: llvm-readobj --headers test4.dll | FileCheck -check-prefix=DIR3 %s
+RUN: llvm-readobj --headers --coff-load-config test4.dll | FileCheck -check-prefix=DIR3 %s
DIR3: ImageOptionalHeader {
DIR3: DataDirectory {
DIR3: ExceptionTableRVA: 0x6000
DIR3-NEXT: ExceptionTableSize: 0x10
DIR3: }
DIR3: }
+DIR3: CHPEMetadata [
+DIR3: ExtraRFETable: 0x6010
+DIR3-NEXT: ExtraRFETableSize: 0xC
+DIR3: ]
DIR3: HybridObject {
DIR3: ImageOptionalHeader {
DIR3: ExceptionTableRVA: 0x6010
DIR3-NEXT: ExceptionTableSize: 0xC
DIR3: }
+DIR3: CHPEMetadata [
+DIR3: ExtraRFETable: 0x6000
+DIR3-NEXT: ExtraRFETableSize: 0x10
+DIR3: ]
DIR3: }
RUN: llvm-objdump -s --section=.pdata test4.dll | FileCheck -check-prefix=DATA4 %s
@@ -86,12 +94,12 @@ RUN: llvm-objdump -s --section=.pdata test5.dll | FileCheck -check-prefix=DATA3
RUN: lld-link -out:test6.dll -machine:arm64x arm64ec-func-sym.obj x86_64-func-sym.obj \
RUN: arm64-func-sym.obj loadconfig-arm64.obj loadconfig-arm64ec.obj -dll -noentry
-RUN: llvm-readobj --headers test6.dll | FileCheck -check-prefix=DIR3 %s
+RUN: llvm-readobj --headers --coff-load-config test6.dll | FileCheck -check-prefix=DIR3 %s
RUN: llvm-objdump -s --section=.pdata test6.dll | FileCheck -check-prefix=DATA4 %s
RUN: lld-link -out:test7.dll -machine:arm64x x86_64-func-sym.obj arm64ec-func-sym.obj \
RUN: arm64-func-sym.obj loadconfig-arm64.obj loadconfig-arm64ec.obj -dll -noentry
-RUN: llvm-readobj --headers test7.dll | FileCheck -check-prefix=DIR3 %s
+RUN: llvm-readobj --headers --coff-load-config test7.dll | FileCheck -check-prefix=DIR3 %s
RUN: llvm-objdump -s --section=.pdata test7.dll | FileCheck -check-prefix=DATA4 %s
#--- arm64-func-sym.s
|
|
@llvm/pr-subscribers-platform-windows Author: Jacek Caban (cjacek) ChangesIn the native view, ExtraEFRTable references the x86 exception table. The EC view references the ARM exception table, as it did before this change. Full diff: https://github.com/llvm/llvm-project/pull/126713.diff 2 Files Affected:
diff --git a/lld/COFF/Writer.cpp b/lld/COFF/Writer.cpp
index 484ac9cdcaf9ea..05edbd3e07b420 100644
--- a/lld/COFF/Writer.cpp
+++ b/lld/COFF/Writer.cpp
@@ -343,6 +343,9 @@ class Writer {
// x86_64 .pdata sections on ARM64EC/ARM64X targets.
ChunkRange hybridPdata;
+ // CHPE metadata symbol on ARM64C target.
+ DefinedRegular *chpeSym = nullptr;
+
COFFLinkerContext &ctx;
};
} // anonymous namespace
@@ -2360,16 +2363,17 @@ void Writer::setECSymbols() {
return a.first->getRVA() < b.first->getRVA();
});
+ ChunkRange &chpePdata = ctx.hybridSymtab ? hybridPdata : pdata;
Symbol *rfeTableSym = symtab->findUnderscore("__arm64x_extra_rfe_table");
replaceSymbol<DefinedSynthetic>(rfeTableSym, "__arm64x_extra_rfe_table",
- pdata.first);
+ chpePdata.first);
- if (pdata.first) {
+ if (chpePdata.first) {
Symbol *rfeSizeSym =
symtab->findUnderscore("__arm64x_extra_rfe_table_size");
cast<DefinedAbsolute>(rfeSizeSym)
- ->setVA(pdata.last->getRVA() + pdata.last->getSize() -
- pdata.first->getRVA());
+ ->setVA(chpePdata.last->getRVA() + chpePdata.last->getSize() -
+ chpePdata.first->getRVA());
}
Symbol *rangesCountSym =
@@ -2423,12 +2427,22 @@ void Writer::setECSymbols() {
offsetof(data_directory, Size),
symtab->edataEnd->getRVA() - symtab->edataStart->getRVA() +
symtab->edataEnd->getSize());
- if (hybridPdata.first)
+ if (hybridPdata.first) {
ctx.dynamicRelocs->set(
dataDirOffset64 + EXCEPTION_TABLE * sizeof(data_directory) +
offsetof(data_directory, Size),
hybridPdata.last->getRVA() - hybridPdata.first->getRVA() +
hybridPdata.last->getSize());
+ if (chpeSym) {
+ size_t size = 0;
+ if (pdata.first)
+ size = pdata.last->getRVA() - pdata.first->getRVA() +
+ pdata.last->getSize();
+ ctx.dynamicRelocs->set(chpeSym->getRVA() +
+ offsetof(chpe_metadata, ExtraRFETableSize),
+ size);
+ }
+ }
}
}
@@ -2664,6 +2678,14 @@ void Writer::createDynamicRelocs() {
coffHeaderOffset + offsetof(coff_file_header, Machine),
AMD64);
+ if (ctx.symtab.entry != ctx.hybridSymtab->entry ||
+ pdata.first != hybridPdata.first) {
+ chpeSym = cast_or_null<DefinedRegular>(
+ ctx.hybridSymtab->findUnderscore("__chpe_metadata"));
+ if (!chpeSym)
+ Warn(ctx) << "'__chpe_metadata' is missing for ARM64X target";
+ }
+
if (ctx.symtab.entry != ctx.hybridSymtab->entry) {
ctx.dynamicRelocs->add(IMAGE_DVRT_ARM64X_FIXUP_TYPE_VALUE, sizeof(uint32_t),
peHeaderOffset +
@@ -2671,14 +2693,11 @@ void Writer::createDynamicRelocs() {
cast_or_null<Defined>(ctx.hybridSymtab->entry));
// Swap the alternate entry point in the CHPE metadata.
- Symbol *s = ctx.hybridSymtab->findUnderscore("__chpe_metadata");
- if (auto chpeSym = cast_or_null<DefinedRegular>(s))
+ if (chpeSym)
ctx.dynamicRelocs->add(
IMAGE_DVRT_ARM64X_FIXUP_TYPE_VALUE, sizeof(uint32_t),
Arm64XRelocVal(chpeSym, offsetof(chpe_metadata, AlternateEntryPoint)),
cast_or_null<Defined>(ctx.symtab.entry));
- else
- Warn(ctx) << "'__chpe_metadata' is missing for ARM64X target";
}
if (ctx.symtab.edataStart != ctx.hybridSymtab->edataStart) {
@@ -2705,6 +2724,18 @@ void Writer::createDynamicRelocs() {
dataDirOffset64 +
EXCEPTION_TABLE * sizeof(data_directory) +
offsetof(data_directory, Size));
+
+ // Swap ExtraRFETable in the CHPE metadata.
+ if (chpeSym) {
+ ctx.dynamicRelocs->add(
+ IMAGE_DVRT_ARM64X_FIXUP_TYPE_VALUE, sizeof(uint32_t),
+ Arm64XRelocVal(chpeSym, offsetof(chpe_metadata, ExtraRFETable)),
+ pdata.first);
+ // The Size value is assigned after addresses are finalized.
+ ctx.dynamicRelocs->add(
+ IMAGE_DVRT_ARM64X_FIXUP_TYPE_VALUE, sizeof(uint32_t),
+ Arm64XRelocVal(chpeSym, offsetof(chpe_metadata, ExtraRFETableSize)));
+ }
}
// Set the hybrid load config to the EC load config.
diff --git a/lld/test/COFF/pdata-arm64ec.test b/lld/test/COFF/pdata-arm64ec.test
index fbec797525f7f8..cf59330b235437 100644
--- a/lld/test/COFF/pdata-arm64ec.test
+++ b/lld/test/COFF/pdata-arm64ec.test
@@ -58,18 +58,26 @@ Mixed arm64x code:
RUN: lld-link -out:test4.dll -machine:arm64x arm64-func-sym.obj arm64ec-func-sym.obj \
RUN: x86_64-func-sym.obj loadconfig-arm64.obj loadconfig-arm64ec.obj -dll -noentry
-RUN: llvm-readobj --headers test4.dll | FileCheck -check-prefix=DIR3 %s
+RUN: llvm-readobj --headers --coff-load-config test4.dll | FileCheck -check-prefix=DIR3 %s
DIR3: ImageOptionalHeader {
DIR3: DataDirectory {
DIR3: ExceptionTableRVA: 0x6000
DIR3-NEXT: ExceptionTableSize: 0x10
DIR3: }
DIR3: }
+DIR3: CHPEMetadata [
+DIR3: ExtraRFETable: 0x6010
+DIR3-NEXT: ExtraRFETableSize: 0xC
+DIR3: ]
DIR3: HybridObject {
DIR3: ImageOptionalHeader {
DIR3: ExceptionTableRVA: 0x6010
DIR3-NEXT: ExceptionTableSize: 0xC
DIR3: }
+DIR3: CHPEMetadata [
+DIR3: ExtraRFETable: 0x6000
+DIR3-NEXT: ExtraRFETableSize: 0x10
+DIR3: ]
DIR3: }
RUN: llvm-objdump -s --section=.pdata test4.dll | FileCheck -check-prefix=DATA4 %s
@@ -86,12 +94,12 @@ RUN: llvm-objdump -s --section=.pdata test5.dll | FileCheck -check-prefix=DATA3
RUN: lld-link -out:test6.dll -machine:arm64x arm64ec-func-sym.obj x86_64-func-sym.obj \
RUN: arm64-func-sym.obj loadconfig-arm64.obj loadconfig-arm64ec.obj -dll -noentry
-RUN: llvm-readobj --headers test6.dll | FileCheck -check-prefix=DIR3 %s
+RUN: llvm-readobj --headers --coff-load-config test6.dll | FileCheck -check-prefix=DIR3 %s
RUN: llvm-objdump -s --section=.pdata test6.dll | FileCheck -check-prefix=DATA4 %s
RUN: lld-link -out:test7.dll -machine:arm64x x86_64-func-sym.obj arm64ec-func-sym.obj \
RUN: arm64-func-sym.obj loadconfig-arm64.obj loadconfig-arm64ec.obj -dll -noentry
-RUN: llvm-readobj --headers test7.dll | FileCheck -check-prefix=DIR3 %s
+RUN: llvm-readobj --headers --coff-load-config test7.dll | FileCheck -check-prefix=DIR3 %s
RUN: llvm-objdump -s --section=.pdata test7.dll | FileCheck -check-prefix=DATA4 %s
#--- arm64-func-sym.s
|
|
@llvm/pr-subscribers-lld Author: Jacek Caban (cjacek) ChangesIn the native view, ExtraEFRTable references the x86 exception table. The EC view references the ARM exception table, as it did before this change. Full diff: https://github.com/llvm/llvm-project/pull/126713.diff 2 Files Affected:
diff --git a/lld/COFF/Writer.cpp b/lld/COFF/Writer.cpp
index 484ac9cdcaf9ea..05edbd3e07b420 100644
--- a/lld/COFF/Writer.cpp
+++ b/lld/COFF/Writer.cpp
@@ -343,6 +343,9 @@ class Writer {
// x86_64 .pdata sections on ARM64EC/ARM64X targets.
ChunkRange hybridPdata;
+ // CHPE metadata symbol on ARM64C target.
+ DefinedRegular *chpeSym = nullptr;
+
COFFLinkerContext &ctx;
};
} // anonymous namespace
@@ -2360,16 +2363,17 @@ void Writer::setECSymbols() {
return a.first->getRVA() < b.first->getRVA();
});
+ ChunkRange &chpePdata = ctx.hybridSymtab ? hybridPdata : pdata;
Symbol *rfeTableSym = symtab->findUnderscore("__arm64x_extra_rfe_table");
replaceSymbol<DefinedSynthetic>(rfeTableSym, "__arm64x_extra_rfe_table",
- pdata.first);
+ chpePdata.first);
- if (pdata.first) {
+ if (chpePdata.first) {
Symbol *rfeSizeSym =
symtab->findUnderscore("__arm64x_extra_rfe_table_size");
cast<DefinedAbsolute>(rfeSizeSym)
- ->setVA(pdata.last->getRVA() + pdata.last->getSize() -
- pdata.first->getRVA());
+ ->setVA(chpePdata.last->getRVA() + chpePdata.last->getSize() -
+ chpePdata.first->getRVA());
}
Symbol *rangesCountSym =
@@ -2423,12 +2427,22 @@ void Writer::setECSymbols() {
offsetof(data_directory, Size),
symtab->edataEnd->getRVA() - symtab->edataStart->getRVA() +
symtab->edataEnd->getSize());
- if (hybridPdata.first)
+ if (hybridPdata.first) {
ctx.dynamicRelocs->set(
dataDirOffset64 + EXCEPTION_TABLE * sizeof(data_directory) +
offsetof(data_directory, Size),
hybridPdata.last->getRVA() - hybridPdata.first->getRVA() +
hybridPdata.last->getSize());
+ if (chpeSym) {
+ size_t size = 0;
+ if (pdata.first)
+ size = pdata.last->getRVA() - pdata.first->getRVA() +
+ pdata.last->getSize();
+ ctx.dynamicRelocs->set(chpeSym->getRVA() +
+ offsetof(chpe_metadata, ExtraRFETableSize),
+ size);
+ }
+ }
}
}
@@ -2664,6 +2678,14 @@ void Writer::createDynamicRelocs() {
coffHeaderOffset + offsetof(coff_file_header, Machine),
AMD64);
+ if (ctx.symtab.entry != ctx.hybridSymtab->entry ||
+ pdata.first != hybridPdata.first) {
+ chpeSym = cast_or_null<DefinedRegular>(
+ ctx.hybridSymtab->findUnderscore("__chpe_metadata"));
+ if (!chpeSym)
+ Warn(ctx) << "'__chpe_metadata' is missing for ARM64X target";
+ }
+
if (ctx.symtab.entry != ctx.hybridSymtab->entry) {
ctx.dynamicRelocs->add(IMAGE_DVRT_ARM64X_FIXUP_TYPE_VALUE, sizeof(uint32_t),
peHeaderOffset +
@@ -2671,14 +2693,11 @@ void Writer::createDynamicRelocs() {
cast_or_null<Defined>(ctx.hybridSymtab->entry));
// Swap the alternate entry point in the CHPE metadata.
- Symbol *s = ctx.hybridSymtab->findUnderscore("__chpe_metadata");
- if (auto chpeSym = cast_or_null<DefinedRegular>(s))
+ if (chpeSym)
ctx.dynamicRelocs->add(
IMAGE_DVRT_ARM64X_FIXUP_TYPE_VALUE, sizeof(uint32_t),
Arm64XRelocVal(chpeSym, offsetof(chpe_metadata, AlternateEntryPoint)),
cast_or_null<Defined>(ctx.symtab.entry));
- else
- Warn(ctx) << "'__chpe_metadata' is missing for ARM64X target";
}
if (ctx.symtab.edataStart != ctx.hybridSymtab->edataStart) {
@@ -2705,6 +2724,18 @@ void Writer::createDynamicRelocs() {
dataDirOffset64 +
EXCEPTION_TABLE * sizeof(data_directory) +
offsetof(data_directory, Size));
+
+ // Swap ExtraRFETable in the CHPE metadata.
+ if (chpeSym) {
+ ctx.dynamicRelocs->add(
+ IMAGE_DVRT_ARM64X_FIXUP_TYPE_VALUE, sizeof(uint32_t),
+ Arm64XRelocVal(chpeSym, offsetof(chpe_metadata, ExtraRFETable)),
+ pdata.first);
+ // The Size value is assigned after addresses are finalized.
+ ctx.dynamicRelocs->add(
+ IMAGE_DVRT_ARM64X_FIXUP_TYPE_VALUE, sizeof(uint32_t),
+ Arm64XRelocVal(chpeSym, offsetof(chpe_metadata, ExtraRFETableSize)));
+ }
}
// Set the hybrid load config to the EC load config.
diff --git a/lld/test/COFF/pdata-arm64ec.test b/lld/test/COFF/pdata-arm64ec.test
index fbec797525f7f8..cf59330b235437 100644
--- a/lld/test/COFF/pdata-arm64ec.test
+++ b/lld/test/COFF/pdata-arm64ec.test
@@ -58,18 +58,26 @@ Mixed arm64x code:
RUN: lld-link -out:test4.dll -machine:arm64x arm64-func-sym.obj arm64ec-func-sym.obj \
RUN: x86_64-func-sym.obj loadconfig-arm64.obj loadconfig-arm64ec.obj -dll -noentry
-RUN: llvm-readobj --headers test4.dll | FileCheck -check-prefix=DIR3 %s
+RUN: llvm-readobj --headers --coff-load-config test4.dll | FileCheck -check-prefix=DIR3 %s
DIR3: ImageOptionalHeader {
DIR3: DataDirectory {
DIR3: ExceptionTableRVA: 0x6000
DIR3-NEXT: ExceptionTableSize: 0x10
DIR3: }
DIR3: }
+DIR3: CHPEMetadata [
+DIR3: ExtraRFETable: 0x6010
+DIR3-NEXT: ExtraRFETableSize: 0xC
+DIR3: ]
DIR3: HybridObject {
DIR3: ImageOptionalHeader {
DIR3: ExceptionTableRVA: 0x6010
DIR3-NEXT: ExceptionTableSize: 0xC
DIR3: }
+DIR3: CHPEMetadata [
+DIR3: ExtraRFETable: 0x6000
+DIR3-NEXT: ExtraRFETableSize: 0x10
+DIR3: ]
DIR3: }
RUN: llvm-objdump -s --section=.pdata test4.dll | FileCheck -check-prefix=DATA4 %s
@@ -86,12 +94,12 @@ RUN: llvm-objdump -s --section=.pdata test5.dll | FileCheck -check-prefix=DATA3
RUN: lld-link -out:test6.dll -machine:arm64x arm64ec-func-sym.obj x86_64-func-sym.obj \
RUN: arm64-func-sym.obj loadconfig-arm64.obj loadconfig-arm64ec.obj -dll -noentry
-RUN: llvm-readobj --headers test6.dll | FileCheck -check-prefix=DIR3 %s
+RUN: llvm-readobj --headers --coff-load-config test6.dll | FileCheck -check-prefix=DIR3 %s
RUN: llvm-objdump -s --section=.pdata test6.dll | FileCheck -check-prefix=DATA4 %s
RUN: lld-link -out:test7.dll -machine:arm64x x86_64-func-sym.obj arm64ec-func-sym.obj \
RUN: arm64-func-sym.obj loadconfig-arm64.obj loadconfig-arm64ec.obj -dll -noentry
-RUN: llvm-readobj --headers test7.dll | FileCheck -check-prefix=DIR3 %s
+RUN: llvm-readobj --headers --coff-load-config test7.dll | FileCheck -check-prefix=DIR3 %s
RUN: llvm-objdump -s --section=.pdata test7.dll | FileCheck -check-prefix=DATA4 %s
#--- arm64-func-sym.s
|
mstorsjo
approved these changes
Feb 13, 2025
lld/COFF/Writer.cpp
Outdated
| size_t size = 0; | ||
| if (pdata.first) | ||
| size = pdata.last->getRVA() - pdata.first->getRVA() + | ||
| pdata.last->getSize(); |
There was a problem hiding this comment.
Nitpick: I find this easier to read as last->getRVA() + last->getSize() - first->getRVA().
There was a problem hiding this comment.
Good point. I changed that and merged, thanks!
In the native view, ExtraEFRTable references the x86 exception table. The EC view references the ARM exception table, as it did before this change.
cjacek
force-pushed
the
arm64x-chpe-pdata
branch
from
704f342 to
feeca77
Compare
joaosaffran
pushed a commit
to joaosaffran/llvm-project
that referenced
this pull request
Feb 14, 2025
…lvm#126713) In the native view, ExtraEFRTable references the x86 exception table. The EC view references the ARM exception table, as it did before this change.
sivan-shani
pushed a commit
to sivan-shani/llvm-project
that referenced
this pull request
Feb 24, 2025
…lvm#126713) In the native view, ExtraEFRTable references the x86 exception table. The EC view references the ARM exception table, as it did before this change.
SquallATF
pushed a commit
to SquallATF/llvm-project
that referenced
this pull request
Mar 10, 2025
…lvm#126713) In the native view, ExtraEFRTable references the x86 exception table. The EC view references the ARM exception table, as it did before this change.
SquallATF
pushed a commit
to SquallATF/llvm-project
that referenced
this pull request
Mar 20, 2025
…lvm#126713) In the native view, ExtraEFRTable references the x86 exception table. The EC view references the ARM exception table, as it did before this change.
SquallATF
pushed a commit
to SquallATF/llvm-project
that referenced
this pull request
Apr 2, 2025
…lvm#126713) In the native view, ExtraEFRTable references the x86 exception table. The EC view references the ARM exception table, as it did before this change.
SquallATF
pushed a commit
to SquallATF/llvm-project
that referenced
this pull request
Apr 17, 2025
…lvm#126713) In the native view, ExtraEFRTable references the x86 exception table. The EC view references the ARM exception table, as it did before this change.
SquallATF
pushed a commit
to SquallATF/llvm-project
that referenced
this pull request
Apr 30, 2025
…lvm#126713) In the native view, ExtraEFRTable references the x86 exception table. The EC view references the ARM exception table, as it did before this change.
SquallATF
pushed a commit
to SquallATF/llvm-project
that referenced
this pull request
May 15, 2025
…lvm#126713) In the native view, ExtraEFRTable references the x86 exception table. The EC view references the ARM exception table, as it did before this change.
SquallATF
pushed a commit
to SquallATF/llvm-project
that referenced
this pull request
May 29, 2025
…lvm#126713) In the native view, ExtraEFRTable references the x86 exception table. The EC view references the ARM exception table, as it did before this change.
SquallATF
pushed a commit
to SquallATF/llvm-project
that referenced
this pull request
Jun 13, 2025
…lvm#126713) In the native view, ExtraEFRTable references the x86 exception table. The EC view references the ARM exception table, as it did before this change.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In the native view, ExtraEFRTable references the x86 exception table. The EC view references the ARM exception table, as it did before this change.