Module Name:    src
Committed By:   martin
Date:           Fri Sep  1 09:52:40 UTC 2017

Modified Files:
        src/sys/arch/hppa/stand/cdboot [netbsd-8]: ld.script

Log Message:
Pull up following revision(s) (requested by skrll in ticket #260):
        sys/arch/hppa/stand/cdboot/ld.script: revision 1.2
Use the same linker script as sys/arch/hppa/stand/boot and fix the gcc
5.3 problem here as well.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.28.1 src/sys/arch/hppa/stand/cdboot/ld.script

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/hppa/stand/cdboot/ld.script
diff -u src/sys/arch/hppa/stand/cdboot/ld.script:1.1 src/sys/arch/hppa/stand/cdboot/ld.script:1.1.28.1
--- src/sys/arch/hppa/stand/cdboot/ld.script:1.1	Mon Feb 24 07:23:43 2014
+++ src/sys/arch/hppa/stand/cdboot/ld.script	Fri Sep  1 09:52:40 2017
@@ -1,6 +1,6 @@
-/*	$NetBSD: ld.script,v 1.1 2014/02/24 07:23:43 skrll Exp $	*/
+/*	$NetBSD: ld.script,v 1.1.28.1 2017/09/01 09:52:40 martin Exp $	*/
 
-/*	$OpenBSD: ld.script,v 1.1 2003/03/28 22:42:26 mickey Exp $	*/
+/*	$OpenBSD: ld.script,v 1.2 1999/04/20 20:02:37 mickey Exp $	*/
 
 OUTPUT_FORMAT("elf32-hppa")
 OUTPUT_ARCH(hppa)
@@ -12,18 +12,18 @@ SECTIONS {
 	. = + SIZEOF_HEADERS;
 	.text : {
 		*(.text)
-		*(.text.*)
+		*(.text.1)
 		*(.rodata)
 		*(.rodata1)
 		*($CODE$)
-		etext = .;
-	} = 0x08000240
+		etext = ABSOLUTE(.);
+	} = 0x08000240 /* nop */
 
 	/* Read-write sections, merged into data segment: */
 	.data : {
 		$global$ = .;
 		*(.data)
-		*(.data1)
+		*(.data*)
 		*(.sdata)
 		*(.sdata2)
 		*(.dynamic)

Reply via email to