Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

make: remove use of export with LINKFLAGS variable #13018

Merged
merged 10 commits into from
Jan 2, 2020

Conversation

aabadie
Copy link
Contributor

@aabadie aabadie commented Jan 2, 2020

Contribution description

This PR removes the remaining unnecessary uses of export along with the LINKFLAGS variable.

Testing procedure

  • A green Murdock
  • Verify that firmwares are unchanged on the related platforms:

STM32

This PR:
$ RIOT_VERSION=test make BOARD=nucleo-l073rz -C examples/hello-world clean all
[...]
   text	   data	    bss	    dec	    hex	filename
   8356	    120	   2568	  11044	   2b24	/work/riot/RIOT/examples/hello-world/bin/nucleo-l073rz/hello-world.elf
master:
$ RIOT_VERSION=test make BOARD=nucleo-l073rz -C examples/hello-world clean all
[...]
   text	   data	    bss	    dec	    hex	filename
   8356	    120	   2568	  11044	   2b24	/work/riot/RIOT/examples/hello-world/bin/nucleo-l073rz/hello-world.elf

SAM

This PR:
$ RIOT_VERSION=test make BOARD=samr21-xpro -C examples/hello-world clean all
[...]
   text	   data	    bss	    dec	    hex	filename
   8488	    120	   2560	  11168	   2ba0	/work/riot/RIOT/examples/hello-world/bin/samr21-xpro/hello-world.elf
master:
$ RIOT_VERSION=test make BOARD=samr21-xpro -C examples/hello-world clean all
[...]
   text	   data	    bss	    dec	    hex	filename
   8488	    120	   2560	  11168	   2ba0	/work/riot/RIOT/examples/hello-world/bin/samr21-xpro/hello-world.elf

RISCV

This PR:
$ RIOT_VERSION=test make BOARD=hifive1b -C examples/hello-world clean all
[...]
   text	   data	    bss	    dec	    hex	filename
  10580	    112	   2408	  13100	   332c	/work/riot/RIOT/examples/hello-world/bin/hifive1b/hello-world.elf
master:
$ RIOT_VERSION=test make BOARD=hifive1b -C examples/hello-world clean all
[...]
   text	   data	    bss	    dec	    hex	filename
  10580	    112	   2408	  13100	   332c	/work/riot/RIOT/examples/hello-world/bin/hifive1b/hello-world.elf

MIPS

This PR:
$ RIOT_VERSION=test make BOARD=pic32-clicker -C examples/hello-world clean all
[...]
   text	   data	    bss	    dec	    hex	filename
  71284	   2412	   6008	  79704	  13758	/work/riot/RIOT/examples/hello-world/bin/pic32-clicker/hello-world.elf
master:
$ RIOT_VERSION=test make BOARD=pic32-clicker -C examples/hello-world clean all
[...]
   text	   data	    bss	    dec	    hex	filename
  71284	   2412	   6008	  79704	  13758	/work/riot/RIOT/examples/hello-world/bin/pic32-clicker/hello-world.elf

MSP430

This PR:
$ BUILD_IN_DOCKER=1 RIOT_VERSION=test make BOARD=z1 -C examples/hello-world clean all
[...]
   text	   data	    bss	    dec	    hex	filename
   4358	      6	    984	   5348	   14e4	/data/riotbuild/riotbase/examples/hello-world/bin/z1/hello-world.elf
master:
$ BUILD_IN_DOCKER=1 RIOT_VERSION=test make BOARD=z1 -C examples/hello-world clean all
[...]
   text	   data	    bss	    dec	    hex	filename
   4358	      6	    984	   5348	   14e4	/data/riotbuild/riotbase/examples/hello-world/bin/z1/hello-world.elf

native

This PR:
$ RIOT_VERSION=test make BOARD=native -C examples/hello-world clean all
[...]
   text	   data	    bss	    dec	    hex	filename
  24784	    576	  47728	  73088	  11d80	/work/riot/RIOT/examples/hello-world/bin/native/hello-world.elf
master:
$ RIOT_VERSION=test make BOARD=native -C examples/hello-world clean all
[...]
   text	   data	    bss	    dec	    hex	filename
  24784	    576	  47728	  73088	  11d80	/work/riot/RIOT/examples/hello-world/bin/native/hello-world.elf

ARMv7

This PR:
$ RIOT_VERSION=test make BOARD=msba2 -C examples/hello-world clean all
[...]
   text	   data	    bss	    dec	    hex	filename
  11416	    124	   6936	  18476	   482c	/work/riot/RIOT/examples/hello-world/bin/msba2/hello-world.elf
master:
$ RIOT_VERSION=test make BOARD=msba2 -C examples/hello-world clean all
[...]
   text	   data	    bss	    dec	    hex	filename
  11416	    124	   6936	  18476	   482c	/work/riot/RIOT/examples/hello-world/bin/msba2/hello-world.elf
  • Verify that libfixmath-unittests is unchanged (only on native here):
This PR:
$ RIOT_VERSION=test make BOARD=native -C examples/hello-world clean all
[...]
   text	   data	    bss	    dec	    hex	filename
  87200	    608	  47728	 135536	  21170	/work/riot/RIOT/tests/pkg_libfixmath_unittests/bin/native/tests_pkg_libfixmath_unittests.elf
master:
$ RIOT_VERSION=test make BOARD=native -C examples/hello-world clean all
[...]
   text	   data	    bss	    dec	    hex	filename
  87200	    608	  47728	 135536	  21170	/work/riot/RIOT/tests/pkg_libfixmath_unittests/bin/native/tests_pkg_libfixmath_unittests.elf
  • Verify that printf-float unittest is unchanged (only on native here):
This PR:
$ RIOT_VERSION=test make -C tests/unittests/ tests-printf_float
[...]
   text	   data	    bss	    dec	    hex	filename
  28300	    652	  47752	  76704	  12ba0	/work/riot/RIOT/tests/unittests/bin/native/tests_unittests.elf
master:
$ RIOT_VERSION=test make -C tests/unittests/ tests-printf_float
[...]
   text	   data	    bss	    dec	    hex	filename
  28300	    652	  47752	  76704	  12ba0	/work/riot/RIOT/tests/unittests/bin/native/tests_unittests.elf

Issues/PRs references

Ticks the LINKFLAGS item in #10850

@aabadie aabadie added Area: build system Area: Build system Type: cleanup The issue proposes a clean-up / The PR cleans-up parts of the codebase / documentation CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR labels Jan 2, 2020
@aabadie aabadie requested a review from fjmolinas January 2, 2020 09:39
@fjmolinas
Copy link
Contributor

The export are indeed not needed, only used to assign to _LINK. Thanks for the good work @aabadie!

(NOTE: had to rebase this branch to test build diffs)

Copy link
Contributor

@fjmolinas fjmolinas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK

@fjmolinas fjmolinas merged commit 45b2cca into RIOT-OS:master Jan 2, 2020
@aabadie aabadie deleted the pr/make/linkflags_remove_exports branch January 2, 2020 19:14
@fjmolinas fjmolinas added this to the Release 2020.01 milestone Jan 15, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Area: build system Area: Build system CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Type: cleanup The issue proposes a clean-up / The PR cleans-up parts of the codebase / documentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants