aboutsummaryrefslogtreecommitdiff
path: root/modutils
diff options
context:
space:
mode:
Diffstat (limited to 'modutils')
-rw-r--r--modutils/insmod.c18
-rw-r--r--modutils/modprobe.c4
2 files changed, 11 insertions, 11 deletions
diff --git a/modutils/insmod.c b/modutils/insmod.c
index d4575e03b..7d5cf473c 100644
--- a/modutils/insmod.c
+++ b/modutils/insmod.c
@@ -280,7 +280,7 @@ extern int insmod_ng_main( int argc, char **argv);
280#endif 280#endif
281 281
282/* v850e */ 282/* v850e */
283#if defined (__v850e__) 283#if defined(__v850e__)
284#define MATCH_MACHINE(x) ((x) == EM_V850 || (x) == EM_CYGNUS_V850) 284#define MATCH_MACHINE(x) ((x) == EM_V850 || (x) == EM_CYGNUS_V850)
285#define SHT_RELM SHT_RELA 285#define SHT_RELM SHT_RELA
286#define Elf32_RelM Elf32_Rela 286#define Elf32_RelM Elf32_Rela
@@ -982,7 +982,7 @@ arch_apply_relocation(struct obj_file *f,
982 *loc += v - got; 982 *loc += v - got;
983 break; 983 break;
984 984
985#elif defined (__microblaze__) 985#elif defined(__microblaze__)
986 case R_MICROBLAZE_NONE: 986 case R_MICROBLAZE_NONE:
987 case R_MICROBLAZE_64_NONE: 987 case R_MICROBLAZE_64_NONE:
988 case R_MICROBLAZE_32_SYM_OP_SYM: 988 case R_MICROBLAZE_32_SYM_OP_SYM:
@@ -1540,7 +1540,7 @@ arch_apply_relocation(struct obj_file *f,
1540 } 1540 }
1541# endif /* __SH5__ */ 1541# endif /* __SH5__ */
1542 1542
1543#elif defined (__v850e__) 1543#elif defined(__v850e__)
1544 1544
1545 case R_V850_NONE: 1545 case R_V850_NONE:
1546 break; 1546 break;
@@ -1663,7 +1663,7 @@ bb_use_plt:
1663 ip[2] = 0x7d6903a6; /* mtctr r11 */ 1663 ip[2] = 0x7d6903a6; /* mtctr r11 */
1664 ip[3] = 0x4e800420; /* bctr */ 1664 ip[3] = 0x4e800420; /* bctr */
1665#endif 1665#endif
1666#if defined (__v850e__) 1666#if defined(__v850e__)
1667 /* We have to trash a register, so we assume that any control 1667 /* We have to trash a register, so we assume that any control
1668 transfer more than 21-bits away must be a function call 1668 transfer more than 21-bits away must be a function call
1669 (so we can use a call-clobbered register). */ 1669 (so we can use a call-clobbered register). */
@@ -1676,15 +1676,15 @@ bb_use_plt:
1676 /* relative distance to target */ 1676 /* relative distance to target */
1677 v -= dot; 1677 v -= dot;
1678 /* if the target is too far away.... */ 1678 /* if the target is too far away.... */
1679#if defined (__arm__) || defined (__powerpc__) 1679#if defined(__arm__) || defined(__powerpc__)
1680 if ((int)v < -0x02000000 || (int)v >= 0x02000000) 1680 if ((int)v < -0x02000000 || (int)v >= 0x02000000)
1681#elif defined (__v850e__) 1681#elif defined(__v850e__)
1682 if ((ElfW(Sword))v > 0x1fffff || (ElfW(Sword))v < (ElfW(Sword))-0x200000) 1682 if ((ElfW(Sword))v > 0x1fffff || (ElfW(Sword))v < (ElfW(Sword))-0x200000)
1683#endif 1683#endif
1684 /* go via the plt */ 1684 /* go via the plt */
1685 v = plt + pe->offset - dot; 1685 v = plt + pe->offset - dot;
1686 1686
1687#if defined (__v850e__) 1687#if defined(__v850e__)
1688 if (v & 1) 1688 if (v & 1)
1689#else 1689#else
1690 if (v & 3) 1690 if (v & 3)
@@ -1701,7 +1701,7 @@ bb_use_plt:
1701#if defined(__powerpc__) 1701#if defined(__powerpc__)
1702 *loc = (*loc & ~0x03fffffc) | (v & 0x03fffffc); 1702 *loc = (*loc & ~0x03fffffc) | (v & 0x03fffffc);
1703#endif 1703#endif
1704#if defined (__v850e__) 1704#if defined(__v850e__)
1705 /* We write two shorts instead of a long because even 32-bit insns 1705 /* We write two shorts instead of a long because even 32-bit insns
1706 only need half-word alignment, but the 32-bit data write needs 1706 only need half-word alignment, but the 32-bit data write needs
1707 to be long-word aligned. */ 1707 to be long-word aligned. */
@@ -1895,7 +1895,7 @@ static void arch_create_got(struct obj_file *f)
1895 got_needed = 1; 1895 got_needed = 1;
1896 continue; 1896 continue;
1897 1897
1898#elif defined (__v850e__) 1898#elif defined(__v850e__)
1899 case R_V850_22_PCREL: 1899 case R_V850_22_PCREL:
1900 plt_needed = 1; 1900 plt_needed = 1;
1901 break; 1901 break;
diff --git a/modutils/modprobe.c b/modutils/modprobe.c
index 57e19b4ab..09494ca5f 100644
--- a/modutils/modprobe.c
+++ b/modutils/modprobe.c
@@ -686,8 +686,8 @@ static int check_pattern(const char* pat_src, const char* mod_src) {
686 ret = fnmatch(pat, mod, 0); 686 ret = fnmatch(pat, mod, 0);
687 687
688 if (ENABLE_FEATURE_CLEAN_UP) { 688 if (ENABLE_FEATURE_CLEAN_UP) {
689 free (pat); 689 free(pat);
690 free (mod); 690 free(mod);
691 } 691 }
692 692
693 return ret; 693 return ret;