aboutsummaryrefslogtreecommitdiff
path: root/bfd/aout-cris.c
diff options
context:
space:
mode:
authorAlan Modra <amodra@gmail.com>2015-12-01 11:40:52 +1030
committerAlan Modra <amodra@gmail.com>2015-12-01 13:40:05 +1030
commitbbb1afc89b5cfa2f09b6a7c25fbfef745fbdd724 (patch)
treeb0653707257c0239c98dfdb1b3c43aaf98ae3f12 /bfd/aout-cris.c
parentb560e2acdd41fe6b6228b11c2d82ad2a96188153 (diff)
downloadfsf-binutils-gdb-bbb1afc89b5cfa2f09b6a7c25fbfef745fbdd724.zip
fsf-binutils-gdb-bbb1afc89b5cfa2f09b6a7c25fbfef745fbdd724.tar.gz
fsf-binutils-gdb-bbb1afc89b5cfa2f09b6a7c25fbfef745fbdd724.tar.bz2
Invoke aout N_* macros with pointer to struct internal_exec
No functional changes here. BTW, some of these headers don't seem to be used anywhere: include/aout/dynix3.h, include/aout/encap.h, include/aout/hp.h, gas/config/aout_gnu.h bfd/ * aout-adobe.c: Invoke aout N_* macros with pointer to struct internal_exec. * aout-arm.c: Likewise. * aout-cris.c: Likewise. * aout-target.h: Likewise. * aout-tic30.c: Likewise. * aoutf1.h: Likewise. * aoutx.h: Likewise. * bout.c: Likewise. * freebsd.h: Likewise. * gen-aout.c: Likewise. * hp300hpux.c: Likewise. * i386aout.c: Likewise. * i386linux.c: Likewise. * i386lynx.c: Likewise. * i386mach3.c: Likewise. * i386os9k.c: Likewise. * libaout.h: Likewise. * m68klinux.c: Likewise. * m88kmach3.c: Likewise. * mipsbsd.c: Likewise. * netbsd.h: Likewise. * pc532-mach.c: Likewise. * pdp11.c: Likewise. * riscix.c: Likewise. * sparclinux.c: Likewise. * sparclynx.c: Likewise. gas/ * config/aout_gnu.h: Invoke aout N_* macros with pointer to struct internal_exec. include/ * bout.h: Invoke aout N_* macros with pointer to struct internal_exec. * os9k.h: Likewise. include/aout/ * adobe.h: Invoke aout N_* macros with pointer to struct internal_exec. * aout64.h: Likewise. * dynix3.h: Likewise. * encap.h: Likewise. * hp.h: Likewise. * hp300hpux.h: Likewise. * sun4.h: Likewise.
Diffstat (limited to 'bfd/aout-cris.c')
-rw-r--r--bfd/aout-cris.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/bfd/aout-cris.c b/bfd/aout-cris.c
index 166e305..5280824 100644
--- a/bfd/aout-cris.c
+++ b/bfd/aout-cris.c
@@ -37,7 +37,7 @@
after text, but with those, we don't have any choice besides reading
symbol info, and luckily there's no pressing need for correctness for
those vma:s at this time. */
-#define N_TXTADDR(x) ((x).a_entry & ~(bfd_vma) 0xffff)
+#define N_TXTADDR(x) ((x)->a_entry & ~(bfd_vma) 0xffff)
/* If you change this to 4, you can not link to an address N*4+2. */
#define SEGMENT_SIZE 2
@@ -93,8 +93,8 @@ static bfd_boolean MY (set_sizes) (bfd *);
not call set_sizes. */
#define MY_set_arch_mach NAME (aout, set_arch_mach)
-#define SET_ARCH_MACH(BFD, EXEC) \
- MY_set_arch_mach (BFD, DEFAULT_ARCH, N_MACHTYPE (EXEC))
+#define SET_ARCH_MACH(BFD, EXECP) \
+ MY_set_arch_mach (BFD, DEFAULT_ARCH, N_MACHTYPE (EXECP))
/* These macros describe the binary layout of the reloc information we
use in a file. */
@@ -129,9 +129,9 @@ MY (write_object_contents) (bfd *abfd)
/* Setting N_SET_MACHTYPE and using N_SET_FLAGS is not performed by
the default definition. */
if (bfd_get_arch (abfd) == bfd_arch_cris)
- N_SET_MACHTYPE (*execp, M_CRIS);
+ N_SET_MACHTYPE (execp, M_CRIS);
- N_SET_FLAGS (*execp, aout_backend_info (abfd)->exec_hdr_flags);
+ N_SET_FLAGS (execp, aout_backend_info (abfd)->exec_hdr_flags);
WRITE_HEADERS (abfd, execp);