6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-01-05 12:31:33 +00:00
Code Issues Projects Releases Wiki Activity

Simplifications to Makefile.common, remove support for Purify since it was

Browse Source 
broken by libtoolification anyways, and noone can use it because purify doesn't
support the 64-bit sparc compilers even if it weren't broken!


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@7850 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2003-08-14 21:10:25 +00:00
parent 1679e8205e
commit 95cc1b39e0
2 changed files with 30 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
Makefile.common
View File

@ -140,6 +140,11 @@ ifdef SHARED_LIBRARY
all:: dynamic all:: dynamic
endif endif
ifdef BYTECODE_LIBRARY
# if BYTECODE_LIBRARY is specified, the default is to build the bytecode lib
all:: bytecodelib
endif
# Default Rule: Make sure it's also a :: rule # Default Rule: Make sure it's also a :: rule
all :: all ::
@ -167,7 +172,7 @@ prdirs::
# slightly since GNU Make will not try to find implicit rules for targets # slightly since GNU Make will not try to find implicit rules for targets
# which are marked as Phony. # which are marked as Phony.
# #
.PHONY: all dynamic clean distclean install test bytecode prdirs .PHONY: all dynamic bytecodelib clean distclean install test bytecode prdirs
########################################################################### ###########################################################################
# Miscellaneous paths and commands: # Miscellaneous paths and commands:
@ -185,8 +190,6 @@ prdirs::
BURG_OPTS = -I BURG_OPTS = -I
PURIFY := $(PURIFY) -cache-dir="$(BUILD_OBJ_ROOT)/../purifycache" -chain-length="30" -messages=all
ifdef ENABLE_PROFILING ifdef ENABLE_PROFILING
ENABLE_OPTIMIZED = 1 ENABLE_OPTIMIZED = 1
CONFIGURATION := Profile CONFIGURATION := Profile
@ -265,11 +268,7 @@ PROJTOOLCURRENT := $(BUILD_OBJ_ROOT)/tools/$(CONFIGURATION)
# #
# Libtool is found in the current directory. # Libtool is found in the current directory.
# #
ifdef VERBOSE LIBTOOL := $(LLVM_SRC_ROOT)/mklib
LIBTOOL=$(LLVM_SRC_ROOT)/mklib
else
LIBTOOL=$(LLVM_SRC_ROOT)/mklib --silent
endif
# #
# If we're not building a shared library, use the disable-shared tag with # If we're not building a shared library, use the disable-shared tag with
@ -283,7 +282,7 @@ endif
# versions of libtool. # versions of libtool.
# #
ifndef SHARED_LIBRARY ifndef SHARED_LIBRARY
LIBTOOL := $(LIBTOOL) --tag=disable-shared LIBTOOL += --tag=disable-shared
endif endif
# #
@ -291,6 +290,7 @@ endif
# #
ifndef VERBOSE ifndef VERBOSE
VERB := @ VERB := @
LIBTOOL += --silent
endif endif
########################################################################### ###########################################################################
@ -328,7 +328,6 @@ endif
# Allow gnu extensions... # Allow gnu extensions...
CPPFLAGS += -D_GNU_SOURCE CPPFLAGS += -D_GNU_SOURCE
# -Wno-unused-parameter
CompileCommonOpts := -Wall -W -Wwrite-strings -Wno-unused -I$(LEVEL)/include CompileCommonOpts := -Wall -W -Wwrite-strings -Wno-unused -I$(LEVEL)/include
CompileOptimizeOpts := -O3 -DNDEBUG -finline-functions -fshort-enums CompileOptimizeOpts := -O3 -DNDEBUG -finline-functions -fshort-enums
@ -356,11 +355,7 @@ CompileCP := $(CompileC) $(CompileOptimizeOpts) $(PROFILE)
# Link final executable # Link final executable
# (Note that we always link with the C++ compiler). # (Note that we always link with the C++ compiler).
# #
ifdef ENABLE_PURIFY # To enable purify, build with 'gmake ENABLE_PURIFY=1'
Link := $(PURIFY) $(LIBTOOL) --mode=link $(CXX) -static
else
Link := $(LIBTOOL) --mode=link $(CXX) Link := $(LIBTOOL) --mode=link $(CXX)
endif
# link both projlib and llvmlib libraries # link both projlib and llvmlib libraries
LinkG := $(Link) -g -L$(PROJLIBDEBUGSOURCE) -L$(LLVMLIBDEBUGSOURCE) $(STRIP) LinkG := $(Link) -g -L$(PROJLIBDEBUGSOURCE) -L$(LLVMLIBDEBUGSOURCE) $(STRIP)
@ -368,26 +363,20 @@ LinkO := $(Link) -O3 -L$(PROJLIBRELEASESOURCE) -L$(LLVMLIBRELEASESOURCE)
LinkP := $(Link) -O3 -L$(PROJLIBPROFILESOURCE) -L$(LLVMLIBPROFILESOURCE) $(PROFILE) LinkP := $(Link) -O3 -L$(PROJLIBPROFILESOURCE) -L$(LLVMLIBPROFILESOURCE) $(PROFILE)
# Create one .o file from a bunch of .o files... # Create one .o file from a bunch of .o files...
#ifdef SHARED_LIBRARY Relink := ${LIBTOOL} --mode=link $(CXX)
Relink = ${LIBTOOL} --mode=link $(CXX) ifndef SHARED_LIBRARY
#else Relink += -only-static
Relink = ${LIBTOOL} --mode=link $(CXX) -only-static endif
#endif
# MakeSO - Create a .so file from a .o files...
#MakeSO := $(LIBTOOL) --mode=link $(CXX) $(MakeSharedObjectOption)
#MakeSOO := $(MakeSO) -O3
#MakeSOP := $(MakeSOO) $(PROFILE)
# #
# Configure where the item being compiled should go. # Configure where the item being compiled should go.
# #
ifdef SHARED_LIBRARY ifdef SHARED_LIBRARY
Link := $(Link) -rpath $(DESTLIBCURRENT) Link += -rpath $(DESTLIBCURRENT)
endif endif
ifdef TOOLNAME ifdef TOOLNAME
Link := $(Link) -rpath $(DESTTOOLCURRENT) Link += -rpath $(DESTTOOLCURRENT)
endif endif
# Create dependancy file from CPP file, send to stdout. # Create dependancy file from CPP file, send to stdout.

41
Makefile.rules
View File

@ -140,6 +140,11 @@ ifdef SHARED_LIBRARY
all:: dynamic all:: dynamic
endif endif
ifdef BYTECODE_LIBRARY
# if BYTECODE_LIBRARY is specified, the default is to build the bytecode lib
all:: bytecodelib
endif
# Default Rule: Make sure it's also a :: rule # Default Rule: Make sure it's also a :: rule
all :: all ::
@ -167,7 +172,7 @@ prdirs::
# slightly since GNU Make will not try to find implicit rules for targets # slightly since GNU Make will not try to find implicit rules for targets
# which are marked as Phony. # which are marked as Phony.
# #
.PHONY: all dynamic clean distclean install test bytecode prdirs .PHONY: all dynamic bytecodelib clean distclean install test bytecode prdirs
########################################################################### ###########################################################################
# Miscellaneous paths and commands: # Miscellaneous paths and commands:
@ -185,8 +190,6 @@ prdirs::
BURG_OPTS = -I BURG_OPTS = -I
PURIFY := $(PURIFY) -cache-dir="$(BUILD_OBJ_ROOT)/../purifycache" -chain-length="30" -messages=all
ifdef ENABLE_PROFILING ifdef ENABLE_PROFILING
ENABLE_OPTIMIZED = 1 ENABLE_OPTIMIZED = 1
CONFIGURATION := Profile CONFIGURATION := Profile
@ -265,11 +268,7 @@ PROJTOOLCURRENT := $(BUILD_OBJ_ROOT)/tools/$(CONFIGURATION)
# #
# Libtool is found in the current directory. # Libtool is found in the current directory.
# #
ifdef VERBOSE LIBTOOL := $(LLVM_SRC_ROOT)/mklib
LIBTOOL=$(LLVM_SRC_ROOT)/mklib
else
LIBTOOL=$(LLVM_SRC_ROOT)/mklib --silent
endif
# #
# If we're not building a shared library, use the disable-shared tag with # If we're not building a shared library, use the disable-shared tag with
@ -283,7 +282,7 @@ endif
# versions of libtool. # versions of libtool.
# #
ifndef SHARED_LIBRARY ifndef SHARED_LIBRARY
LIBTOOL := $(LIBTOOL) --tag=disable-shared LIBTOOL += --tag=disable-shared
endif endif
# #
@ -291,6 +290,7 @@ endif
# #
ifndef VERBOSE ifndef VERBOSE
VERB := @ VERB := @
LIBTOOL += --silent
endif endif
########################################################################### ###########################################################################
@ -328,7 +328,6 @@ endif
# Allow gnu extensions... # Allow gnu extensions...
CPPFLAGS += -D_GNU_SOURCE CPPFLAGS += -D_GNU_SOURCE
# -Wno-unused-parameter
CompileCommonOpts := -Wall -W -Wwrite-strings -Wno-unused -I$(LEVEL)/include CompileCommonOpts := -Wall -W -Wwrite-strings -Wno-unused -I$(LEVEL)/include
CompileOptimizeOpts := -O3 -DNDEBUG -finline-functions -fshort-enums CompileOptimizeOpts := -O3 -DNDEBUG -finline-functions -fshort-enums
@ -356,11 +355,7 @@ CompileCP := $(CompileC) $(CompileOptimizeOpts) $(PROFILE)
# Link final executable # Link final executable
# (Note that we always link with the C++ compiler). # (Note that we always link with the C++ compiler).
# #
ifdef ENABLE_PURIFY # To enable purify, build with 'gmake ENABLE_PURIFY=1'
Link := $(PURIFY) $(LIBTOOL) --mode=link $(CXX) -static
else
Link := $(LIBTOOL) --mode=link $(CXX) Link := $(LIBTOOL) --mode=link $(CXX)
endif
# link both projlib and llvmlib libraries # link both projlib and llvmlib libraries
LinkG := $(Link) -g -L$(PROJLIBDEBUGSOURCE) -L$(LLVMLIBDEBUGSOURCE) $(STRIP) LinkG := $(Link) -g -L$(PROJLIBDEBUGSOURCE) -L$(LLVMLIBDEBUGSOURCE) $(STRIP)
@ -368,26 +363,20 @@ LinkO := $(Link) -O3 -L$(PROJLIBRELEASESOURCE) -L$(LLVMLIBRELEASESOURCE)
LinkP := $(Link) -O3 -L$(PROJLIBPROFILESOURCE) -L$(LLVMLIBPROFILESOURCE) $(PROFILE) LinkP := $(Link) -O3 -L$(PROJLIBPROFILESOURCE) -L$(LLVMLIBPROFILESOURCE) $(PROFILE)
# Create one .o file from a bunch of .o files... # Create one .o file from a bunch of .o files...
#ifdef SHARED_LIBRARY Relink := ${LIBTOOL} --mode=link $(CXX)
Relink = ${LIBTOOL} --mode=link $(CXX) ifndef SHARED_LIBRARY
#else Relink += -only-static
Relink = ${LIBTOOL} --mode=link $(CXX) -only-static endif
#endif
# MakeSO - Create a .so file from a .o files...
#MakeSO := $(LIBTOOL) --mode=link $(CXX) $(MakeSharedObjectOption)
#MakeSOO := $(MakeSO) -O3
#MakeSOP := $(MakeSOO) $(PROFILE)
# #
# Configure where the item being compiled should go. # Configure where the item being compiled should go.
# #
ifdef SHARED_LIBRARY ifdef SHARED_LIBRARY
Link := $(Link) -rpath $(DESTLIBCURRENT) Link += -rpath $(DESTLIBCURRENT)
endif endif
ifdef TOOLNAME ifdef TOOLNAME
Link := $(Link) -rpath $(DESTTOOLCURRENT) Link += -rpath $(DESTTOOLCURRENT)
endif endif
# Create dependancy file from CPP file, send to stdout. # Create dependancy file from CPP file, send to stdout.