From 302af79506e7c238ed59fe8bc2270b11501ffb3d Mon Sep 17 00:00:00 2001 From: Ed Maste Date: Tue, 19 May 2015 21:00:53 +0000 Subject: [PATCH] All FreeBSD platforms are elf: move i386-elf to i386 This was a leftover from when we had both i386 a.out and ELF. Reviewed by: kib, imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D2591 --- lib/csu/Makefile | 5 ++--- lib/csu/{i386-elf => i386}/Makefile | 0 lib/csu/{i386-elf => i386}/crt1_c.c | 0 lib/csu/{i386-elf => i386}/crt1_s.S | 0 lib/csu/{i386-elf => i386}/crti.S | 0 lib/csu/{i386-elf => i386}/crtn.S | 0 6 files changed, 2 insertions(+), 3 deletions(-) rename lib/csu/{i386-elf => i386}/Makefile (100%) rename lib/csu/{i386-elf => i386}/crt1_c.c (100%) rename lib/csu/{i386-elf => i386}/crt1_s.S (100%) rename lib/csu/{i386-elf => i386}/crti.S (100%) rename lib/csu/{i386-elf => i386}/crtn.S (100%) diff --git a/lib/csu/Makefile b/lib/csu/Makefile index 320a5a4d4732..5f1cddcde662 100644 --- a/lib/csu/Makefile +++ b/lib/csu/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ -ARCH= ${MACHINE_ARCH:S/i386/i386-elf/} -.if exists(${.CURDIR}/${ARCH}) -SUBDIR+= ${ARCH} +.if exists(${.CURDIR}/${MACHINE_ARCH}) +SUBDIR+= ${MACHINE_ARCH} .else SUBDIR+= ${MACHINE_CPUARCH} .endif diff --git a/lib/csu/i386-elf/Makefile b/lib/csu/i386/Makefile similarity index 100% rename from lib/csu/i386-elf/Makefile rename to lib/csu/i386/Makefile diff --git a/lib/csu/i386-elf/crt1_c.c b/lib/csu/i386/crt1_c.c similarity index 100% rename from lib/csu/i386-elf/crt1_c.c rename to lib/csu/i386/crt1_c.c diff --git a/lib/csu/i386-elf/crt1_s.S b/lib/csu/i386/crt1_s.S similarity index 100% rename from lib/csu/i386-elf/crt1_s.S rename to lib/csu/i386/crt1_s.S diff --git a/lib/csu/i386-elf/crti.S b/lib/csu/i386/crti.S similarity index 100% rename from lib/csu/i386-elf/crti.S rename to lib/csu/i386/crti.S diff --git a/lib/csu/i386-elf/crtn.S b/lib/csu/i386/crtn.S similarity index 100% rename from lib/csu/i386-elf/crtn.S rename to lib/csu/i386/crtn.S