kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

mjit.c: some flags are no longer for GCC

Browse source 
Obviously they are for clang. For simplicity, just inlined them.

Also another obsoleted commant was removed.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62369 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
k0kubun 2018-02-11 12:28:10 +00:00
parent ebda42fa50
commit 8f7d354269
1 changed files with 2 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
mjit.c
View file

@ -562,14 +562,6 @@ free_list(struct rb_mjit_unit_list *list)
#include "mjit_config.h" #include "mjit_config.h"
/* XXX_COMMONN_ARGS define the command line arguments of XXX C
compiler used by MJIT.
XXX_EMIT_PCH_ARGS define additional options to generate the
precomiled header.
XXX_USE_PCH_ARAGS define additional options to use the precomiled
header. */
static const char *const CC_DEBUG_ARGS[] = {MJIT_DEBUGFLAGS NULL}; static const char *const CC_DEBUG_ARGS[] = {MJIT_DEBUGFLAGS NULL};
static const char *const CC_OPTIMIZE_ARGS[] = {MJIT_OPTFLAGS NULL}; static const char *const CC_OPTIMIZE_ARGS[] = {MJIT_OPTFLAGS NULL};
@ -588,11 +580,6 @@ static const char *const CC_COMMON_ARGS[] = {
static const char *const CC_LDSHARED_ARGS[] = {MJIT_LDSHARED GCC_PIC_FLAGS NULL}; static const char *const CC_LDSHARED_ARGS[] = {MJIT_LDSHARED GCC_PIC_FLAGS NULL};
static const char *const CC_DLDFLAGS_ARGS[] = {MJIT_DLDFLAGS NULL}; static const char *const CC_DLDFLAGS_ARGS[] = {MJIT_DLDFLAGS NULL};
#ifdef __clang__
static const char GCC_USE_PCH_ARGS[] = "-include-pch";
static const char GCC_EMIT_PCH_ARGS[] = "-emit-pch";
#endif
#define CC_CODEFLAG_ARGS (mjit_opts.debug ? CC_DEBUG_ARGS : CC_OPTIMIZE_ARGS) #define CC_CODEFLAG_ARGS (mjit_opts.debug ? CC_DEBUG_ARGS : CC_OPTIMIZE_ARGS)
/* Status of the the precompiled header creation. The status is /* Status of the the precompiled header creation. The status is
shared by the workers and the pch thread. */ shared by the workers and the pch thread. */
@ -609,7 +596,7 @@ make_pch(void)
#else #else
const char *rest_args[] = { const char *rest_args[] = {
# ifdef __clang__ # ifdef __clang__
GCC_EMIT_PCH_ARGS, "-emit-pch",
# endif # endif
"-o", pch_file, header_file, "-o", pch_file, header_file,
NULL, NULL,
@ -655,7 +642,7 @@ compile_c_to_so(const char *c_file, const char *so_file)
int exit_code; int exit_code;
const char *files[] = { const char *files[] = {
#ifdef __clang__ #ifdef __clang__
GCC_USE_PCH_ARGS, NULL, "-include-pch", NULL,
#endif #endif
#ifndef _MSC_VER #ifndef _MSC_VER
"-o", "-o",