diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2000-09-12 19:13:03 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2000-09-12 19:13:03 +0000 |
| commit | 1b50fce4c0ed748c156af3ac629e50cb5e4d0ef4 (patch) | |
| tree | edee61faabd18b4a5d84e8cdb679d7a8d1fe171f /gnu/usr.bin/binutils/ld/scripttempl/aout.sc | |
| parent | 9f1193e30b5f04af9ea81c644eec79b7b535b890 (diff) | |
Help stupid cvs fixing basic conflicts.
Diffstat (limited to 'gnu/usr.bin/binutils/ld/scripttempl/aout.sc')
| -rw-r--r-- | gnu/usr.bin/binutils/ld/scripttempl/aout.sc | 6 |
1 files changed, 4 insertions, 2 deletions
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 |