svn commit: r348005 - in head: cddl/contrib/opensolaris/lib/libzfs/common stand/common stand/ofw/libofw stand/powerpc/boot1.chrp stand/powerpc/kboot stand/powerpc/ofw
Leandro Lupori
luporl at FreeBSD.org
Mon May 20 19:21:37 UTC 2019
Author: luporl
Date: Mon May 20 19:21:35 2019
New Revision: 348005
URL: https://svnweb.freebsd.org/changeset/base/348005
Log:
[PowerPC64] stand: fix build using clang 8 as compiler
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
Modified:
head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_diff.c
head/stand/common/load_elf.c
head/stand/ofw/libofw/ofw_net.c
head/stand/ofw/libofw/openfirm.c
head/stand/powerpc/boot1.chrp/boot1.c
head/stand/powerpc/kboot/Makefile
head/stand/powerpc/kboot/main.c
head/stand/powerpc/ofw/elf_freebsd.c
head/stand/powerpc/ofw/ppc64_elf_freebsd.c
Modified: head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_diff.c
==============================================================================
--- head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_diff.c Mon May 20 19:14:07 2019 (r348004)
+++ head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_diff.c Mon May 20 19:21:35 2019 (r348005)
@@ -114,7 +114,7 @@ get_stats_for_obj(differ_info_t *di, const char *dsnam
(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
} 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;
}
Modified: head/stand/common/load_elf.c
==============================================================================
--- head/stand/common/load_elf.c Mon May 20 19:14:07 2019 (r348004)
+++ head/stand/common/load_elf.c Mon May 20 19:21:35 2019 (r348005)
@@ -483,7 +483,7 @@ __elfN(loadimage)(struct preloaded_file *fp, elf_file_
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_
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 */
Modified: head/stand/ofw/libofw/ofw_net.c
==============================================================================
--- head/stand/ofw/libofw/ofw_net.c Mon May 20 19:14:07 2019 (r348004)
+++ head/stand/ofw/libofw/ofw_net.c Mon May 20 19:21:35 2019 (r348005)
@@ -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
Modified: head/stand/ofw/libofw/openfirm.c
==============================================================================
--- head/stand/ofw/libofw/openfirm.c Mon May 20 19:14:07 2019 (r348004)
+++ head/stand/ofw/libofw/openfirm.c Mon May 20 19:21:35 2019 (r348005)
@@ -669,7 +669,6 @@ OF_block_size(ihandle_t instance)
}
/*
-/*
* Memory functions
*/
Modified: head/stand/powerpc/boot1.chrp/boot1.c
==============================================================================
--- head/stand/powerpc/boot1.chrp/boot1.c Mon May 20 19:14:07 2019 (r348004)
+++ head/stand/powerpc/boot1.chrp/boot1.c Mon May 20 19:21:35 2019 (r348005)
@@ -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"
Modified: head/stand/powerpc/kboot/Makefile
==============================================================================
--- head/stand/powerpc/kboot/Makefile Mon May 20 19:14:07 2019 (r348004)
+++ head/stand/powerpc/kboot/Makefile Mon May 20 19:21:35 2019 (r348005)
@@ -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}
Modified: head/stand/powerpc/kboot/main.c
==============================================================================
--- head/stand/powerpc/kboot/main.c Mon May 20 19:14:07 2019 (r348004)
+++ head/stand/powerpc/kboot/main.c Mon May 20 19:21:35 2019 (r348005)
@@ -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
+
}
/*
Modified: head/stand/powerpc/ofw/elf_freebsd.c
==============================================================================
--- head/stand/powerpc/ofw/elf_freebsd.c Mon May 20 19:14:07 2019 (r348004)
+++ head/stand/powerpc/ofw/elf_freebsd.c Mon May 20 19:21:35 2019 (r348005)
@@ -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) {
Modified: head/stand/powerpc/ofw/ppc64_elf_freebsd.c
==============================================================================
--- head/stand/powerpc/ofw/ppc64_elf_freebsd.c Mon May 20 19:14:07 2019 (r348004)
+++ head/stand/powerpc/ofw/ppc64_elf_freebsd.c Mon May 20 19:21:35 2019 (r348005)
@@ -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();
More information about the svn-src-head
mailing list