D10897.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D10897.diff
View Options

	Index: head/contrib/llvm/tools/lld/ELF/InputSection.cpp
	===================================================================
	--- head/contrib/llvm/tools/lld/ELF/InputSection.cpp
	+++ head/contrib/llvm/tools/lld/ELF/InputSection.cpp
	@@ -255,7 +255,7 @@
	uint32_t P) {
	switch (Type) {
	case R_ARM_THM_JUMP11:
	- return P + 2;
	+ return P + 2 + A;
	case R_ARM_CALL:
	case R_ARM_JUMP24:
	case R_ARM_PC24:
	@@ -263,12 +263,12 @@
	case R_ARM_PREL31:
	case R_ARM_THM_JUMP19:
	case R_ARM_THM_JUMP24:
	- return P + 4;
	+ return P + 4 + A;
	case R_ARM_THM_CALL:
	// We don't want an interworking BLX to ARM
	- return P + 5;
	+ return P + 5 + A;
	default:
	- return A;
	+ return P + A;
	}
	}

	@@ -279,9 +279,9 @@
	case R_AARCH64_CONDBR19:
	case R_AARCH64_JUMP26:
	case R_AARCH64_TSTBR14:
	- return P + 4;
	+ return P + 4 + A;
	default:
	- return A;
	+ return P + A;
	}
	}

	Index: head/usr.bin/hexdump/display.c
	===================================================================
	--- head/usr.bin/hexdump/display.c
	+++ head/usr.bin/hexdump/display.c
	@@ -361,12 +361,12 @@

	if (caph_limit_stream(fileno(stdin), CAPH_READ) < 0)
	err(1, "unable to restrict %s",
	- statok ? _argv[-1] : "stdin");
	+ statok ? *_argv : "stdin");

	/*
	* We've opened our last input file; enter capsicum sandbox.
	*/
	- if (*_argv == NULL) {
	+ if (statok == 0 \|\| *(_argv + 1) == NULL) {
	if (cap_enter() < 0 && errno != ENOSYS)
	err(1, "unable to enter capability mode");
	}