From 4f670845ff9ab6c48bcb5f7bf4d4ef6dc3c3064b Mon Sep 17 00:00:00 2001 From: manuel Date: Tue, 27 Mar 2012 11:51:08 +0200 Subject: reorganize file structure to match the upstream requirements --- pintos-progos/Make.config | 52 ----------------------------------------------- 1 file changed, 52 deletions(-) delete mode 100644 pintos-progos/Make.config (limited to 'pintos-progos/Make.config') diff --git a/pintos-progos/Make.config b/pintos-progos/Make.config deleted file mode 100644 index f00e8fc..0000000 --- a/pintos-progos/Make.config +++ /dev/null @@ -1,52 +0,0 @@ -# -*- makefile -*- - -SHELL = /bin/sh - -VPATH = $(SRCDIR) - -# Binary utilities. -# If the host appears to be x86, use the normal tools. -# If it's x86-64, use the compiler and linker in 32-bit mode. -# Otherwise assume cross-tools are installed as i386-elf-*. -X86 = i.86\|pentium.*\|[pk][56]\|nexgen\|viac3\|6x86\|athlon.*\|i86pc -X86_64 = x86_64 -ifneq (0, $(shell expr `uname -m` : '$(X86)')) - CC = gcc - LD = ld - OBJCOPY = objcopy -else - ifneq (0, $(shell expr `uname -m` : '$(X86_64)')) - CC = gcc -m32 - LD = ld -melf_i386 - OBJCOPY = objcopy - else - CC = i386-elf-gcc - LD = i386-elf-ld - OBJCOPY = i386-elf-objcopy - endif -endif - -ifeq ($(strip $(shell command -v $(CC) 2> /dev/null)),) -$(warning *** Compiler ($(CC)) not found. Did you set $$PATH properly? Please refer to the Getting Started section in the documentation for details. ***) -endif - -# Compiler and assembler invocation. -DEFINES = -WARNINGS = -Wall -W -Wstrict-prototypes -Wmissing-prototypes -Wsystem-headers -CFLAGS = -g -msoft-float -O -CPPFLAGS = -nostdinc -I$(SRCDIR) -I$(SRCDIR)/lib -ASFLAGS = -Wa,--gstabs -LDFLAGS = -DEPS = -MMD -MF $(@:.o=.d) - -# Turn off -fstack-protector, which we don't support. -CFLAGS += -fno-stack-protector - -# Turn off --build-id in the linker, which confuses the Pintos loader. -LDFLAGS += -Wl,--build-id=none - -%.o: %.c - $(CC) -c $< -o $@ $(CFLAGS) $(CPPFLAGS) $(WARNINGS) $(DEFINES) $(DEPS) - -%.o: %.S - $(CC) -c $< -o $@ $(ASFLAGS) $(CPPFLAGS) $(DEFINES) $(DEPS) -- cgit v1.2.3