Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys Fix build with clang.



details:   https://anonhg.NetBSD.org/src/rev/478327b6b8d1
branches:  trunk
changeset: 821402:478327b6b8d1
user:      roy <roy%NetBSD.org@localhost>
date:      Fri Feb 03 17:24:43 2017 +0000

description:
Fix build with clang.

diffstat:

 sys/arch/i386/stand/efiboot/Makefile.efiboot |  6 ++++--
 sys/lib/libgnuefi/Makefile                   |  9 ++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diffs (48 lines):

diff -r 192eac36e666 -r 478327b6b8d1 sys/arch/i386/stand/efiboot/Makefile.efiboot
--- a/sys/arch/i386/stand/efiboot/Makefile.efiboot      Fri Feb 03 16:57:39 2017 +0000
+++ b/sys/arch/i386/stand/efiboot/Makefile.efiboot      Fri Feb 03 17:24:43 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.efiboot,v 1.1 2017/01/24 11:09:14 nonaka Exp $
+# $NetBSD: Makefile.efiboot,v 1.2 2017/02/03 17:24:43 roy Exp $
 
 S=             ${.CURDIR}/../../../../..
 
@@ -46,8 +46,10 @@
 CPPFLAGS+= -I${.OBJDIR}
 CPPFLAGS+= -I${.CURDIR}/../../lib
 
+CWARNFLAGS.clang+= -Wno-invalid-noreturn #panic.c
 COPTS+= -ffreestanding -fPIC -fshort-wchar -fno-strict-aliasing -fno-builtin
-COPTS+= -fno-stack-protector -falign-functions=16
+COPTS+= -fno-stack-protector
+COPTS+= ${${ACTIVE_CC} == "gcc":? -falign-functions=16 :}
 CPPFLAGS+= -nostdinc -D_STANDALONE
 CPPFLAGS+= -DEFIBOOT
 
diff -r 192eac36e666 -r 478327b6b8d1 sys/lib/libgnuefi/Makefile
--- a/sys/lib/libgnuefi/Makefile        Fri Feb 03 16:57:39 2017 +0000
+++ b/sys/lib/libgnuefi/Makefile        Fri Feb 03 17:24:43 2017 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.5 2017/01/24 11:09:14 nonaka Exp $
+#      $NetBSD: Makefile,v 1.6 2017/02/03 17:28:58 roy Exp $
 
 LIB=   gnuefi
 LIBISPRIVATE?= yes
@@ -56,14 +56,13 @@
        rtlock.c efirtlib.c rtstr.c vm.c rtdata.c \
        initplat.c math.c
 
+CWARNFLAGS.gcc+= -Wno-unused-but-set-variable
 COPTS.boxdraw.c= -Wno-missing-field-initializers
 COPTS.guid.c= -Wno-missing-field-initializers
 COPTS.smbios.c= -Wno-int-to-pointer-cast
-COPTS.dpath.c= -Wno-missing-prototypes -Wno-unused-but-set-variable
+COPTS.dpath.c= -Wno-missing-prototypes
 COPTS.print.c= -Wno-missing-prototypes
-COPTS.hw.c= -Wno-shadow -Wno-unused-but-set-variable
-COPTS.event.c= -Wno-unused-but-set-variable
-COPTS.hand.c= -Wno-unused-but-set-variable
+COPTS.hw.c= -Wno-shadow
 
 .include <bsd.lib.mk>
 



Home | Main Index | Thread Index | Old Index