Date: Sun, 24 Dec 2017 16:53:55 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r327165 - in projects/clang600-import: contrib/binutils/bfd contrib/binutils/include share/mk sys/x86/isa usr.sbin/efibootmgr Message-ID: <201712241653.vBOGrt3C079288@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dim Date: Sun Dec 24 16:53:55 2017 New Revision: 327165 URL: https://svnweb.freebsd.org/changeset/base/327165 Log: Merge ^/head r327150 through r327164. Modified: projects/clang600-import/contrib/binutils/bfd/elflink.c projects/clang600-import/contrib/binutils/include/obstack.h projects/clang600-import/share/mk/bsd.sys.mk projects/clang600-import/sys/x86/isa/orm.c projects/clang600-import/usr.sbin/efibootmgr/efibootmgr.c Directory Properties: projects/clang600-import/ (props changed) projects/clang600-import/contrib/binutils/ (props changed) Modified: projects/clang600-import/contrib/binutils/bfd/elflink.c ============================================================================== --- projects/clang600-import/contrib/binutils/bfd/elflink.c Sun Dec 24 16:51:59 2017 (r327164) +++ projects/clang600-import/contrib/binutils/bfd/elflink.c Sun Dec 24 16:53:55 2017 (r327165) @@ -4815,7 +4815,7 @@ _bfd_elf_archive_symbol_lookup (bfd *abfd, len = strlen (name); copy = bfd_alloc (abfd, len); if (copy == NULL) - return (struct elf_link_hash_entry *) 0 - 1; + return (struct elf_link_hash_entry *)(intptr_t)-1; first = p - name + 1; memcpy (copy, name, first); @@ -4927,7 +4927,7 @@ elf_link_add_archive_symbols (bfd *abfd, struct bfd_li } h = archive_symbol_lookup (abfd, info, symdef->name); - if (h == (struct elf_link_hash_entry *) 0 - 1) + if (h == (struct elf_link_hash_entry *)(intptr_t)-1) goto error_return; if (h == NULL) Modified: projects/clang600-import/contrib/binutils/include/obstack.h ============================================================================== --- projects/clang600-import/contrib/binutils/include/obstack.h Sun Dec 24 16:51:59 2017 (r327164) +++ projects/clang600-import/contrib/binutils/include/obstack.h Sun Dec 24 16:53:55 2017 (r327165) @@ -119,11 +119,11 @@ extern "C" { may ignore the byte-within-word field of the pointer. */ #ifndef __PTR_TO_INT -# define __PTR_TO_INT(P) ((P) - (char *) 0) +# define __PTR_TO_INT(P) ((intptr_t)(P)) #endif #ifndef __INT_TO_PTR -# define __INT_TO_PTR(P) ((P) + (char *) 0) +# define __INT_TO_PTR(P) ((void*)(intptr_t)(P)) #endif /* We need the type of the resulting object. If __PTRDIFF_TYPE__ is @@ -427,7 +427,7 @@ __extension__ \ __o1->maybe_empty_object = 1; \ __o1->next_free \ = __INT_TO_PTR ((__PTR_TO_INT (__o1->next_free)+__o1->alignment_mask)\ - & ~ (__o1->alignment_mask)); \ + & ~(intptr_t)(__o1->alignment_mask)); \ if (__o1->next_free - (char *)__o1->chunk \ > __o1->chunk_limit - (char *)__o1->chunk) \ __o1->next_free = __o1->chunk_limit; \ Modified: projects/clang600-import/share/mk/bsd.sys.mk ============================================================================== --- projects/clang600-import/share/mk/bsd.sys.mk Sun Dec 24 16:51:59 2017 (r327164) +++ projects/clang600-import/share/mk/bsd.sys.mk Sun Dec 24 16:53:55 2017 (r327165) @@ -69,8 +69,11 @@ CWARNFLAGS+= -Wno-pointer-sign .if ${WARNS} <= 6 CWARNFLAGS.clang+= -Wno-empty-body -Wno-string-plus-int .if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 30400 -CWARNFLAGS.clang+= -Wno-unused-const-variable +CWARNFLAGS.clang+= -Wno-unused-const-variable .endif +.if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 60000 +CWARNFLAGS.clang+= -Wno-error=tautological-constant-compare +.endif .endif # WARNS <= 6 .if ${WARNS} <= 3 CWARNFLAGS.clang+= -Wno-tautological-compare -Wno-unused-value\ @@ -80,9 +83,6 @@ CWARNFLAGS.clang+= -Wno-unused-local-typedef .endif .if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 40000 CWARNFLAGS.clang+= -Wno-address-of-packed-member -.endif -.if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 60000 -CWARNFLAGS.clang+= -Wno-error=tautological-constant-compare .endif .endif # WARNS <= 3 .if ${WARNS} <= 2 Modified: projects/clang600-import/sys/x86/isa/orm.c ============================================================================== --- projects/clang600-import/sys/x86/isa/orm.c Sun Dec 24 16:51:59 2017 (r327164) +++ projects/clang600-import/sys/x86/isa/orm.c Sun Dec 24 16:53:55 2017 (r327165) @@ -156,7 +156,7 @@ orm_identify(driver_t* driver, device_t parent) device_set_desc(child, "ISA Option ROM"); else device_set_desc(child, "ISA Option ROMs"); - isa_set_vendorid(child, PNP_EISAID("PNP0C80")); +// isa_set_vendorid(child, PNP_EISAID("PNP0C80")); } static int Modified: projects/clang600-import/usr.sbin/efibootmgr/efibootmgr.c ============================================================================== --- projects/clang600-import/usr.sbin/efibootmgr/efibootmgr.c Sun Dec 24 16:51:59 2017 (r327164) +++ projects/clang600-import/usr.sbin/efibootmgr/efibootmgr.c Sun Dec 24 16:53:55 2017 (r327165) @@ -707,10 +707,8 @@ print_loadopt_str(uint8_t *data, size_t datalen) uint8_t *ep = data + datalen; uint8_t *walker = data; efidp dp, edp; - void *opt; char buf[1024]; int len; - int optlen; int rv; int indent; @@ -734,10 +732,11 @@ print_loadopt_str(uint8_t *data, size_t datalen) if (walker > ep) return; edp = (efidp)walker; - // Everything left is the binary option args - opt = walker; - optlen = ep - walker; - + /* + * Everything left is the binary option args + * opt = walker; + * optlen = ep - walker; + */ indent = 1; while (dp < edp) { efidp_format_device_path(buf, sizeof(buf), dp, @@ -753,8 +752,6 @@ print_loadopt_str(uint8_t *data, size_t datalen) } dp = (efidp)((char *)dp + efidp_size(dp)); } - if (optlen == 0) - return; } static char *
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201712241653.vBOGrt3C079288>