aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlejandro Enedino Hernandez Samaniego <alejandr@xilinx.com>2019-04-22 21:30:58 -0700
committerManjukumar Matha <manjukumar.harthikote-matha@xilinx.com>2019-06-28 16:32:42 -0700
commit9c2a6d07c4f64c65eb0aab901d65fa4659b4dcf9 (patch)
treed713c1e665dc22d2fef196264350e2172d9db633
parentdc78605e615cb5362f0c647d4151c32078ec65fe (diff)
downloadmeta-xilinx-9c2a6d07c4f64c65eb0aab901d65fa4659b4dcf9.tar.gz
meta-xilinx-9c2a6d07c4f64c65eb0aab901d65fa4659b4dcf9.tar.bz2
meta-xilinx-9c2a6d07c4f64c65eb0aab901d65fa4659b4dcf9.zip
gcc: Remove xilinx.ld requirement
Applications do not require to have the xilinx.ld linker script by default. If this file isnt present applications fail to link at the LTO stage. Remove this requirement to fix the issue Signed-off-by: Alejandro Enedino Hernandez Samaniego <alejandr@xilinx.com> Signed-off-by: Manjukumar Matha <manjukumar.harthikote-matha@xilinx.com>
-rw-r--r--meta-xilinx-bsp/recipes-microblaze/gcc/gcc-8/0055-microblaze_linker_script_xilinx_ld.patch16
-rw-r--r--meta-xilinx-bsp/recipes-microblaze/gcc/gcc-source_8.%.bbappend1
2 files changed, 17 insertions, 0 deletions
diff --git a/meta-xilinx-bsp/recipes-microblaze/gcc/gcc-8/0055-microblaze_linker_script_xilinx_ld.patch b/meta-xilinx-bsp/recipes-microblaze/gcc/gcc-8/0055-microblaze_linker_script_xilinx_ld.patch
new file mode 100644
index 00000000..c009c92d
--- /dev/null
+++ b/meta-xilinx-bsp/recipes-microblaze/gcc/gcc-8/0055-microblaze_linker_script_xilinx_ld.patch
@@ -0,0 +1,16 @@
+diff --git a/gcc/config/microblaze/microblaze.h b/gcc/config/microblaze/microblaze.h
+index 740b8d9..4bda9c2 100644
+--- a/gcc/config/microblaze/microblaze.h
++++ b/gcc/config/microblaze/microblaze.h
+@@ -114,8 +114,9 @@ extern enum pipeline_type microblaze_pipe;
+ %{m64:-EL --oformat=elf64-microblazeel} \
+ %{Zxl-mode-xmdstub:-defsym _TEXT_START_ADDR=0x800} \
+ %{mxl-mode-xmdstub:-defsym _TEXT_START_ADDR=0x800} \
+- %{mxl-gp-opt:%{G*}} %{!mxl-gp-opt: -G 0} \
+- %{!T*: -dT xilinx.ld%s}"
++ %{mxl-gp-opt:%{G*}} %{!mxl-gp-opt: -G 0}"
++
++// %{!T*: -dT xilinx.ld%s}"
+
+ /* Specs for the compiler proper */
+
diff --git a/meta-xilinx-bsp/recipes-microblaze/gcc/gcc-source_8.%.bbappend b/meta-xilinx-bsp/recipes-microblaze/gcc/gcc-source_8.%.bbappend
index 38e95ed3..d6a81912 100644
--- a/meta-xilinx-bsp/recipes-microblaze/gcc/gcc-source_8.%.bbappend
+++ b/meta-xilinx-bsp/recipes-microblaze/gcc/gcc-source_8.%.bbappend
@@ -61,4 +61,5 @@ file://0001-LOCAL-Testsuite-builtins-tests-require-fpic.patch \
file://0059-Reverting-the-patch-as-kernel-boot-is-not-working-wi.patch \
file://0060-Patch-MicroBlaze-fixed-typos-in-mul-div-and-mod-asse.patch \
file://0061-Author-Nagaraju-nmekala-xilinx.com.patch \
+ file://0055-microblaze_linker_script_xilinx_ld.patch \
"