Update targets

Signed-off-by: Nathaniel Graff <nathaniel.graff@sifive.com>

6 files changed, 21 insertions, 21 deletions

diff --git a/bsp/qemu-sifive-e31/metal-inline.h b/bsp/qemu-sifive-e31/metal-inline.h
index 3f2f6bc..61601c7 100644
--- a/bsp/qemu-sifive-e31/metal-inline.h
+++ b/bsp/qemu-sifive-e31/metal-inline.h
@@ -5,8 +5,8 @@
 
 #ifndef ASSEMBLY
 
-#ifndef QEMU_SIFIVE_E31__METAL_INLINE_H
-#define QEMU_SIFIVE_E31__METAL_INLINE_H
+#ifndef QEMU_SIFIVE_E31____METAL_INLINE_H
+#define QEMU_SIFIVE_E31____METAL_INLINE_H
 
 #include <metal/machine.h>
 
@@ -245,5 +245,5 @@ struct __metal_driver_sifive_fe310_g000_prci __metal_dt_prci_10008000 = {
 };
 
 
-#endif /* QEMU_SIFIVE_E31__METAL_INLINE_H*/
+#endif /* QEMU_SIFIVE_E31____METAL_INLINE_H*/
 #endif /* ! ASSEMBLY */
diff --git a/bsp/qemu-sifive-e31/metal-platform.h b/bsp/qemu-sifive-e31/metal-platform.h
index 6582722..aebc717 100644
--- a/bsp/qemu-sifive-e31/metal-platform.h
+++ b/bsp/qemu-sifive-e31/metal-platform.h
@@ -3,8 +3,8 @@
 /* ----------------------------------- */
 /* ----------------------------------- */
 
-#ifndef QEMU_SIFIVE_E31__METAL_PLATFORM_H
-#define QEMU_SIFIVE_E31__METAL_PLATFORM_H
+#ifndef QEMU_SIFIVE_E31____METAL_PLATFORM_H
+#define QEMU_SIFIVE_E31____METAL_PLATFORM_H
 
 /* From clock@0 */
 #define METAL_FIXED_CLOCK_0_CLOCK_FREQUENCY 16000000UL
@@ -219,4 +219,4 @@
 #define METAL_SIFIVE_UART0_IP 20UL
 #define METAL_SIFIVE_UART0_DIV 24UL
 
-#endif /* QEMU_SIFIVE_E31__METAL_PLATFORM_H*/
+#endif /* QEMU_SIFIVE_E31____METAL_PLATFORM_H*/
diff --git a/bsp/qemu-sifive-e31/metal.default.lds b/bsp/qemu-sifive-e31/metal.default.lds
index 6bd988b..1f14be5 100644
--- a/bsp/qemu-sifive-e31/metal.default.lds
+++ b/bsp/qemu-sifive-e31/metal.default.lds
@@ -94,12 +94,12 @@ SECTIONS
 	} >flash AT>flash :flash
 
 
-	.finit_array 		:
+	.fini_array 		:
 	{
-		PROVIDE_HIDDEN (__finit_array_start = .);
+		PROVIDE_HIDDEN (__fini_array_start = .);
 		KEEP (*(SORT_BY_INIT_PRIORITY(.fini_array.*) SORT_BY_INIT_PRIORITY(.dtors.*)))
 		KEEP (*(.fini_array EXCLUDE_FILE (*crtbegin.o *crtbegin?.o *crtend.o *crtend?.o ) .dtors))
-		PROVIDE_HIDDEN (__finit_array_end = .);
+		PROVIDE_HIDDEN (__fini_array_end = .);
 	} >flash AT>flash :flash
 
 
diff --git a/bsp/qemu-sifive-e31/metal.h b/bsp/qemu-sifive-e31/metal.h
index b15ce54..1ec4b0b 100644
--- a/bsp/qemu-sifive-e31/metal.h
+++ b/bsp/qemu-sifive-e31/metal.h
@@ -9,8 +9,8 @@
 
 #ifdef __METAL_MACHINE_MACROS
 
-#ifndef MACROS_IF_QEMU_SIFIVE_E31__METAL_H
-#define MACROS_IF_QEMU_SIFIVE_E31__METAL_H
+#ifndef MACROS_IF_QEMU_SIFIVE_E31____METAL_H
+#define MACROS_IF_QEMU_SIFIVE_E31____METAL_H
 
 #define __METAL_CLINT_NUM_PARENTS 2
 
@@ -31,12 +31,12 @@
 #define __METAL_CLIC_SUBINTERRUPTS 0
 #endif
 
-#endif /* MACROS_IF_SIFIVE_HIFIVE1__METAL_H*/
+#endif /* MACROS_IF_QEMU_SIFIVE_E31____METAL_H*/
 
 #else /* ! __METAL_MACHINE_MACROS */
 
-#ifndef MACROS_ELSE_SIFIVE_HIFIVE1__METAL_H
-#define MACROS_ELSE_SIFIVE_HIFIVE1__METAL_H
+#ifndef MACROS_ELSE_QEMU_SIFIVE_E31____METAL_H
+#define MACROS_ELSE_QEMU_SIFIVE_E31____METAL_H
 
 #define __METAL_CLINT_2000000_INTERRUPTS 2
 
@@ -861,7 +861,7 @@ struct __metal_driver_sifive_spi0 *__metal_spi_table[] = {
 
 #define __METAL_DT_CLOCK_4_HANDLE (&__metal_dt_clock_4)
 
-#endif /* MACROS_ELSE_QEMU_SIFIVE_E31__METAL_H*/
+#endif /* MACROS_ELSE_QEMU_SIFIVE_E31____METAL_H*/
 
 #endif /* ! __METAL_MACHINE_MACROS */
 
diff --git a/bsp/qemu-sifive-e31/metal.ramrodata.lds b/bsp/qemu-sifive-e31/metal.ramrodata.lds
index 3322e4a..9f25258 100644
--- a/bsp/qemu-sifive-e31/metal.ramrodata.lds
+++ b/bsp/qemu-sifive-e31/metal.ramrodata.lds
@@ -74,12 +74,12 @@ SECTIONS
 	} >flash AT>flash :flash
 
 
-	.finit_array 		:
+	.fini_array 		:
 	{
-		PROVIDE_HIDDEN (__finit_array_start = .);
+		PROVIDE_HIDDEN (__fini_array_start = .);
 		KEEP (*(SORT_BY_INIT_PRIORITY(.fini_array.*) SORT_BY_INIT_PRIORITY(.dtors.*)))
 		KEEP (*(.fini_array EXCLUDE_FILE (*crtbegin.o *crtbegin?.o *crtend.o *crtend?.o ) .dtors))
-		PROVIDE_HIDDEN (__finit_array_end = .);
+		PROVIDE_HIDDEN (__fini_array_end = .);
 	} >flash AT>flash :flash
 
 
diff --git a/bsp/qemu-sifive-e31/metal.scratchpad.lds b/bsp/qemu-sifive-e31/metal.scratchpad.lds
index 14e64ea..6eceaaf 100644
--- a/bsp/qemu-sifive-e31/metal.scratchpad.lds
+++ b/bsp/qemu-sifive-e31/metal.scratchpad.lds
@@ -94,12 +94,12 @@ SECTIONS
 	} >ram AT>ram :ram
 
 
-	.finit_array 		:
+	.fini_array 		:
 	{
-		PROVIDE_HIDDEN (__finit_array_start = .);
+		PROVIDE_HIDDEN (__fini_array_start = .);
 		KEEP (*(SORT_BY_INIT_PRIORITY(.fini_array.*) SORT_BY_INIT_PRIORITY(.dtors.*)))
 		KEEP (*(.fini_array EXCLUDE_FILE (*crtbegin.o *crtbegin?.o *crtend.o *crtend?.o ) .dtors))
-		PROVIDE_HIDDEN (__finit_array_end = .);
+		PROVIDE_HIDDEN (__fini_array_end = .);
 	} >ram AT>ram :ram