Merge branch 'mr/encode-default-target-at-build-time' into 'master'

Encode the default target at build time See merge request eng/toolchain/gnat-llvm!360

Author: sebastianpoeplau

llvm-interface/Makefile

@@ -71,6 +71,9 @@ GEN_IL_FILES = nmake.adb nmake.ads \
  seinfo.ads sinfo-nodes.ads sinfo-nodes.adb \
  einfo-entities.ads einfo-entities.adb
 
+target=$(shell gcc -dumpmachine)
+llvm_target=$(shell clang -dumpmachine)
+
 setup:
 $(MKDIR) obj obj-tools/libgnat bin gnat_src/vast
 for f in `cd $(GNAT_SRC); ls gen_il*.ad? xutil.ad? *-tmpl xoscons.adb xsnamest.adb`; \
@@ -86,21 +89,22 @@ setup:
 done
 ./check_for_LLVM_aliasing_bug.sh
 ./check_for_llvm_apis.sh "$(LLVM_CONFIG)"
+./configure_default_target.sh "$(llvm_target)"
 
 build: setup force
 $(GPRBUILD) -Pgnat_llvm -j$(PROCS) \
  -largs $(LDFLAGS) -cargs:c++ $(ALL_CXXFLAGS)
-$(GPRBUILD) -Ptools -j$(PROCS) -largs $(LDFLAGS)
+$(GPRBUILD) -Ptools -j$(PROCS)
 
 build-uninit: setup force
 $(GPRBUILD) -XBuild=Uninitialized -Pgnat_llvm -j$(PROCS) \
  -largs $(LDFLAGS) -cargs:c++ $(ALL_CXXFLAGS)
-$(GPRBUILD) -Ptools -j$(PROCS) -largs $(LDFLAGS)
+$(GPRBUILD) -Ptools -j$(PROCS)
 
 build-opt: setup force
 $(GPRBUILD) $(GPROPT) -Pgnat_llvm -j$(PROCS) \
  -largs $(LDFLAGS) -cargs:c++ $(ALL_CXXFLAGS)
-$(GPRBUILD) $(GPROPT) -Ptools -j$(PROCS) -largs $(LDFLAGS)
+$(GPRBUILD) $(GPROPT) -Ptools -j$(PROCS)
 
 # Target for building with coverage instrumentation.
 build-cov: setup force
@@ -186,8 +190,6 @@ clean:
 # Note some of these target(.*) variables are used in gnat_src's Makefiles.
 # Renaming them will lead to runtime compilation errors.
 
-target=$(shell gcc -dumpmachine)
-
 target_list=$(filter-out gnu,$(subst -, ,$(target)))
 target_cpu=$(word 1,$(target_list))
 
@@ -207,8 +209,6 @@ else
 make gnatlib-automated
 endif
 
-llvm_target=$(shell clang -dumpmachine)
-
 RTSBASE=rts-native
 RTS=$(pwd)/lib/gnat-llvm/$(llvm_target)/$(RTSBASE)
 RTSDIR=$(RTS)/adainclude

llvm-interface/check_for_LLVM_aliasing_bug.sh

@@ -119,8 +119,10 @@ else
  BUG=True
  echo "using LLVM with the aliasing bug, will pessimize slightly the optimized code"
 fi
-cat << EOF > obj/gnatllvm-aliasing-params.ads
+cat << EOF > obj/tmp-gnatllvm-aliasing-params.ads
 package GNATLLVM.Aliasing.Params is
  LLVM_Struct_Tag_Bug : constant Boolean := $BUG;
 end GNATLLVM.Aliasing.Params;
 EOF
+
+./move-if-change obj/tmp-gnatllvm-aliasing-params.ads obj/gnatllvm-aliasing-params.ads

llvm-interface/configure_default_target.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -eu
+
+default_target="$1"
+
+cat << EOF > obj/tmp-options-target.ads
+package Options.Target is
+ Default_Target_Triple : constant String := "$default_target";
+end Options.Target;
+EOF
+
+./move-if-change obj/tmp-options-target.ads obj/options-target.ads

llvm-interface/gcc_wrapper.adb

@@ -30,8 +30,7 @@ with Ada.Command_Line; use Ada.Command_Line;
 with Ada.Strings.Fixed; use Ada.Strings.Fixed;
 with GNAT.OS_Lib; use GNAT.OS_Lib;
 with GNATLLVM;
-
-with LLVM.Target_Machine; use LLVM.Target_Machine;
+with Options.Target; use Options.Target;
 
 with Gnatvsn; use Gnatvsn;
 
@@ -207,7 +206,7 @@ procedure GCC_Wrapper is
  Suffix : String_Access := Get_Target_Executable_Suffix;
  Result : constant String :=
  Executable_Location & "libexec/gnat-llvm/" &
- Get_Default_Target_Triple & "/bin/" & Exec;
+ Default_Target_Triple & "/bin/" & Exec;
  Is_Exec : constant Boolean :=
  Is_Executable_File (Result & Suffix.all);
 
@@ -248,7 +247,7 @@ begin
 
  elsif Arg = "-dumpmachine" then
 
- Put_Line (Get_Default_Target_Triple);
+ Put_Line (Default_Target_Triple);
  OS_Exit (0);
 
  elsif Arg = "--version" then

llvm-interface/gnatllvm-codegen.ads

@@ -15,7 +15,8 @@
 -- of the license. --
 ------------------------------------------------------------------------------
 
-with Options; use Options;
+with Options; use Options;
+with Options.Target; use Options.Target;
 
 package GNATLLVM.Codegen is
 
@@ -49,7 +50,7 @@ package GNATLLVM.Codegen is
  -- Features to enable or disable for this target
 
  Target_Triple : String_Access :=
- new String'(Get_Default_Target_Triple);
+ new String'(Default_Target_Triple);
  -- Name of the target for this compilation
 
  Normalized_Target_Triple : String_Access := null;

llvm-interface/sdefault.adb

@@ -25,9 +25,8 @@
 -- This package body provides the llvm-gnat1 implementation of the routines
 -- that locate the Ada library source and object directories.
 
-with LLVM.Target_Machine; use LLVM.Target_Machine;
-
 with Options; use Options;
+with Options.Target; use Options.Target;
 with Osint; use Osint;
 
 package body Sdefault is
@@ -42,7 +41,7 @@ package body Sdefault is
  return Relocate_Path ("/PREFIX",
  (if CCG then "/PREFIX/lib/rts-ccg/adainclude"
  else "/PREFIX/lib/gnat-llvm/" &
- Get_Default_Target_Triple &
+ Default_Target_Triple &
  "/rts-native/adainclude"));
  end Include_Dir_Default_Name;
 
@@ -55,7 +54,7 @@ package body Sdefault is
  return Relocate_Path ("/PREFIX",
  (if CCG then "/PREFIX/lib/rts-ccg/adalib"
  else "/PREFIX/lib/gnat-llvm/" &
- Get_Default_Target_Triple &
+ Default_Target_Triple &
  "/rts-native/adalib"));
  end Object_Dir_Default_Name;
 
@@ -68,7 +67,7 @@ package body Sdefault is
  return Relocate_Path ("/PREFIX",
  (if CCG then "/PREFIX/lib/"
  else "/PREFIX/lib/gnat-llvm/" &
- Get_Default_Target_Triple & "//"));
+ Default_Target_Triple & "//"));
  end Search_Dir_Prefix;
 
  -----------------
@@ -77,7 +76,7 @@ package body Sdefault is
 
  function Target_Name return String_Ptr is
  begin
- return new String'(Get_Default_Target_Triple);
+ return new String'(Default_Target_Triple);
  end Target_Name;
 
 end Sdefault;

llvm-interface/tools.gpr

@@ -1,8 +1,7 @@
 with "gnat_llvm_c";
 
 project Tools is
- for Source_Dirs use
- (".", "obj", "gnat_src", "../llvm-bindings/adainclude");
+ for Source_Dirs use (".", "obj", "gnat_src");
  for Object_Dir use "obj";
  for Exec_Dir use "bin";
  for Languages use ("Ada");