Allow 64-bit code to be stored as ELF64.

src/IceClFlags.def

@@ -229,6 +229,13 @@ struct dev_list_flag {};
                    "Low-level integrated assembly ('.s') file"),               \
         clEnumValEnd))                                                         \
                                                                                \
+  X(ApplicationBinaryInterface, Ice::ABI, dev_opt_flag, "abi",                 \
+    cl::desc("ABI type"), cl::init(Ice::ABI_PNaCl),                            \
+    cl::values(                                                                \
+        clEnumValN(Ice::ABI_PNaCl, "pnacl", "x32 for unsandboxed 64-bit x86"), \
+        clEnumValN(Ice::ABI_Platform, "platform", "Native executable ABI"),    \
+        clEnumValEnd))                                                         \
+                                                                               \
   X(ParseParallel, bool, dev_opt_flag, "parse-parallel",                       \
     cl::desc("Parse function blocks in parallel"), cl::init(true))             \
                                                                                \

src/IceDefs.h

@@ -372,6 +372,11 @@ enum FileType {
   FT_Iasm /// "Integrated assembler" .byte-style .s file
 };
 
+enum ABI {
+  ABI_PNaCl,   /// x32 for unsandboxed 64-bit x86
+  ABI_Platform /// Native executable ABI
+};
+
 using Ostream = llvm::raw_ostream;
 using Fdstream = llvm::raw_fd_ostream;
 

src/IceELFObjectWriter.cpp

@@ -49,8 +49,9 @@ bool isELF64(const ClFlags &Flags) {
     return false;
   }
 
-  if (!Flags.getUseSandboxing()) {
-    // Unsandboxed code is always ELF32 (pexes are ILP32.)
+  if (Flags.getApplicationBinaryInterface() == ABI_PNaCl &&
+      !Flags.getUseSandboxing()) {
+    // Unsandboxed PNaCl code is always ELF32 (pexes are ILP32.)
     return false;
   }