Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/gnu/dist/toolchain/bfd backout previous commit. i'm still n...



details:   https://anonhg.NetBSD.org/src/rev/fd18b1a62a2d
branches:  trunk
changeset: 533093:fd18b1a62a2d
user:      itojun <itojun%NetBSD.org@localhost>
date:      Fri Jun 21 00:17:33 2002 +0000

description:
backout previous commit.  i'm still not sure how the name conflict should be
resolved.

diffstat:

 gnu/dist/toolchain/bfd/aout-arm.c   |  2 +-
 gnu/dist/toolchain/bfd/aout-arm32.c |  2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diffs (24 lines):

diff -r 2c91d0e2b880 -r fd18b1a62a2d gnu/dist/toolchain/bfd/aout-arm.c
--- a/gnu/dist/toolchain/bfd/aout-arm.c Fri Jun 21 00:01:53 2002 +0000
+++ b/gnu/dist/toolchain/bfd/aout-arm.c Fri Jun 21 00:17:33 2002 +0000
@@ -46,7 +46,7 @@
 
 /* Avoid multiple defininitions from aoutx if supporting standarad a.out
    as well as our own.  */
-#define NAME(x,y) CAT3(aoutarm,_xx_,y)
+#define NAME(x,y) CAT3(aoutarm,_32_,y)
 
 #define MY_bfd_reloc_type_lookup aoutarm_bfd_reloc_type_lookup
 
diff -r 2c91d0e2b880 -r fd18b1a62a2d gnu/dist/toolchain/bfd/aout-arm32.c
--- a/gnu/dist/toolchain/bfd/aout-arm32.c       Fri Jun 21 00:01:53 2002 +0000
+++ b/gnu/dist/toolchain/bfd/aout-arm32.c       Fri Jun 21 00:17:33 2002 +0000
@@ -35,7 +35,7 @@
 #include "bfd.h"
 #include "aout/aout64.h"
 
-#define MY(op) CAT(aoutarm32_,op)
+#define MY(op) CAT(aoutarm_,op)
 #define NAME(x, y)     CAT3(aoutarm,_32_,y)
 
 #include "libaout.h"



Home | Main Index | Thread Index | Old Index