diff mbox

[1/4] Add mkoffload for Intel MIC

Message ID 87sig8ylhv.fsf@kepler.schwinge.homeip.net
State New
Headers show

Commit Message

Thomas Schwinge Dec. 22, 2014, 11:25 a.m. UTC 
Hi!

On Wed, 22 Oct 2014 22:57:01 +0400, Ilya Verbin <iverbin@gmail.com> wrote:
> --- /dev/null
> +++ b/gcc/config/i386/intelmic-mkoffload.c
> @@ -0,0 +1,541 @@
> +/* Offload image generation tool for Intel MIC devices.

> +/* Shows if we should compile binaries for i386 instead of x86-64.  */
> +bool target_ilp32 = false;

My linker defaults to 32-bit x86, so I explicitly have to switch to
64-bit x86_64 mode; OK to commit the following, to always explicitly
specify what is wanted?

 gcc/config/i386/intelmic-mkoffload.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)



Grüße,
 Thomas

Comments

Jakub Jelinek Dec. 22, 2014, 11:28 a.m. UTC | #1 
On Mon, Dec 22, 2014 at 12:25:32PM +0100, Thomas Schwinge wrote:
> Hi!
> 
> On Wed, 22 Oct 2014 22:57:01 +0400, Ilya Verbin <iverbin@gmail.com> wrote:
> > --- /dev/null
> > +++ b/gcc/config/i386/intelmic-mkoffload.c
> > @@ -0,0 +1,541 @@
> > +/* Offload image generation tool for Intel MIC devices.
> 
> > +/* Shows if we should compile binaries for i386 instead of x86-64.  */
> > +bool target_ilp32 = false;
> 
> My linker defaults to 32-bit x86, so I explicitly have to switch to
> 64-bit x86_64 mode; OK to commit the following, to always explicitly
> specify what is wanted?
> 
>  gcc/config/i386/intelmic-mkoffload.c | 12 ++++++++----
>  1 file changed, 8 insertions(+), 4 deletions(-)

Ok with proper ChangeLog entry.

	Jakub
diff mbox

Patch

diff --git gcc/config/i386/intelmic-mkoffload.c gcc/config/i386/intelmic-mkoffload.c
index c972f56..7337c31 100644
--- gcc/config/i386/intelmic-mkoffload.c
+++ gcc/config/i386/intelmic-mkoffload.c
@@ -191,6 +191,8 @@  compile_for_target (struct obstack *argv_obstack)
 {
   if (target_ilp32)
     obstack_ptr_grow (argv_obstack, "-m32");
+  else
+    obstack_ptr_grow (argv_obstack, "-m64");
   obstack_ptr_grow (argv_obstack, NULL);
   char **argv = XOBFINISH (argv_obstack, char **);
 
@@ -355,6 +357,8 @@  generate_host_descr_file (const char *host_compiler)
   new_argv[new_argc++] = "-shared";
   if (target_ilp32)
     new_argv[new_argc++] = "-m32";
+  else
+    new_argv[new_argc++] = "-m64";
   new_argv[new_argc++] = src_filename;
   new_argv[new_argc++] = "-o";
   new_argv[new_argc++] = obj_filename;
@@ -511,11 +515,11 @@  main (int argc, char **argv)
   unsigned new_argc = 0;
   const char *new_argv[9];
   new_argv[new_argc++] = "ld";
+  new_argv[new_argc++] = "-m";
   if (target_ilp32)
-    {
-      new_argv[new_argc++] = "-m";
-      new_argv[new_argc++] = "elf_i386";
-    }
+    new_argv[new_argc++] = "elf_i386";
+  else
+    new_argv[new_argc++] = "elf_x86_64";
   new_argv[new_argc++] = "--relocatable";
   new_argv[new_argc++] = host_descr_filename;
   new_argv[new_argc++] = target_so_filename;