d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PowerPC64] stand: fix build using clang 8 as compiler

Browse Source 
This change fixes "stand" build issues when using clang 8
as compiler.

Submitted by:   alfredo.junior_eldorado.org.br
Reviewed by:    jhibbits
Differential Revision: https://reviews.freebsd.org/D20026
This commit is contained in:
Leandro Lupori 2019-05-20 19:21:35 +00:00
parent a1fa04c067
commit ff7449d6f5
9 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cddl/contrib/opensolaris/lib/libzfs/common/libzfs_diff.c
View File

@ -114,7 +114,7 @@ get_stats_for_obj(differ_info_t *di, const char *dsname, uint64_t obj,
(void) snprintf(di->errbuf, sizeof (di->errbuf),
dgettext(TEXT_DOMAIN,
"Unable to determine path or stats for "
"object %lld in %s"), obj, dsname);
"object %jd in %s"), (uintmax_t)obj, dsname);
return (-1);
}
}
@ -406,8 +406,8 @@ write_free_diffs(FILE *fp, differ_info_t *di, dmu_diff_record_t *dr)
} else {
(void) snprintf(di->errbuf, sizeof (di->errbuf),
dgettext(TEXT_DOMAIN,
"next allocated object (> %lld) find failure"),
zc.zc_obj);
"next allocated object (> %jd) find failure"),
(uintmax_t)zc.zc_obj);
di->zerr = errno;
break;
}

6
stand/common/load_elf.c
View File

@ -483,7 +483,7 @@ __elfN(loadimage)(struct preloaded_file *fp, elf_file_t ef, uint64_t off)
off += 0x01000000;
ehdr->e_entry += off;
#ifdef ELF_VERBOSE
printf("Converted entry 0x%08x\n", ehdr->e_entry);
printf("Converted entry 0x%jx\n", (uintmax_t)ehdr->e_entry);
#endif
} else
off = 0;
@ -509,8 +509,8 @@ __elfN(loadimage)(struct preloaded_file *fp, elf_file_t ef, uint64_t off)
off -= ehdr->e_entry & ~PAGE_MASK;
ehdr->e_entry += off;
#ifdef ELF_VERBOSE
printf("ehdr->e_entry 0x%08x, va<->pa off %llx\n",
ehdr->e_entry, off);
printf("ehdr->e_entry 0x%jx", va<->pa off %llx\n",
(uintmax_t)ehdr->e_entry, off);
#endif
#else
off = 0; /* other archs use direct mapped kernels */

4
stand/ofw/libofw/ofw_net.c
View File

@ -225,12 +225,12 @@ ofwn_init(struct iodesc *desc, void *machdep_hint)
dmabuf = NULL;
if (OF_call_method("dma-alloc", netinstance, 1, 1, (64 * 1024), &dmabuf)
< 0) {
printf("Failed to allocate DMA buffer (got %08x).\n", dmabuf);
printf("Failed to allocate DMA buffer (got %p).\n", dmabuf);
goto punt;
}
#if defined(NETIF_DEBUG)
printf("ofwn_init: allocated DMA buffer: %08x\n", dmabuf);
printf("ofwn_init: allocated DMA buffer: %p\n", dmabuf);
#endif
#endif

1
stand/ofw/libofw/openfirm.c
View File

@ -669,7 +669,6 @@ OF_block_size(ihandle_t instance)
}
/*
/*
* Memory functions
*/

1
stand/powerpc/boot1.chrp/boot1.c
View File

@ -23,6 +23,7 @@ __FBSDID("$FreeBSD$");
#include <machine/elf.h>
#include <machine/stdarg.h>
#include <machine/md_var.h>
#include <ufs/ffs/fs.h>
#include "paths.h"

3
stand/powerpc/kboot/Makefile
View File

@ -36,9 +36,6 @@ CFLAGS+= -DRELOC=${RELOC}
LDFLAGS= -nostdlib -static -T ${.CURDIR}/ldscript.powerpc
# 64-bit bridge extensions
CFLAGS+= -Wa,-mppc64bridge
DPADD= ${LDR_INTERP} ${LIBOFW} ${LIBFDT} ${LIBSA}
LDADD= ${LDR_INTERP} ${LIBOFW} ${LIBFDT} ${LIBSA}

10
stand/powerpc/kboot/main.c
View File

@ -484,8 +484,18 @@ kboot_kseg_get(int *nseg, void **ptr)
void
_start(int argc, const char **argv, char **env)
{
// This makes error "variable 'sp' is uninitialized" be just a warning on clang.
// Initializing 'sp' is not desired here as it would overwrite "r1" original value
#if defined(__clang__)
#pragma clang diagnostic push
#pragma clang diagnostic warning "-Wuninitialized"
#endif
register volatile void **sp asm("r1");
main((int)sp[0], (const char **)&sp[1]);
#if defined(__clang__)
#pragma clang diagnostic pop
#endif
}
/*

2
stand/powerpc/ofw/elf_freebsd.c
View File

@ -84,7 +84,7 @@ __elfN(ofw_exec)(struct preloaded_file *fp)
if ((error = md_load(fp->f_args, &mdp, &dtbp)) != 0)
return (error);
printf("Kernel entry at 0x%lx ...\n", e->e_entry);
printf("Kernel entry at 0x%x ...\n", entry);
dev_cleanup();
if (dtbp != 0) {

2
stand/powerpc/ofw/ppc64_elf_freebsd.c
View File

@ -87,7 +87,7 @@ ppc64_ofw_elf_exec(struct preloaded_file *fp)
if ((error = md_load64(fp->f_args, &mdp, &dtbp)) != 0)
return (error);
printf("Kernel entry at 0x%lx ...\n", entry);
printf("Kernel entry at 0x%x ...\n", entry);
dev_cleanup();