diff options
| -rw-r--r-- | C++Kit/StdKit/PEF.hpp | 10 | ||||
| -rw-r--r-- | CompilerDriver/ld.cxx | 6 | ||||
| -rw-r--r-- | CompilerDriver/masm.cxx | 2 |
3 files changed, 7 insertions, 11 deletions
diff --git a/C++Kit/StdKit/PEF.hpp b/C++Kit/StdKit/PEF.hpp index 2addbf3..e37f316 100644 --- a/C++Kit/StdKit/PEF.hpp +++ b/C++Kit/StdKit/PEF.hpp @@ -28,11 +28,8 @@ namespace CxxKit kPefArchIntel86S = 100, kPefArchAMD64, kPefArchRISCV, - kPefArchARC, /* Advanced RISC architecture. */ - kPefArchNewCPU = kPefArchARC, - kPefArch64000 = kPefArchNewCPU, - kPefArchPowerPC, - kPefArchARM64, + kPefArch64000, /* Advanced RISC architecture. */ + kPefArch32000, kPefArchInvalid = 0xFF, }; @@ -85,5 +82,4 @@ namespace CxxKit #define kPefExt ".o" #define kPefDylibExt ".so" #define kPefObjectExt ".o" -#define kPefDebugExt ".dbg" -#define kPefOrgMagic 0xFFAABBAA00
\ No newline at end of file +#define kPefDebugExt ".dbg"
\ No newline at end of file diff --git a/CompilerDriver/ld.cxx b/CompilerDriver/ld.cxx index 664803d..f101459 100644 --- a/CompilerDriver/ld.cxx +++ b/CompilerDriver/ld.cxx @@ -41,10 +41,10 @@ #define kStdOut (std::cout << kWhite) #define kPefDeaultOrg (uint64_t)0x10000 -#define kPefLinkerNumId 0x333D +#define kPefLinkerNumId 0x5046FF #define kPefAbiId "Container:Abi:MP-UX" -enum { kAbiMpUx = 0xDEAD1 }; +enum { kAbiMpUx = 0x5046 /* PF */ }; std::ofstream& operator<<(std::ofstream& fp, CxxKit::PEFContainer& container) { @@ -107,7 +107,7 @@ int main(int argc, char** argv) // else if (StringCompare(argv[i], "-m64000") == 0) { - kArch = CxxKit::kPefArchARC; + kArch = CxxKit::kPefArch64000; continue; } diff --git a/CompilerDriver/masm.cxx b/CompilerDriver/masm.cxx index eda95b4..4119324 100644 --- a/CompilerDriver/masm.cxx +++ b/CompilerDriver/masm.cxx @@ -137,7 +137,7 @@ int main(int argc, char** argv) } else if (strcmp(argv[i], "-m64000") == 0) { - kOutputArch = CxxKit::kPefArchARC; + kOutputArch = CxxKit::kPefArch64000; continue; } else if (strcmp(argv[i], "-verbose") == 0) |