For m68k, use __mc68000__ (not __m68k__ ), since that is what the

various m68k compilers seem to actually use... -Erik
author: Eric Andersen <andersen@codepoet.org> 2001-06-19 15:00:52 +0000
committer: Eric Andersen <andersen@codepoet.org> 2001-06-19 15:00:52 +0000
commit: b4a26e6fc09e9dd14ca206f8d9ed2c6e8976df1b (patch)
tree: c945c9271411ffc16752450b7c704185f052c8c9
parent: 74c97cdba6496cd361f65001490632fdf711c945 (diff)
download: busybox-w32-b4a26e6fc09e9dd14ca206f8d9ed2c6e8976df1b.tar.gz
busybox-w32-b4a26e6fc09e9dd14ca206f8d9ed2c6e8976df1b.tar.bz2
busybox-w32-b4a26e6fc09e9dd14ca206f8d9ed2c6e8976df1b.zip
2 files changed, 34 insertions, 34 deletions
diff --git a/insmod.c b/insmod.c
index 4ca28bb86..71f76c750 100644
--- a/insmod.c
+++ b/insmod.c
@@ -130,7 +130,7 @@
 #ifndef MODUTILS_MODULE_H
 static const int MODUTILS_MODULE_H = 1;
-#ident "$Id: insmod.c,v 1.65 2001/05/24 14:16:28 andersen Exp $"
+#ident "$Id: insmod.c,v 1.66 2001/06/19 15:00:52 andersen Exp $"
 /* This file contains the structures used by the 2.0 and 2.1 kernels.
   We do not use the kernel headers directly because we do not wish
@@ -347,7 +347,7 @@ int delete_module(const char *);
 #ifndef MODUTILS_OBJ_H
 static const int MODUTILS_OBJ_H = 1;
-#ident "$Id: insmod.c,v 1.65 2001/05/24 14:16:28 andersen Exp $"
+#ident "$Id: insmod.c,v 1.66 2001/06/19 15:00:52 andersen Exp $"
 /* The relocatable object is manipulated using elfin types.  */
@@ -372,7 +372,7 @@ static const int MODUTILS_OBJ_H = 1;
 #define ELFCLASSM       ELFCLASS32
-#if (defined(__m68k__))                                 
+#if (defined(__mc68000__))                                      
 #define ELFDATAM        ELFDATA2MSB
 #endif
@@ -435,7 +435,7 @@ static const int MODUTILS_OBJ_H = 1;
 #define Elf32_RelM      Elf32_Rel
 #define ELFDATAM        ELFDATA2LSB
-#elif defined(__m68k__) 
+#elif defined(__mc68000__) 
 #define MATCH_MACHINE(x)        (x == EM_68K)
 #define SHT_RELM                        SHT_RELA
@@ -813,7 +813,7 @@ arch_apply_relocation(struct obj_file *f,
        case R_ARM_NONE:
 #elif defined(__i386__)
        case R_386_NONE:
-#elif defined(__m68k__) 
+#elif defined(__mc68000__) 
        case R_68K_NONE:
 #elif defined(__powerpc__)
        case R_PPC_NONE:
@@ -828,7 +828,7 @@ arch_apply_relocation(struct obj_file *f,
        case R_ARM_ABS32:
 #elif defined(__i386__)
        case R_386_32:  
-#elif defined(__m68k__) 
+#elif defined(__mc68000__) 
        case R_68K_32:
 #elif defined(__powerpc__)
        case R_PPC_ADDR32:
@@ -837,7 +837,7 @@ arch_apply_relocation(struct obj_file *f,
 #endif
                *loc += v;
                break;
-#if defined(__m68k__)
+#if defined(__mc68000__)
    case R_68K_8:
                if (v > 0xff)
                ret = obj_reloc_overflow;
@@ -848,7 +848,7 @@ arch_apply_relocation(struct obj_file *f,
                ret = obj_reloc_overflow;
                *(short *)loc = v;
                break;
-#endif /* __m68k__   */
+#endif /* __mc68000__   */
 #if defined(__powerpc__)
        case R_PPC_ADDR16_HA:
@@ -954,7 +954,7 @@ arch_apply_relocation(struct obj_file *f,
        case R_386_PC32:
                *loc += v - dot;
                break;
-#elif defined(__m68k__)
+#elif defined(__mc68000__)
    case R_68K_PC8:
                v -= dot;
                if ((Elf32_Sword)v > 0x7f || (Elf32_Sword)v < -(Elf32_Sword)0x80)
@@ -1049,7 +1049,7 @@ arch_apply_relocation(struct obj_file *f,
        case R_386_JMP_SLOT:
                *loc = v;
                break;
-#elif defined(__m68k__)
+#elif defined(__mc68000__)
        case R_68K_GLOB_DAT:
        case R_68K_JMP_SLOT:
                *loc = v;
@@ -1065,7 +1065,7 @@ arch_apply_relocation(struct obj_file *f,
        case R_386_RELATIVE:
                *loc += f->baseaddr;
                break;
-#elif defined(__m68k__)
+#elif defined(__mc68000__)
    case R_68K_RELATIVE:
        *(int *)loc += f->baseaddr;
        break;
@@ -1096,7 +1096,7 @@ arch_apply_relocation(struct obj_file *f,
        case R_ARM_GOT32:
 #elif defined(__i386__)
        case R_386_GOT32:
-#elif defined(__m68k__)
+#elif defined(__mc68000__)
        case R_68K_GOT32:
 #endif
                assert(isym != NULL);
@@ -1108,26 +1108,26 @@ arch_apply_relocation(struct obj_file *f,
        /* make the reloc with_respect_to_.got */
 #if defined(__sh__)
                *loc += isym->gotent.offset + rel->r_addend;
-#elif defined(__i386__) || defined(__arm__) || defined(__m68k__)
+#elif defined(__i386__) || defined(__arm__) || defined(__mc68000__)
                *loc += isym->gotent.offset;
 #endif
                break;
    /* address relative to the got */
-#if !defined(__m68k__)
+#if !defined(__mc68000__)
 #if defined(__sh__)
        case R_SH_GOTOFF:
 #elif defined(__arm__)
        case R_ARM_GOTOFF:
 #elif defined(__i386__)
        case R_386_GOTOFF:
-#elif defined(__m68k__)
+#elif defined(__mc68000__)
        case R_68K_GOTOFF:
 #endif
                assert(got != 0);
                *loc += v - got;
                break;
-#endif // __m68k__
+#endif // __mc68000__
 #endif /* BB_USE_GOT_ENTRIES */
@@ -1183,7 +1183,7 @@ int arch_create_got(struct obj_file *f)
 #elif defined(__i386__)
                        case R_386_GOT32:
                                break;
-#elif defined(__m68k__)
+#elif defined(__mc68000__)
                        case R_68K_GOT32:
                                break;
 #endif
diff --git a/modutils/insmod.c b/modutils/insmod.c
index 4ca28bb86..71f76c750 100644
--- a/modutils/insmod.c
+++ b/modutils/insmod.c
@@ -130,7 +130,7 @@
 #ifndef MODUTILS_MODULE_H
 static const int MODUTILS_MODULE_H = 1;
-#ident "$Id: insmod.c,v 1.65 2001/05/24 14:16:28 andersen Exp $"
+#ident "$Id: insmod.c,v 1.66 2001/06/19 15:00:52 andersen Exp $"
 /* This file contains the structures used by the 2.0 and 2.1 kernels.
   We do not use the kernel headers directly because we do not wish
@@ -347,7 +347,7 @@ int delete_module(const char *);
 #ifndef MODUTILS_OBJ_H
 static const int MODUTILS_OBJ_H = 1;
-#ident "$Id: insmod.c,v 1.65 2001/05/24 14:16:28 andersen Exp $"
+#ident "$Id: insmod.c,v 1.66 2001/06/19 15:00:52 andersen Exp $"
 /* The relocatable object is manipulated using elfin types.  */
@@ -372,7 +372,7 @@ static const int MODUTILS_OBJ_H = 1;
 #define ELFCLASSM       ELFCLASS32
-#if (defined(__m68k__))                                 
+#if (defined(__mc68000__))                                      
 #define ELFDATAM        ELFDATA2MSB
 #endif
@@ -435,7 +435,7 @@ static const int MODUTILS_OBJ_H = 1;
 #define Elf32_RelM      Elf32_Rel
 #define ELFDATAM        ELFDATA2LSB
-#elif defined(__m68k__) 
+#elif defined(__mc68000__) 
 #define MATCH_MACHINE(x)        (x == EM_68K)
 #define SHT_RELM                        SHT_RELA
@@ -813,7 +813,7 @@ arch_apply_relocation(struct obj_file *f,
        case R_ARM_NONE:
 #elif defined(__i386__)
        case R_386_NONE:
-#elif defined(__m68k__) 
+#elif defined(__mc68000__) 
        case R_68K_NONE:
 #elif defined(__powerpc__)
        case R_PPC_NONE:
@@ -828,7 +828,7 @@ arch_apply_relocation(struct obj_file *f,
        case R_ARM_ABS32:
 #elif defined(__i386__)
        case R_386_32:  
-#elif defined(__m68k__) 
+#elif defined(__mc68000__) 
        case R_68K_32:
 #elif defined(__powerpc__)
        case R_PPC_ADDR32:
@@ -837,7 +837,7 @@ arch_apply_relocation(struct obj_file *f,
 #endif
                *loc += v;
                break;
-#if defined(__m68k__)
+#if defined(__mc68000__)
    case R_68K_8:
                if (v > 0xff)
                ret = obj_reloc_overflow;
@@ -848,7 +848,7 @@ arch_apply_relocation(struct obj_file *f,
                ret = obj_reloc_overflow;
                *(short *)loc = v;
                break;
-#endif /* __m68k__   */
+#endif /* __mc68000__   */
 #if defined(__powerpc__)
        case R_PPC_ADDR16_HA:
@@ -954,7 +954,7 @@ arch_apply_relocation(struct obj_file *f,
        case R_386_PC32:
                *loc += v - dot;
                break;
-#elif defined(__m68k__)
+#elif defined(__mc68000__)
    case R_68K_PC8:
                v -= dot;
                if ((Elf32_Sword)v > 0x7f || (Elf32_Sword)v < -(Elf32_Sword)0x80)
@@ -1049,7 +1049,7 @@ arch_apply_relocation(struct obj_file *f,
        case R_386_JMP_SLOT:
                *loc = v;
                break;
-#elif defined(__m68k__)
+#elif defined(__mc68000__)
        case R_68K_GLOB_DAT:
        case R_68K_JMP_SLOT:
                *loc = v;
@@ -1065,7 +1065,7 @@ arch_apply_relocation(struct obj_file *f,
        case R_386_RELATIVE:
                *loc += f->baseaddr;
                break;
-#elif defined(__m68k__)
+#elif defined(__mc68000__)
    case R_68K_RELATIVE:
        *(int *)loc += f->baseaddr;
        break;
@@ -1096,7 +1096,7 @@ arch_apply_relocation(struct obj_file *f,
        case R_ARM_GOT32:
 #elif defined(__i386__)
        case R_386_GOT32:
-#elif defined(__m68k__)
+#elif defined(__mc68000__)
        case R_68K_GOT32:
 #endif
                assert(isym != NULL);
@@ -1108,26 +1108,26 @@ arch_apply_relocation(struct obj_file *f,
        /* make the reloc with_respect_to_.got */
 #if defined(__sh__)
                *loc += isym->gotent.offset + rel->r_addend;
-#elif defined(__i386__) || defined(__arm__) || defined(__m68k__)
+#elif defined(__i386__) || defined(__arm__) || defined(__mc68000__)
                *loc += isym->gotent.offset;
 #endif
                break;
    /* address relative to the got */
-#if !defined(__m68k__)
+#if !defined(__mc68000__)
 #if defined(__sh__)
        case R_SH_GOTOFF:
 #elif defined(__arm__)
        case R_ARM_GOTOFF:
 #elif defined(__i386__)
        case R_386_GOTOFF:
-#elif defined(__m68k__)
+#elif defined(__mc68000__)
        case R_68K_GOTOFF:
 #endif
                assert(got != 0);
                *loc += v - got;
                break;
-#endif // __m68k__
+#endif // __mc68000__
 #endif /* BB_USE_GOT_ENTRIES */
@@ -1183,7 +1183,7 @@ int arch_create_got(struct obj_file *f)
 #elif defined(__i386__)
                        case R_386_GOT32:
                                break;
-#elif defined(__m68k__)
+#elif defined(__mc68000__)
                        case R_68K_GOT32:
                                break;
 #endif
author	Eric Andersen <andersen@codepoet.org>	2001-06-19 15:00:52 +0000
committer	Eric Andersen <andersen@codepoet.org>	2001-06-19 15:00:52 +0000
commit	b4a26e6fc09e9dd14ca206f8d9ed2c6e8976df1b (patch)
tree	c945c9271411ffc16752450b7c704185f052c8c9
parent	74c97cdba6496cd361f65001490632fdf711c945 (diff)
download	busybox-w32-b4a26e6fc09e9dd14ca206f8d9ed2c6e8976df1b.tar.gz busybox-w32-b4a26e6fc09e9dd14ca206f8d9ed2c6e8976df1b.tar.bz2 busybox-w32-b4a26e6fc09e9dd14ca206f8d9ed2c6e8976df1b.zip

diff --git a/insmod.c b/insmod.c index 4ca28bb86..71f76c750 100644 --- a/insmod.c +++ b/insmod.c
@@ -130,7 +130,7 @@
130	#ifndef MODUTILS_MODULE_H	130	#ifndef MODUTILS_MODULE_H
131	static const int MODUTILS_MODULE_H = 1;	131	static const int MODUTILS_MODULE_H = 1;
132		132
133	#ident "$Id: insmod.c,v 1.65 2001/05/24 14:16:28 andersen Exp $"	133	#ident "$Id: insmod.c,v 1.66 2001/06/19 15:00:52 andersen Exp $"
134		134
135	/* This file contains the structures used by the 2.0 and 2.1 kernels.	135	/* This file contains the structures used by the 2.0 and 2.1 kernels.
136	We do not use the kernel headers directly because we do not wish	136	We do not use the kernel headers directly because we do not wish
@@ -347,7 +347,7 @@ int delete_module(const char *);
347	#ifndef MODUTILS_OBJ_H	347	#ifndef MODUTILS_OBJ_H
348	static const int MODUTILS_OBJ_H = 1;	348	static const int MODUTILS_OBJ_H = 1;
349		349
350	#ident "$Id: insmod.c,v 1.65 2001/05/24 14:16:28 andersen Exp $"	350	#ident "$Id: insmod.c,v 1.66 2001/06/19 15:00:52 andersen Exp $"
351		351
352	/* The relocatable object is manipulated using elfin types. */	352	/* The relocatable object is manipulated using elfin types. */
353		353
@@ -372,7 +372,7 @@ static const int MODUTILS_OBJ_H = 1;
372		372
373	#define ELFCLASSM ELFCLASS32	373	#define ELFCLASSM ELFCLASS32
374		374
375	#if (defined(__m68k__))	375	#if (defined(__mc68000__))
376	#define ELFDATAM ELFDATA2MSB	376	#define ELFDATAM ELFDATA2MSB
377	#endif	377	#endif
378		378
@@ -435,7 +435,7 @@ static const int MODUTILS_OBJ_H = 1;
435	#define Elf32_RelM Elf32_Rel	435	#define Elf32_RelM Elf32_Rel
436	#define ELFDATAM ELFDATA2LSB	436	#define ELFDATAM ELFDATA2LSB
437		437
438	#elif defined(__m68k__)	438	#elif defined(__mc68000__)
439		439
440	#define MATCH_MACHINE(x) (x == EM_68K)	440	#define MATCH_MACHINE(x) (x == EM_68K)
441	#define SHT_RELM SHT_RELA	441	#define SHT_RELM SHT_RELA
@@ -813,7 +813,7 @@ arch_apply_relocation(struct obj_file *f,
813	case R_ARM_NONE:	813	case R_ARM_NONE:
814	#elif defined(__i386__)	814	#elif defined(__i386__)
815	case R_386_NONE:	815	case R_386_NONE:
816	#elif defined(__m68k__)	816	#elif defined(__mc68000__)
817	case R_68K_NONE:	817	case R_68K_NONE:
818	#elif defined(__powerpc__)	818	#elif defined(__powerpc__)
819	case R_PPC_NONE:	819	case R_PPC_NONE:
@@ -828,7 +828,7 @@ arch_apply_relocation(struct obj_file *f,
828	case R_ARM_ABS32:	828	case R_ARM_ABS32:
829	#elif defined(__i386__)	829	#elif defined(__i386__)
830	case R_386_32:	830	case R_386_32:
831	#elif defined(__m68k__)	831	#elif defined(__mc68000__)
832	case R_68K_32:	832	case R_68K_32:
833	#elif defined(__powerpc__)	833	#elif defined(__powerpc__)
834	case R_PPC_ADDR32:	834	case R_PPC_ADDR32:
@@ -837,7 +837,7 @@ arch_apply_relocation(struct obj_file *f,
837	#endif	837	#endif
838	*loc += v;	838	*loc += v;
839	break;	839	break;
840	#if defined(__m68k__)	840	#if defined(__mc68000__)
841	case R_68K_8:	841	case R_68K_8:
842	if (v > 0xff)	842	if (v > 0xff)
843	ret = obj_reloc_overflow;	843	ret = obj_reloc_overflow;
@@ -848,7 +848,7 @@ arch_apply_relocation(struct obj_file *f,
848	ret = obj_reloc_overflow;	848	ret = obj_reloc_overflow;
849	(short )loc = v;	849	(short )loc = v;
850	break;	850	break;
851	#endif /* __m68k__ */	851	#endif /* __mc68000__ */
852		852
853	#if defined(__powerpc__)	853	#if defined(__powerpc__)
854	case R_PPC_ADDR16_HA:	854	case R_PPC_ADDR16_HA:
@@ -954,7 +954,7 @@ arch_apply_relocation(struct obj_file *f,
954	case R_386_PC32:	954	case R_386_PC32:
955	*loc += v - dot;	955	*loc += v - dot;
956	break;	956	break;
957	#elif defined(__m68k__)	957	#elif defined(__mc68000__)
958	case R_68K_PC8:	958	case R_68K_PC8:
959	v -= dot;	959	v -= dot;
960	if ((Elf32_Sword)v > 0x7f \|\| (Elf32_Sword)v < -(Elf32_Sword)0x80)	960	if ((Elf32_Sword)v > 0x7f \|\| (Elf32_Sword)v < -(Elf32_Sword)0x80)
@@ -1049,7 +1049,7 @@ arch_apply_relocation(struct obj_file *f,
1049	case R_386_JMP_SLOT:	1049	case R_386_JMP_SLOT:
1050	*loc = v;	1050	*loc = v;
1051	break;	1051	break;
1052	#elif defined(__m68k__)	1052	#elif defined(__mc68000__)
1053	case R_68K_GLOB_DAT:	1053	case R_68K_GLOB_DAT:
1054	case R_68K_JMP_SLOT:	1054	case R_68K_JMP_SLOT:
1055	*loc = v;	1055	*loc = v;
@@ -1065,7 +1065,7 @@ arch_apply_relocation(struct obj_file *f,
1065	case R_386_RELATIVE:	1065	case R_386_RELATIVE:
1066	*loc += f->baseaddr;	1066	*loc += f->baseaddr;
1067	break;	1067	break;
1068	#elif defined(__m68k__)	1068	#elif defined(__mc68000__)
1069	case R_68K_RELATIVE:	1069	case R_68K_RELATIVE:
1070	(int )loc += f->baseaddr;	1070	(int )loc += f->baseaddr;
1071	break;	1071	break;
@@ -1096,7 +1096,7 @@ arch_apply_relocation(struct obj_file *f,
1096	case R_ARM_GOT32:	1096	case R_ARM_GOT32:
1097	#elif defined(__i386__)	1097	#elif defined(__i386__)
1098	case R_386_GOT32:	1098	case R_386_GOT32:
1099	#elif defined(__m68k__)	1099	#elif defined(__mc68000__)
1100	case R_68K_GOT32:	1100	case R_68K_GOT32:
1101	#endif	1101	#endif
1102	assert(isym != NULL);	1102	assert(isym != NULL);
@@ -1108,26 +1108,26 @@ arch_apply_relocation(struct obj_file *f,
1108	/* make the reloc with_respect_to_.got */	1108	/* make the reloc with_respect_to_.got */
1109	#if defined(__sh__)	1109	#if defined(__sh__)
1110	*loc += isym->gotent.offset + rel->r_addend;	1110	*loc += isym->gotent.offset + rel->r_addend;
1111	#elif defined(__i386__) \|\| defined(__arm__) \|\| defined(__m68k__)	1111	#elif defined(__i386__) \|\| defined(__arm__) \|\| defined(__mc68000__)
1112	*loc += isym->gotent.offset;	1112	*loc += isym->gotent.offset;
1113	#endif	1113	#endif
1114	break;	1114	break;
1115		1115
1116	/* address relative to the got */	1116	/* address relative to the got */
1117	#if !defined(__m68k__)	1117	#if !defined(__mc68000__)
1118	#if defined(__sh__)	1118	#if defined(__sh__)
1119	case R_SH_GOTOFF:	1119	case R_SH_GOTOFF:
1120	#elif defined(__arm__)	1120	#elif defined(__arm__)
1121	case R_ARM_GOTOFF:	1121	case R_ARM_GOTOFF:
1122	#elif defined(__i386__)	1122	#elif defined(__i386__)
1123	case R_386_GOTOFF:	1123	case R_386_GOTOFF:
1124	#elif defined(__m68k__)	1124	#elif defined(__mc68000__)
1125	case R_68K_GOTOFF:	1125	case R_68K_GOTOFF:
1126	#endif	1126	#endif
1127	assert(got != 0);	1127	assert(got != 0);
1128	*loc += v - got;	1128	*loc += v - got;
1129	break;	1129	break;
1130	#endif // __m68k__	1130	#endif // __mc68000__
1131		1131
1132	#endif /* BB_USE_GOT_ENTRIES */	1132	#endif /* BB_USE_GOT_ENTRIES */
1133		1133
@@ -1183,7 +1183,7 @@ int arch_create_got(struct obj_file *f)
1183	#elif defined(__i386__)	1183	#elif defined(__i386__)
1184	case R_386_GOT32:	1184	case R_386_GOT32:
1185	break;	1185	break;
1186	#elif defined(__m68k__)	1186	#elif defined(__mc68000__)
1187	case R_68K_GOT32:	1187	case R_68K_GOT32:
1188	break;	1188	break;
1189	#endif	1189	#endif


diff --git a/modutils/insmod.c b/modutils/insmod.c index 4ca28bb86..71f76c750 100644 --- a/modutils/insmod.c +++ b/modutils/insmod.c
@@ -130,7 +130,7 @@
130	#ifndef MODUTILS_MODULE_H	130	#ifndef MODUTILS_MODULE_H
131	static const int MODUTILS_MODULE_H = 1;	131	static const int MODUTILS_MODULE_H = 1;
132		132
133	#ident "$Id: insmod.c,v 1.65 2001/05/24 14:16:28 andersen Exp $"	133	#ident "$Id: insmod.c,v 1.66 2001/06/19 15:00:52 andersen Exp $"
134		134
135	/* This file contains the structures used by the 2.0 and 2.1 kernels.	135	/* This file contains the structures used by the 2.0 and 2.1 kernels.
136	We do not use the kernel headers directly because we do not wish	136	We do not use the kernel headers directly because we do not wish
@@ -347,7 +347,7 @@ int delete_module(const char *);
347	#ifndef MODUTILS_OBJ_H	347	#ifndef MODUTILS_OBJ_H
348	static const int MODUTILS_OBJ_H = 1;	348	static const int MODUTILS_OBJ_H = 1;
349		349
350	#ident "$Id: insmod.c,v 1.65 2001/05/24 14:16:28 andersen Exp $"	350	#ident "$Id: insmod.c,v 1.66 2001/06/19 15:00:52 andersen Exp $"
351		351
352	/* The relocatable object is manipulated using elfin types. */	352	/* The relocatable object is manipulated using elfin types. */
353		353
@@ -372,7 +372,7 @@ static const int MODUTILS_OBJ_H = 1;
372		372
373	#define ELFCLASSM ELFCLASS32	373	#define ELFCLASSM ELFCLASS32
374		374
375	#if (defined(__m68k__))	375	#if (defined(__mc68000__))
376	#define ELFDATAM ELFDATA2MSB	376	#define ELFDATAM ELFDATA2MSB
377	#endif	377	#endif
378		378
@@ -435,7 +435,7 @@ static const int MODUTILS_OBJ_H = 1;
435	#define Elf32_RelM Elf32_Rel	435	#define Elf32_RelM Elf32_Rel
436	#define ELFDATAM ELFDATA2LSB	436	#define ELFDATAM ELFDATA2LSB
437		437
438	#elif defined(__m68k__)	438	#elif defined(__mc68000__)
439		439
440	#define MATCH_MACHINE(x) (x == EM_68K)	440	#define MATCH_MACHINE(x) (x == EM_68K)
441	#define SHT_RELM SHT_RELA	441	#define SHT_RELM SHT_RELA
@@ -813,7 +813,7 @@ arch_apply_relocation(struct obj_file *f,
813	case R_ARM_NONE:	813	case R_ARM_NONE:
814	#elif defined(__i386__)	814	#elif defined(__i386__)
815	case R_386_NONE:	815	case R_386_NONE:
816	#elif defined(__m68k__)	816	#elif defined(__mc68000__)
817	case R_68K_NONE:	817	case R_68K_NONE:
818	#elif defined(__powerpc__)	818	#elif defined(__powerpc__)
819	case R_PPC_NONE:	819	case R_PPC_NONE:
@@ -828,7 +828,7 @@ arch_apply_relocation(struct obj_file *f,
828	case R_ARM_ABS32:	828	case R_ARM_ABS32:
829	#elif defined(__i386__)	829	#elif defined(__i386__)
830	case R_386_32:	830	case R_386_32:
831	#elif defined(__m68k__)	831	#elif defined(__mc68000__)
832	case R_68K_32:	832	case R_68K_32:
833	#elif defined(__powerpc__)	833	#elif defined(__powerpc__)
834	case R_PPC_ADDR32:	834	case R_PPC_ADDR32:
@@ -837,7 +837,7 @@ arch_apply_relocation(struct obj_file *f,
837	#endif	837	#endif
838	*loc += v;	838	*loc += v;
839	break;	839	break;
840	#if defined(__m68k__)	840	#if defined(__mc68000__)
841	case R_68K_8:	841	case R_68K_8:
842	if (v > 0xff)	842	if (v > 0xff)
843	ret = obj_reloc_overflow;	843	ret = obj_reloc_overflow;
@@ -848,7 +848,7 @@ arch_apply_relocation(struct obj_file *f,
848	ret = obj_reloc_overflow;	848	ret = obj_reloc_overflow;
849	(short )loc = v;	849	(short )loc = v;
850	break;	850	break;
851	#endif /* __m68k__ */	851	#endif /* __mc68000__ */
852		852
853	#if defined(__powerpc__)	853	#if defined(__powerpc__)
854	case R_PPC_ADDR16_HA:	854	case R_PPC_ADDR16_HA:
@@ -954,7 +954,7 @@ arch_apply_relocation(struct obj_file *f,
954	case R_386_PC32:	954	case R_386_PC32:
955	*loc += v - dot;	955	*loc += v - dot;
956	break;	956	break;
957	#elif defined(__m68k__)	957	#elif defined(__mc68000__)
958	case R_68K_PC8:	958	case R_68K_PC8:
959	v -= dot;	959	v -= dot;
960	if ((Elf32_Sword)v > 0x7f \|\| (Elf32_Sword)v < -(Elf32_Sword)0x80)	960	if ((Elf32_Sword)v > 0x7f \|\| (Elf32_Sword)v < -(Elf32_Sword)0x80)
@@ -1049,7 +1049,7 @@ arch_apply_relocation(struct obj_file *f,
1049	case R_386_JMP_SLOT:	1049	case R_386_JMP_SLOT:
1050	*loc = v;	1050	*loc = v;
1051	break;	1051	break;
1052	#elif defined(__m68k__)	1052	#elif defined(__mc68000__)
1053	case R_68K_GLOB_DAT:	1053	case R_68K_GLOB_DAT:
1054	case R_68K_JMP_SLOT:	1054	case R_68K_JMP_SLOT:
1055	*loc = v;	1055	*loc = v;
@@ -1065,7 +1065,7 @@ arch_apply_relocation(struct obj_file *f,
1065	case R_386_RELATIVE:	1065	case R_386_RELATIVE:
1066	*loc += f->baseaddr;	1066	*loc += f->baseaddr;
1067	break;	1067	break;
1068	#elif defined(__m68k__)	1068	#elif defined(__mc68000__)
1069	case R_68K_RELATIVE:	1069	case R_68K_RELATIVE:
1070	(int )loc += f->baseaddr;	1070	(int )loc += f->baseaddr;
1071	break;	1071	break;
@@ -1096,7 +1096,7 @@ arch_apply_relocation(struct obj_file *f,
1096	case R_ARM_GOT32:	1096	case R_ARM_GOT32:
1097	#elif defined(__i386__)	1097	#elif defined(__i386__)
1098	case R_386_GOT32:	1098	case R_386_GOT32:
1099	#elif defined(__m68k__)	1099	#elif defined(__mc68000__)
1100	case R_68K_GOT32:	1100	case R_68K_GOT32:
1101	#endif	1101	#endif
1102	assert(isym != NULL);	1102	assert(isym != NULL);
@@ -1108,26 +1108,26 @@ arch_apply_relocation(struct obj_file *f,
1108	/* make the reloc with_respect_to_.got */	1108	/* make the reloc with_respect_to_.got */
1109	#if defined(__sh__)	1109	#if defined(__sh__)
1110	*loc += isym->gotent.offset + rel->r_addend;	1110	*loc += isym->gotent.offset + rel->r_addend;
1111	#elif defined(__i386__) \|\| defined(__arm__) \|\| defined(__m68k__)	1111	#elif defined(__i386__) \|\| defined(__arm__) \|\| defined(__mc68000__)
1112	*loc += isym->gotent.offset;	1112	*loc += isym->gotent.offset;
1113	#endif	1113	#endif
1114	break;	1114	break;
1115		1115
1116	/* address relative to the got */	1116	/* address relative to the got */
1117	#if !defined(__m68k__)	1117	#if !defined(__mc68000__)
1118	#if defined(__sh__)	1118	#if defined(__sh__)
1119	case R_SH_GOTOFF:	1119	case R_SH_GOTOFF:
1120	#elif defined(__arm__)	1120	#elif defined(__arm__)
1121	case R_ARM_GOTOFF:	1121	case R_ARM_GOTOFF:
1122	#elif defined(__i386__)	1122	#elif defined(__i386__)
1123	case R_386_GOTOFF:	1123	case R_386_GOTOFF:
1124	#elif defined(__m68k__)	1124	#elif defined(__mc68000__)
1125	case R_68K_GOTOFF:	1125	case R_68K_GOTOFF:
1126	#endif	1126	#endif
1127	assert(got != 0);	1127	assert(got != 0);
1128	*loc += v - got;	1128	*loc += v - got;
1129	break;	1129	break;
1130	#endif // __m68k__	1130	#endif // __mc68000__
1131		1131
1132	#endif /* BB_USE_GOT_ENTRIES */	1132	#endif /* BB_USE_GOT_ENTRIES */
1133		1133
@@ -1183,7 +1183,7 @@ int arch_create_got(struct obj_file *f)
1183	#elif defined(__i386__)	1183	#elif defined(__i386__)
1184	case R_386_GOT32:	1184	case R_386_GOT32:
1185	break;	1185	break;
1186	#elif defined(__m68k__)	1186	#elif defined(__mc68000__)
1187	case R_68K_GOT32:	1187	case R_68K_GOT32:
1188	break;	1188	break;
1189	#endif	1189	#endif