From 1b50fce4c0ed748c156af3ac629e50cb5e4d0ef4 Mon Sep 17 00:00:00 2001
From: Marc Espie <espie@cvs.openbsd.org>
Date: Tue, 12 Sep 2000 19:13:03 +0000
Subject: Help stupid cvs fixing basic conflicts.

---
 gnu/usr.bin/binutils/ld/scripttempl/aout.sc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'gnu/usr.bin/binutils/ld/scripttempl/aout.sc')

diff --git a/gnu/usr.bin/binutils/ld/scripttempl/aout.sc b/gnu/usr.bin/binutils/ld/scripttempl/aout.sc
index 66cc42dfeb6..80dbb379633 100644
--- a/gnu/usr.bin/binutils/ld/scripttempl/aout.sc
+++ b/gnu/usr.bin/binutils/ld/scripttempl/aout.sc
@@ -1,5 +1,6 @@
 test -z "${BIG_OUTPUT_FORMAT}" && BIG_OUTPUT_FORMAT=${OUTPUT_FORMAT}
 test -z "${LITTLE_OUTPUT_FORMAT}" && LITTLE_OUTPUT_FORMAT=${OUTPUT_FORMAT}
+test -z "${ALIGNMENT}" && ALIGNMENT="4"
 
 cat <<EOF
 OUTPUT_FORMAT("${OUTPUT_FORMAT}", "${BIG_OUTPUT_FORMAT}",
@@ -48,8 +49,9 @@ SECTIONS
    ${RELOCATING+ __bss_start = .};
    *(.bss)
    *(COMMON)
-   ${RELOCATING+_end = ALIGN(4) };
-   ${RELOCATING+__end = ALIGN(4) };
+   ${RELOCATING+. = ALIGN(${ALIGNMENT});}
+   ${RELOCATING+_end = . };
+   ${RELOCATING+__end = . };
   }
 }
 EOF
-- 
cgit v1.2.3