From 00c4e1c85d10a7f6b736d4d90c1ee1ecbc98e222 Mon Sep 17 00:00:00 2001
From: preetikhorjuvenkar <preetikhorjuvenkar29@gmail.com>
Date: Wed, 14 Feb 2018 10:06:52 +0000
Subject: [PATCH] Changed the year from 2016 to 2017

---
 Makefile              | 1 -
 dynasm/dasm_s390x.h   | 2 +-
 dynasm/dasm_s390x.lua | 2 +-
 src/Makefile          | 2 +-
 src/lj_target_s390x.h | 2 +-
 src/vm_s390x.dasc     | 2 +-
 6 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 80f745e9..54a51af1 100644
--- a/Makefile
+++ b/Makefile
@@ -89,7 +89,6 @@ FILES_JITLIB= bc.lua bcsave.lua dump.lua p.lua v.lua zone.lua \
 	      dis_x86.lua dis_x64.lua dis_arm.lua dis_arm64.lua \
 	      dis_arm64be.lua dis_ppc.lua dis_mips.lua dis_mipsel.lua \
 	      dis_mips64.lua dis_mips64el.lua vmdef.lua dis_s390x.lua
->>>>>>> fddef924097f28c46a0a5b45483a6086b33cab81
 
 ifeq (,$(findstring Windows,$(OS)))
   HOST_SYS:= $(shell uname -s)
diff --git a/dynasm/dasm_s390x.h b/dynasm/dasm_s390x.h
index ea3aa805..45094587 100644
--- a/dynasm/dasm_s390x.h
+++ b/dynasm/dasm_s390x.h
@@ -1,6 +1,6 @@
 /*
 ** DynASM s390x encoding engine.
-** Copyright (C) 2005-2016 Mike Pall. All rights reserved.
+** Copyright (C) 2005-2017 Mike Pall. All rights reserved.
 ** Released under the MIT license. See dynasm.lua for full copyright notice.
 */
 
diff --git a/dynasm/dasm_s390x.lua b/dynasm/dasm_s390x.lua
index 222eb74f..f7e3ecfd 100644
--- a/dynasm/dasm_s390x.lua
+++ b/dynasm/dasm_s390x.lua
@@ -1,7 +1,7 @@
 ------------------------------------------------------------------------------
 -- DynASM s390x module.
 --
--- Copyright (C) 2005-2016 Mike Pall. All rights reserved.
+-- Copyright (C) 2005-2017 Mike Pall. All rights reserved.
 -- See dynasm.lua for full copyright notice.
 ------------------------------------------------------------------------------
 
diff --git a/src/Makefile b/src/Makefile
index 0b0fdc88..0c7f496f 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -56,7 +56,7 @@ CCOPT_mips=
 #
 CCDEBUG=
 # Uncomment the next line to generate debug information:
-CCDEBUG= -g
+#CCDEBUG= -g
 #
 CCWARN= -Wall
 # Uncomment the next line to enable more warnings:
diff --git a/src/lj_target_s390x.h b/src/lj_target_s390x.h
index 6e0245fe..9854bc03 100644
--- a/src/lj_target_s390x.h
+++ b/src/lj_target_s390x.h
@@ -1,6 +1,6 @@
 /*
 ** Definitions for IBM z/Architecture (s390x) CPUs.
-** Copyright (C) 2005-2016 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2017 Mike Pall. See Copyright Notice in luajit.h
 */
 
 #ifndef _LJ_TARGET_S390X_H
diff --git a/src/vm_s390x.dasc b/src/vm_s390x.dasc
index 21a1ff33..a3027c17 100644
--- a/src/vm_s390x.dasc
+++ b/src/vm_s390x.dasc
@@ -1,6 +1,6 @@
 |// Low-level VM code for IBM z/Architecture (s390x) CPUs in LJ_GC64 mode.
 |// Bytecode interpreter, fast functions and helper functions.
-|// Copyright (C) 2005-2016 Mike Pall. See Copyright Notice in luajit.h
+|// Copyright (C) 2005-2017 Mike Pall. See Copyright Notice in luajit.h
 |
 |// This assembly targets the instruction set available on z10 (and newer)
 |// machines.