head	1.2;
access;
symbols
	RELEASE_8_3_0:1.1;
locks; strict;
comment	@# @;


1.2
date	2012.10.18.18.17.09;	author osa;	state Exp;
branches;
next	1.1;

1.1
date	2012.01.19.18.09.08;	author osa;	state Exp;
branches;
next	;


desc
@@


1.2
log
@SVN rev 306079 on 2012-10-18 18:17:09Z by osa

Update from 2.0.0-beta10 to 2.0.0-beta11.
Remove needless patch.

ChangeLog:	http://luajit.org/changes.html

Feature safe:	yes
@
text
@--- src/Makefile.orig	2012-10-16 22:30:00.000000000 +0400
+++ src/Makefile	2012-10-18 22:06:48.000000000 +0400
@@@@ -25,7 +25,7 @@@@
 # with "make clean", followed by "make" if you change any options.
 #
 # LuaJIT builds as a native 32 or 64 bit binary by default.
-CC= gcc
+#CC= gcc
 #
 # Use this if you want to force a 32 bit build on a 64 bit multilib OS.
 #CC= gcc -m32
@@@@ -34,7 +34,7 @@@@
 # to slow down the C part by not omitting it. Debugging, tracebacks and
 # unwinding are not affected -- the assembler part has frame unwind
 # information and GCC emits it where needed (x64) or with -g (see CCDEBUG).
-CCOPT= -O2 -fomit-frame-pointer
+#CCOPT= -O2 -fomit-frame-pointer
 # Use this if you want to generate a smaller binary (but it's slower):
 #CCOPT= -Os -fomit-frame-pointer
 # Note: it's no longer recommended to use -O3 with GCC 4.x.
@@@@ -48,7 +48,8 @@@@
 # x86/x64 only: For GCC 4.2 or higher and if you don't intend to distribute
 # the binaries to a different machine you could also use: -march=native
 #
-CCOPT_x86= -march=i686
+#CCOPT_x86= -march=i686
+CCOPT_x86=
 CCOPT_x64=
 CCOPT_arm=
 CCOPT_ppc=
@


1.1
log
@Move luajit from devel to lang directory.

Notice from:	linimon
@
text
@d1 2
a2 2
--- src/Makefile.orig	2011-12-14 18:15:00.000000000 +0400
+++ src/Makefile	2012-01-09 19:33:28.000000000 +0400
d21 1
a21 1
@@@@ -49,7 +49,7 @@@@
d25 6
a30 5
-CCOPT_X86= -march=i686
+CCOPT_X86=
 CCOPT_X64=
 CCOPT_ARM=
 CCOPT_PPC=
@

