---

yaml
---
r: 367967
b: refs/heads/master
c: 426d29c
h: refs/heads/master
i:
  367965: 1447b7c
  367963: a59b6f5
  367959: 4eac69d
  367951: 07db2e3
  367935: 2717a0e
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5c883b462aa5ecde3da6cabdca00f6abac22aa74
+refs/heads/master: 426d29ccb2a8d44c18d3167327ee82b38287e7bf

trunk/arch/hexagon/include/asm/elf.h

@@ -104,6 +104,16 @@ typedef unsigned long elf_fpregset_t;
  * Bypass the whole "regsets" thing for now and use the define.
  */
 
+#if CONFIG_HEXAGON_ARCH_VERSION >= 4
+#define CS_COPYREGS(DEST,REGS) \
+do {\
+	DEST.cs0 = REGS->cs0;\
+	DEST.cs1 = REGS->cs1;\
+} while (0)
+#else
+#define CS_COPYREGS(DEST,REGS)
+#endif
+
 #define ELF_CORE_COPY_REGS(DEST, REGS)	\
 do {					\
 	DEST.r0 = REGS->r00;		\
@@ -148,13 +158,12 @@ do {					\
 	DEST.p3_0 = REGS->preds;	\
 	DEST.gp = REGS->gp;		\
 	DEST.ugp = REGS->ugp;		\
-	DEST.pc = pt_elr(REGS);	\
+	CS_COPYREGS(DEST,REGS);		\
+	DEST.pc = pt_elr(REGS);		\
 	DEST.cause = pt_cause(REGS);	\
 	DEST.badva = pt_badva(REGS);	\
 } while (0);
 
-
-
 /*
  * This is used to ensure we don't load something for the wrong architecture.
  * Checks the machine and ABI type.