diff options
| author | Erik de Castro Lopo <erikd@mega-nerd.com> | 2014-07-13 21:19:48 +1000 |
|---|---|---|
| committer | Erik de Castro Lopo <erikd@mega-nerd.com> | 2014-09-17 23:21:39 +1000 |
| commit | b60f16bbc818729a0cf3b9c22cd6b24e7febd85b (patch) | |
| tree | 7200c4322b2986b4356ea08cd320df46b3b9a3d3 /build | |
| parent | d399e31ec65f0282481108f9c7bc892f6eaf00cb (diff) | |
| download | flac-b60f16bbc818729a0cf3b9c22cd6b24e7febd85b.tar.gz | |
Remove old/broken PPC/Altivec code.
* Removes FLAC__lpc_restore_signal_asm_ppc_altivec_16*
from lpc.h and stream_decoder.c
* Removes PPC-specific code from cpu.c and cpu.h
* Removes PPC stuff from libFLAC/Makefile.lite and build/*.mk
* Removes as/gas/PPC-specific stuff from configure.ac and
libFLAC/Makefile.am*
* Removes libFLAC/ppc folder and remove "src/libFLAC/ppc*/Makefile"
lines from configure.ac
Patch-from: lvqcl <lvqcl.mail@gmail.com>
Diffstat (limited to 'build')
| -rw-r--r-- | build/compile.mk | 15 | ||||
| -rw-r--r-- | build/exe.mk | 8 | ||||
| -rw-r--r-- | build/lib.mk | 9 |
3 files changed, 8 insertions, 24 deletions
diff --git a/build/compile.mk b/build/compile.mk index fb243442..98e128af 100644 --- a/build/compile.mk +++ b/build/compile.mk @@ -39,21 +39,6 @@ %.debug.i %.release.i : %.cpp $(CCC) $(CXXFLAGS) -E $< -o $@ -%.debug.o %.release.o : %.s -ifeq ($(OS),Darwin) - #$(CC) -c -arch $(PROC) -Wall -force_cpusubtype_ALL $< -o $@ - $(AS) -arch $(PROC) -force_cpusubtype_ALL $< -o $@ -else - $(AS) $< -o $@ -endif -%.debug.pic.o %.release.pic.o : %.s -ifeq ($(OS),Darwin) - #$(CC) -c -arch $(PROC) -Wall -force_cpusubtype_ALL $< -o $@ - $(AS) -arch $(PROC) -force_cpusubtype_ALL $< -o $@ -else - $(AS) $< -o $@ -endif - %.debug.o : %.nasm $(NASM) -f elf -d OBJ_FORMAT_elf -i ia32/ -g $< -o $@ %.release.o : %.nasm diff --git a/build/exe.mk b/build/exe.mk index 576c3c0d..a44a9a9f 100644 --- a/build/exe.mk +++ b/build/exe.mk @@ -51,11 +51,11 @@ CXXFLAGS = $(CFLAGS) LFLAGS = -L$(LIBPATH) -DEBUG_OBJS = $(SRCS_C:%.c=%.debug.o) $(SRCS_CC:%.cc=%.debug.o) $(SRCS_CPP:%.cpp=%.debug.o) $(SRCS_NASM:%.nasm=%.debug.o) $(SRCS_S:%.s=%.debug.o) -RELEASE_OBJS = $(SRCS_C:%.c=%.release.o) $(SRCS_CC:%.cc=%.release.o) $(SRCS_CPP:%.cpp=%.release.o) $(SRCS_NASM:%.nasm=%.release.o) $(SRCS_S:%.s=%.release.o) +DEBUG_OBJS = $(SRCS_C:%.c=%.debug.o) $(SRCS_CC:%.cc=%.debug.o) $(SRCS_CPP:%.cpp=%.debug.o) $(SRCS_NASM:%.nasm=%.debug.o) +RELEASE_OBJS = $(SRCS_C:%.c=%.release.o) $(SRCS_CC:%.cc=%.release.o) $(SRCS_CPP:%.cpp=%.release.o) $(SRCS_NASM:%.nasm=%.release.o) ifeq ($(PROC),x86_64) -DEBUG_PIC_OBJS = $(SRCS_C:%.c=%.debug.pic.o) $(SRCS_CC:%.cc=%.debug.pic.o) $(SRCS_CPP:%.cpp=%.debug.pic.o) $(SRCS_NASM:%.nasm=%.debug.pic.o) $(SRCS_S:%.s=%.debug.pic.o) -RELEASE_PIC_OBJS = $(SRCS_C:%.c=%.release.pic.o) $(SRCS_CC:%.cc=%.release.pic.o) $(SRCS_CPP:%.cpp=%.release.pic.o) $(SRCS_NASM:%.nasm=%.release.pic.o) $(SRCS_S:%.s=%.release.pic.o) +DEBUG_PIC_OBJS = $(SRCS_C:%.c=%.debug.pic.o) $(SRCS_CC:%.cc=%.debug.pic.o) $(SRCS_CPP:%.cpp=%.debug.pic.o) $(SRCS_NASM:%.nasm=%.debug.pic.o) +RELEASE_PIC_OBJS = $(SRCS_C:%.c=%.release.pic.o) $(SRCS_CC:%.cc=%.release.pic.o) $(SRCS_CPP:%.cpp=%.release.pic.o) $(SRCS_NASM:%.nasm=%.release.pic.o) endif debug : $(DEBUG_PROGRAM) diff --git a/build/lib.mk b/build/lib.mk index 5d81f8f5..3cda5d09 100644 --- a/build/lib.mk +++ b/build/lib.mk @@ -29,7 +29,6 @@ else CC = gcc CCC = g++ endif -AS = as NASM = nasm LINK = ar cru OBJPATH = $(topdir)/objs @@ -71,11 +70,11 @@ CXXFLAGS = $(CFLAGS) LFLAGS = -L$(LIBPATH) -DEBUG_OBJS = $(SRCS_C:%.c=%.debug.o) $(SRCS_CC:%.cc=%.debug.o) $(SRCS_CPP:%.cpp=%.debug.o) $(SRCS_NASM:%.nasm=%.debug.o) $(SRCS_S:%.s=%.debug.o) -RELEASE_OBJS = $(SRCS_C:%.c=%.release.o) $(SRCS_CC:%.cc=%.release.o) $(SRCS_CPP:%.cpp=%.release.o) $(SRCS_NASM:%.nasm=%.release.o) $(SRCS_S:%.s=%.release.o) +DEBUG_OBJS = $(SRCS_C:%.c=%.debug.o) $(SRCS_CC:%.cc=%.debug.o) $(SRCS_CPP:%.cpp=%.debug.o) $(SRCS_NASM:%.nasm=%.debug.o) +RELEASE_OBJS = $(SRCS_C:%.c=%.release.o) $(SRCS_CC:%.cc=%.release.o) $(SRCS_CPP:%.cpp=%.release.o) $(SRCS_NASM:%.nasm=%.release.o) ifeq ($(PROC),x86_64) -DEBUG_PIC_OBJS = $(SRCS_C:%.c=%.debug.pic.o) $(SRCS_CC:%.cc=%.debug.pic.o) $(SRCS_CPP:%.cpp=%.debug.pic.o) $(SRCS_NASM:%.nasm=%.debug.pic.o) $(SRCS_S:%.s=%.debug.pic.o) -RELEASE_PIC_OBJS = $(SRCS_C:%.c=%.release.pic.o) $(SRCS_CC:%.cc=%.release.pic.o) $(SRCS_CPP:%.cpp=%.release.pic.o) $(SRCS_NASM:%.nasm=%.release.pic.o) $(SRCS_S:%.s=%.release.pic.o) +DEBUG_PIC_OBJS = $(SRCS_C:%.c=%.debug.pic.o) $(SRCS_CC:%.cc=%.debug.pic.o) $(SRCS_CPP:%.cpp=%.debug.pic.o) $(SRCS_NASM:%.nasm=%.debug.pic.o) +RELEASE_PIC_OBJS = $(SRCS_C:%.c=%.release.pic.o) $(SRCS_CC:%.cc=%.release.pic.o) $(SRCS_CPP:%.cpp=%.release.pic.o) $(SRCS_NASM:%.nasm=%.release.pic.o) endif debug : $(DEBUG_STATIC_LIB) $(DEBUG_DYNAMIC_LIB) |