Merge remote-tracking branch 'robh/for-next' into devicetree/next

Grant Likely committed 12 years ago

Commit d88cf7d2 parents 676e1b2 6f97626305 files · +2864 −1669Browse files

Showing the changes to scripts (3 of 305 files). Show all

Unified · Split

3 files

@@ -257,7 +257,7 @@ case "$arg" in · 256 unmodified lines
257	257	&& compr="lzop -9 -f"
258	258	echo "$output_file" \| grep -q "\.lz4$" \
259	259	&& [ -x "`which lz4 2> /dev/null`" ] \
260		− && compr="lz4 -9 -f"
	260	+ && compr="lz4 -l -9 -f"
261	261	echo "$output_file" \| grep -q "\.cpio$" && compr="cat"
262	262	shift
263	263	;;

@@ -330,8 +330,7 @@ static void write_src(void) · 329 unmodified lines
330	330	printf("\tPTR\t_text + %#llx\n",
331	331	table[i].addr - _text);
332	332	else
333		− printf("\tPTR\t_text - %#llx\n",
334		− _text - table[i].addr);
	333	+ printf("\tPTR\t%#llx\n", table[i].addr);
335	334	} else {
336	335	printf("\tPTR\t%#llx\n", table[i].addr);
337	336	}

@@ -1502,6 +1502,16 @@ static int addend_386_rel(struct elf_info elf, Elf_Shdr sechdr, Elf_Rela *r) · 1501 unmodified lines
1502	1502	#define R_ARM_JUMP24 29
1503	1503	#endif
1504	1504
	1505	+#ifndef R_ARM_THM_CALL
	1506	+#define R_ARM_THM_CALL 10
	1507	+#endif
	1508	+#ifndef R_ARM_THM_JUMP24
	1509	+#define R_ARM_THM_JUMP24 30
	1510	+#endif
	1511	+#ifndef R_ARM_THM_JUMP19
	1512	+#define R_ARM_THM_JUMP19 51
	1513	+#endif
	1514	+
1505	1515	static int addend_arm_rel(struct elf_info elf, Elf_Shdr sechdr, Elf_Rela *r)
1506	1516	{
1507	1517	unsigned int r_typ = ELF_R_TYPE(r->r_info);
@@ -1515,6 +1525,9 @@ static int addend_arm_rel(struct elf_info elf, Elf_Shdr sechdr, Elf_Rela *r) · 7 unmodified lines
1515	1525	case R_ARM_PC24:
1516	1526	case R_ARM_CALL:
1517	1527	case R_ARM_JUMP24:
	1528	+ case R_ARM_THM_CALL:
	1529	+ case R_ARM_THM_JUMP24:
	1530	+ case R_ARM_THM_JUMP19:
1518	1531	/* From ARM ABI: ((S + A) \| T) - P */
1519	1532	r->r_addend = (int)(long)(elf->hdr +
1520	1533	sechdr->sh_offset +

Keyboard shortcuts