diff options
| author | dim <dim@FreeBSD.org> | 2014-03-26 07:31:57 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2014-03-26 07:31:57 +0000 |
| commit | fb422e6d310915f9e2641190198698d922f7ef58 (patch) | |
| tree | 8126abc77e6620e23932d186c7b2b75457af47a5 /sys/sparc64 | |
| parent | 5a582ae617991f602ee6f8a954a36fd749aa466c (diff) | |
| download | FreeBSD-src-fb422e6d310915f9e2641190198698d922f7ef58.zip FreeBSD-src-fb422e6d310915f9e2641190198698d922f7ef58.tar.gz | |
MFC r262613:
Merge the projects/clang-sparc64 branch back to head. This brings in
several updates from the llvm and clang trunks to make the sparc64
backend fully functional.
Apart from one patch to sys/sparc64/include/pcpu.h which is still under
discussion, this makes it possible to let clang fully build world and
kernel for sparc64.
Any assistance with testing this on actual sparc64 hardware is greatly
appreciated, as there will unavoidably be bugs left.
Many thanks go to Roman Divacky for his upstream work on getting the
sparc64 backend into shape.
MFC r262985:
Repair a few minor mismerges from r262261 in the clang-sparc64 project
branch. This is also to minimize differences with upstream.
Diffstat (limited to 'sys/sparc64')
| -rw-r--r-- | sys/sparc64/conf/GENERIC | 2 | ||||
| -rw-r--r-- | sys/sparc64/isa/isa.c | 2 | ||||
| -rw-r--r-- | sys/sparc64/pci/firereg.h | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/sys/sparc64/conf/GENERIC b/sys/sparc64/conf/GENERIC index eaf82f0..c891911 100644 --- a/sys/sparc64/conf/GENERIC +++ b/sys/sparc64/conf/GENERIC @@ -21,7 +21,7 @@ cpu SUN4U ident GENERIC -makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols +makeoptions DEBUG=-gdwarf-2 # Build kernel with gdb(1) debug symbols # Platforms supported # At this time all platforms are supported, as-is. diff --git a/sys/sparc64/isa/isa.c b/sys/sparc64/isa/isa.c index 6e22133..6783440 100644 --- a/sys/sparc64/isa/isa.c +++ b/sys/sparc64/isa/isa.c @@ -118,7 +118,7 @@ isa_init(device_t dev) static const struct { const char *const name; uint32_t id; -} const ofw_isa_pnp_map[] = { +} ofw_isa_pnp_map[] = { { "SUNW,lomh", 0x0000ae4e }, /* SUN0000 */ { "dma", 0x0002d041 }, /* PNP0200 */ { "floppy", 0x0007d041 }, /* PNP0700 */ diff --git a/sys/sparc64/pci/firereg.h b/sys/sparc64/pci/firereg.h index 650eb8c..247a3f7 100644 --- a/sys/sparc64/pci/firereg.h +++ b/sys/sparc64/pci/firereg.h @@ -922,7 +922,7 @@ #define FO_XBC_PRF_CNT_SHFT 0 /* Lookup tables */ -const uint16_t const fire_freq_nak_tmr_thrs[6][4] = { +const uint16_t fire_freq_nak_tmr_thrs[6][4] = { { 0x00ed, 0x049, 0x043, 0x030 }, { 0x01a0, 0x076, 0x06b, 0x048 }, { 0x022f, 0x09a, 0x056, 0x056 }, @@ -931,7 +931,7 @@ const uint16_t const fire_freq_nak_tmr_thrs[6][4] = { { 0x102f, 0x41a, 0x216, 0x216 } }; -const uint16_t const fire_rply_tmr_thrs[6][4] = { +const uint16_t fire_rply_tmr_thrs[6][4] = { { 0x0379, 0x112, 0x0fc, 0x0b4 }, { 0x0618, 0x1BA, 0x192, 0x10e }, { 0x0831, 0x242, 0x143, 0x143 }, |
