Skip to contentSkip to conversation

azure/gitlab/travis: Switch to gcc 9.2.0

PATCH New Bin Meng 2 participants 7 messages Apr 6, 2020

Subsystems (2)
lore
Share & tools
lore

Bin Meng

author
#0 lore raw

cover azure/gitlab/travis: Switch to gcc 9.2.0

This updates all CI services to use gcc 9.2.0 for build testing.

Azure results:
https://dev.azure.com/bmeng/GitHub/_build/results?buildId=201&view=results

Gitlab results:
https://gitlab.denx.de/u-boot/custodians/u-boot-x86/pipelines/2632

Travis results:
https://travis-ci.org/github/lbmeng/u-boot/builds/671506792

This series depends on Docker file update for azure/gitlab:
http://patchwork.ozlabs.org/patch/1266862/

This series should be applied after:
http://patchwork.ozlabs.org/project/uboot/list/?series=167328

Bin Meng (3):
video: sunxi: Change sunxi_get_mon_desc() to not return NULL for the
default case
buildman: Support fetching gcc 9.2.0
travis: Switch to gcc 9.2.0

 .travis.yml                         | 40 ++++++++++++++++++-------------------
 drivers/video/sunxi/sunxi_display.c |  2 +-
 tools/buildman/toolchain.py         |  2 +-
 3 files changed, 22 insertions(+), 22 deletions(-)
Signature · 1 line
2.7.4
author
#1 lore raw

PATCH 1/3 video: sunxi: Change sunxi_get_mon_desc() to not return NULL for the default case

When building with gcc 9.2.0, the following build warning was seen:

drivers/video/sunxi/sunxi_display.c: In function 'video_hw_init':
drivers/video/sunxi/sunxi_display.c:1217:2:
error: '%s' directive argument is null [-Werror=format-overflow=]

Change sunxi_get_mon_desc() to not return NULL for the default case, to fix the compiler warning.

---

 drivers/video/sunxi/sunxi_display.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/video/sunxi/sunxi_display.c +1 -1
index 31f0aa7..5679d83 100644
@@ -1024,7 +1024,7 @@ static const char *sunxi_get_mon_desc(enum sunxi_monitor monitor)
 	case sunxi_monitor_composite_pal_m:	return "composite-pal-m";
 	case sunxi_monitor_composite_pal_nc:	return "composite-pal-nc";
 	}
-	return NULL; /* never reached */
+	return "none"; /* never reached */
 }
 
 ulong board_get_usable_ram_top(ulong total_size)
Signature · 1 line
2.7.4
#2 lore raw

PATCH 1/3 video: sunxi: Change sunxi_get_mon_desc() to not return NULL for the default case

Quoted 20 lines · Bin Meng

When building with gcc 9.2.0, the following build warning was seen:

drivers/video/sunxi/sunxi_display.c: In function 'video_hw_init':
drivers/video/sunxi/sunxi_display.c:1217:2:
error: '%s' directive argument is null [-Werror=format-overflow=]

Change sunxi_get_mon_desc() to not return NULL for the default case, to fix the compiler warning.

---

 drivers/video/sunxi/sunxi_display.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/video/sunxi/sunxi_display.c +0 -0
index 31f0aa7..5679d83 100644

drivers/video/sunxi/sunxi_display.c static const char *sunxi_get_mon_desc(enum sunxi_monitor monitor) · line 1030

Quoted 8 lines
drivers/video/sunxi/sunxi_display.c +1 -1
@@ -1024,7 +1024,7 @@ static const char *sunxi_get_mon_desc(enum sunxi_monitor monitor)
 	case sunxi_monitor_composite_pal_m:	return "composite-pal-m";
 	case sunxi_monitor_composite_pal_nc:	return "composite-pal-nc";
 	}
-	return NULL; /* never reached */
+	return "none"; /* never reached */
 }
 
 ulong board_get_usable_ram_top(ulong total_size)

That's fine. But do we want to re-work the function to catch sunxi_monitor_none in the default case and use "none" there as well (like it does today) to silence the warning? Thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200406/80bc0938/attachment.sig>
author
#3 lore raw

PATCH 2/3 buildman: Support fetching gcc 9.2.0

In reply to Bin Meng

This adds support to fetch gcc 9.2.0 toolchains.

---

 tools/buildman/toolchain.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/buildman/toolchain.py +1 -1
index 89c54d6..4456a80 100644
@@ -490,7 +490,7 @@ class Toolchains:
         if arch == 'aarch64':
             arch = 'arm64'
         base = 'https://www.kernel.org/pub/tools/crosstool/files/bin'
-        versions = ['7.3.0', '6.4.0', '4.9.4']
+        versions = ['9.2.0', '7.3.0', '6.4.0', '4.9.4']
         links = []
         for version in versions:
             url = '%s/%s/%s/' % (base, arch, version)
Signature · 1 line
2.7.4
#4 lore raw

PATCH 2/3 buildman: Support fetching gcc 9.2.0

Quoted 3 lines · Bin Meng

This adds support to fetch gcc 9.2.0 toolchains.

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200406/57dfe25b/attachment.sig>
author
#5 lore raw

PATCH 3/3 travis: Switch to gcc 9.2.0

In reply to Bin Meng

Use gcc 9.2.0 to do the build testing.

---

 .travis.yml | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)
.travis.yml +20 -20
index fddaee8..c70099e 100644
@@ -118,11 +118,11 @@ before_script:
        ./bootstrap &&
        ./configure --target=arm --with-platform=efi
        CC=gcc
-       TARGET_CC=~/.buildman-toolchains/gcc-7.3.0-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-gcc
-       TARGET_OBJCOPY=~/.buildman-toolchains/gcc-7.3.0-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-objcopy
-       TARGET_STRIP=~/.buildman-toolchains/gcc-7.3.0-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-strip
-       TARGET_NM=~/.buildman-toolchains/gcc-7.3.0-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-nm
-       TARGET_RANLIB=~/.buildman-toolchains/gcc-7.3.0-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-ranlib &&
+       TARGET_CC=~/.buildman-toolchains/gcc-9.2.0-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-gcc
+       TARGET_OBJCOPY=~/.buildman-toolchains/gcc-9.2.0-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-objcopy
+       TARGET_STRIP=~/.buildman-toolchains/gcc-9.2.0-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-strip
+       TARGET_NM=~/.buildman-toolchains/gcc-9.2.0-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-nm
+       TARGET_RANLIB=~/.buildman-toolchains/gcc-9.2.0-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-ranlib &&
        make -j4 &&
        ./grub-mkimage -O arm-efi -o ~/grub_arm.efi --prefix= -d
        grub-core cat chain configfile echo efinet ext2 fat halt help linux
@@ -138,11 +138,11 @@ before_script:
        ./bootstrap &&
        ./configure --target=aarch64 --with-platform=efi
        CC=gcc
-       TARGET_CC=~/.buildman-toolchains/gcc-7.3.0-nolibc/aarch64-linux/bin/aarch64-linux-gcc
-       TARGET_OBJCOPY=~/.buildman-toolchains/gcc-7.3.0-nolibc/aarch64-linux/bin/aarch64-linux-objcopy
-       TARGET_STRIP=~/.buildman-toolchains/gcc-7.3.0-nolibc/aarch64-linux/bin/aarch64-linux-strip
-       TARGET_NM=~/.buildman-toolchains/gcc-7.3.0-nolibc/aarch64-linux/bin/aarch64-linux-nm
-       TARGET_RANLIB=~/.buildman-toolchains/gcc-7.3.0-nolibc/aarch64-linux/bin/aarch64-linux-ranlib &&
+       TARGET_CC=~/.buildman-toolchains/gcc-9.2.0-nolibc/aarch64-linux/bin/aarch64-linux-gcc
+       TARGET_OBJCOPY=~/.buildman-toolchains/gcc-9.2.0-nolibc/aarch64-linux/bin/aarch64-linux-objcopy
+       TARGET_STRIP=~/.buildman-toolchains/gcc-9.2.0-nolibc/aarch64-linux/bin/aarch64-linux-strip
+       TARGET_NM=~/.buildman-toolchains/gcc-9.2.0-nolibc/aarch64-linux/bin/aarch64-linux-nm
+       TARGET_RANLIB=~/.buildman-toolchains/gcc-9.2.0-nolibc/aarch64-linux/bin/aarch64-linux-ranlib &&
        make -j4 &&
        ./grub-mkimage -O arm64-efi -o ~/grub_arm64.efi --prefix= -d
        grub-core cat chain configfile echo efinet ext2 fat halt help linux
@@ -158,11 +158,11 @@ before_script:
        ./bootstrap &&
        ./configure --target=riscv32 --with-platform=efi
        CC=gcc
-       TARGET_CC=~/.buildman-toolchains/gcc-7.3.0-nolibc/riscv32-linux/bin/riscv32-linux-gcc
-       TARGET_OBJCOPY=~/.buildman-toolchains/gcc-7.3.0-nolibc/riscv32-linux/bin/riscv32-linux-objcopy
-       TARGET_STRIP=~/.buildman-toolchains/gcc-7.3.0-nolibc/riscv32-linux/bin/riscv32-linux-strip
-       TARGET_NM=~/.buildman-toolchains/gcc-7.3.0-nolibc/riscv32-linux/bin/riscv32-linux-nm
-       TARGET_RANLIB=~/.buildman-toolchains/gcc-7.3.0-nolibc/riscv32-linux/bin/riscv32-linux-ranlib &&
+       TARGET_CC=~/.buildman-toolchains/gcc-9.2.0-nolibc/riscv32-linux/bin/riscv32-linux-gcc
+       TARGET_OBJCOPY=~/.buildman-toolchains/gcc-9.2.0-nolibc/riscv32-linux/bin/riscv32-linux-objcopy
+       TARGET_STRIP=~/.buildman-toolchains/gcc-9.2.0-nolibc/riscv32-linux/bin/riscv32-linux-strip
+       TARGET_NM=~/.buildman-toolchains/gcc-9.2.0-nolibc/riscv32-linux/bin/riscv32-linux-nm
+       TARGET_RANLIB=~/.buildman-toolchains/gcc-9.2.0-nolibc/riscv32-linux/bin/riscv32-linux-ranlib &&
        make -j4 &&
        ./grub-mkimage -O riscv32-efi -o ~/grub_riscv32.efi --prefix= -d
        grub-core cat chain configfile echo efinet ext2 fat halt help linux
@@ -178,11 +178,11 @@ before_script:
        ./bootstrap &&
        ./configure --target=riscv64 --with-platform=efi
        CC=gcc
-       TARGET_CC=~/.buildman-toolchains/gcc-7.3.0-nolibc/riscv64-linux/bin/riscv64-linux-gcc
-       TARGET_OBJCOPY=~/.buildman-toolchains/gcc-7.3.0-nolibc/riscv64-linux/bin/riscv64-linux-objcopy
-       TARGET_STRIP=~/.buildman-toolchains/gcc-7.3.0-nolibc/riscv64-linux/bin/riscv64-linux-strip
-       TARGET_NM=~/.buildman-toolchains/gcc-7.3.0-nolibc/riscv64-linux/bin/riscv64-linux-nm
-       TARGET_RANLIB=~/.buildman-toolchains/gcc-7.3.0-nolibc/riscv64-linux/bin/riscv64-linux-ranlib &&
+       TARGET_CC=~/.buildman-toolchains/gcc-9.2.0-nolibc/riscv64-linux/bin/riscv64-linux-gcc
+       TARGET_OBJCOPY=~/.buildman-toolchains/gcc-9.2.0-nolibc/riscv64-linux/bin/riscv64-linux-objcopy
+       TARGET_STRIP=~/.buildman-toolchains/gcc-9.2.0-nolibc/riscv64-linux/bin/riscv64-linux-strip
+       TARGET_NM=~/.buildman-toolchains/gcc-9.2.0-nolibc/riscv64-linux/bin/riscv64-linux-nm
+       TARGET_RANLIB=~/.buildman-toolchains/gcc-9.2.0-nolibc/riscv64-linux/bin/riscv64-linux-ranlib &&
        make -j4 &&
        ./grub-mkimage -O riscv64-efi -o ~/grub_riscv64.efi --prefix= -d
        grub-core cat chain configfile echo efinet ext2 fat halt help linux
Signature · 1 line
2.7.4
#6 lore raw

PATCH 3/3 travis: Switch to gcc 9.2.0

Quoted 4 lines · Bin Meng

Use gcc 9.2.0 to do the build testing.

And when I grab this I'll also grab the patch to push to a newer LLVM I posted a while ago. Thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200406/1f45fde7/attachment.sig>