Don't generate jmptbl symbol on 32-bit

Author: dra27

flexdll_initer.c

@@ -22,24 +22,32 @@ typedef int func(void*);
 typedef int func_v2(void*,void*);
 
 extern int reloctbl;
+#if defined(_WIN64) || defined(__CYGWIN64__)
 extern int jmptbl;
+#endif
 
 static int flexdll_init() {
   func *sym = 0;
   func_v2 *sym_v2 = 0;
-  char *s = getenv("FLEXDLL_RELOCATE_V2");
   /* If the supplied symbol is NULL, treat as "loaded not for execution" */
+#if defined(_WIN64) || defined(__CYGWIN64)
+  char *s = getenv("FLEXDLL_RELOCATE_V2");
   if (!s) {
+#else
+  char *s;
+#endif
     s = getenv("FLEXDLL_RELOCATE");
     if (!s) { fprintf(stderr, "Cannot find FLEXDLL_RELOCATE\n"); return FALSE; }
     /* The executable image doesn't support the V2 interface, so RELOC_REL32
        may fail. */
     sscanf(s, "%p", &sym);
     if (!sym || sym(&reloctbl)) return TRUE;
+#if defined(_WIN64) || defined(__CYGWIN64)
   } else {
     sscanf(s, "%p", &sym_v2);
     if (!sym_v2 || sym_v2(&reloctbl, &jmptbl)) return TRUE;
   }
+#endif
   return FALSE;
 }
 

reloc.ml

@@ -753,7 +753,7 @@ let build_dll link_exe output_file files exts extra_args =
     List.iter (fun fn -> collect_file (find_file fn)) exts;
 
     if main_pgm then add_def (usym "static_symtable")
-    else (add_def (usym "reloctbl"); add_def (usym "jmptbl"));
+    else (add_def (usym "reloctbl"); if !machine = `x64 then add_def (usym "jmptbl"));
 
     if !machine = `x64 then add_def "__ImageBase"
     else add_def "___ImageBase";
@@ -936,7 +936,8 @@ let build_dll link_exe output_file files exts extra_args =
     (usym (if main_pgm then "static_symtable" else "symtbl"));
   if not main_pgm then begin
     add_master_reloc_table obj !reloctbls (usym "reloctbl");
-    add_master_jmp_table obj !trampolines (usym "jmptbl");
+    if !machine = `x64 then
+      add_master_jmp_table obj !trampolines (usym "jmptbl");
   end;
 
   if !errors then
@@ -1029,10 +1030,11 @@ let build_dll link_exe output_file files exts extra_args =
            with the Windows 7 SDK in 64-bit mode. *)
 
         Printf.sprintf
-          "link /nologo %s%s%s%s%s /implib:%s /out:%s /subsystem:%s %s %s %s"
+          "link /nologo %s%s%s%s%s%s /implib:%s /out:%s /subsystem:%s %s %s %s"
           (if !verbose >= 2 then "/verbose " else "")
           (if link_exe = `EXE then "" else "/dll ")
-          (if main_pgm then "" else "/export:symtbl /export:reloctbl /export:jmptbl ")
+          (if main_pgm then "" else "/export:symtbl /export:reloctbl ")
+          (if !machine = `x86 then "" else "/export:jmptbl ")
           (if main_pgm then "" else if !noentry then "/noentry " else
           let s =
             match !machine with
@@ -1052,7 +1054,9 @@ let build_dll link_exe output_file files exts extra_args =
           if main_pgm then ""
           else
             let def_file, oc = open_temp_file "flexlink" ".def" in
-            Printf.fprintf oc "EXPORTS\n  reloctbl\n  symtbl\n  jmptbl\n";
+            Printf.fprintf oc "EXPORTS\n  reloctbl\n  symtbl\n";
+            if !machine = `x64 then
+              Printf.fprintf oc "  jmptbl\n";
             close_out oc;
             Filename.quote def_file
         in
@@ -1078,7 +1082,9 @@ let build_dll link_exe output_file files exts extra_args =
           if main_pgm then ""
           else
             let def_file, oc = open_temp_file "flexlink" ".def" in
-            Printf.fprintf oc "EXPORTS\n  reloctbl\n  symtbl\n  jmptbl\n";
+            Printf.fprintf oc "EXPORTS\n  reloctbl\n  symtbl\n";
+            if !machine = `x64 then
+              Printf.fprintf oc "  jmptbl\n";
             close_out oc;
             Filename.quote def_file
         in