From 498d8099a6e4163798d327c9cc727fa0282bd716 Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Sat, 22 Nov 2003 21:22:28 +0000 Subject: Remove SAFECFLAGS. It was a workaround for failures in old awk script used to generate the crti.S and crtn.S files. Since we don't use that anymore, keeping the workaround makes no sense. Furthermore, in most cases, SAFECFLAGS was not picking up all the needed flags, causing crti.o and crtn.o to not be built PIC. Which is very bad. Removing SAFECFLAGS and using CFLAGS fixes that as well. --- libc/sysdeps/linux/alpha/Makefile | 9 ++------- libc/sysdeps/linux/arm/Makefile | 9 ++------- libc/sysdeps/linux/cris/Makefile | 9 ++------- libc/sysdeps/linux/e1/Makefile | 8 ++------ libc/sysdeps/linux/h8300/Makefile | 8 ++------ libc/sysdeps/linux/i386/Makefile | 14 +++----------- libc/sysdeps/linux/i960/Makefile | 9 ++------- libc/sysdeps/linux/m68k/Makefile | 10 ++-------- libc/sysdeps/linux/microblaze/Makefile | 9 ++------- libc/sysdeps/linux/mips/Makefile | 9 ++------- libc/sysdeps/linux/powerpc/Makefile | 14 +++----------- libc/sysdeps/linux/sh/Makefile | 14 +++----------- libc/sysdeps/linux/sh64/Makefile | 9 ++------- libc/sysdeps/linux/sparc/Makefile | 9 ++------- libc/sysdeps/linux/v850/Makefile | 9 ++------- 15 files changed, 33 insertions(+), 116 deletions(-) (limited to 'libc') diff --git a/libc/sysdeps/linux/alpha/Makefile b/libc/sysdeps/linux/alpha/Makefile index a5f8b2cc9..c700b7589 100644 --- a/libc/sysdeps/linux/alpha/Makefile +++ b/libc/sysdeps/linux/alpha/Makefile @@ -33,11 +33,6 @@ COBJS=$(patsubst %.c,%.o, $(CSRC)) OBJS=$(SOBJS) $(COBJS) -ifeq ($(strip $(UCLIBC_HAS_SOFT_FLOAT)),y) -SAFECFLAGS += $(call check_gcc,-msoft-float,) -endif - - all: $(OBJS) $(LIBC) $(LIBC): ar-target @@ -60,14 +55,14 @@ $(COBJS): %.o : %.c ifeq ($(strip $(UCLIBC_CTOR_DTOR)),y) crti.o: crti.S - $(CC) $(SAFECFLAGS) -c crti.S -o crti.o + $(CC) $(CFLAGS) -c crti.S -o crti.o $(TOPDIR)lib/crti.o: crti.o $(INSTALL) -d $(TOPDIR)lib/ cp crti.o $(TOPDIR)lib/ crtn.o: crtn.S - $(CC) $(SAFECFLAGS) -c crtn.S -o crtn.o + $(CC) $(CFLAGS) -c crtn.S -o crtn.o $(TOPDIR)lib/crtn.o: crtn.o $(INSTALL) -d $(TOPDIR)lib/ diff --git a/libc/sysdeps/linux/arm/Makefile b/libc/sysdeps/linux/arm/Makefile index 2f5bb0af5..a2ac7365f 100644 --- a/libc/sysdeps/linux/arm/Makefile +++ b/libc/sysdeps/linux/arm/Makefile @@ -34,11 +34,6 @@ COBJS=$(patsubst %.c,%.o, $(CSRC)) OBJS=$(SOBJS) $(MOBJ) $(COBJS) -ifeq ($(strip $(UCLIBC_HAS_SOFT_FLOAT)),y) -SAFECFLAGS += $(call check_gcc,-msoft-float,) -endif - - all: $(OBJS) $(LIBC) $(LIBC): ar-target @@ -61,14 +56,14 @@ $(COBJS): %.o : %.c ifeq ($(strip $(UCLIBC_CTOR_DTOR)),y) crti.o: crti.S - $(CC) $(SAFECFLAGS) -c crti.S -o crti.o + $(CC) $(CFLAGS) -c crti.S -o crti.o $(TOPDIR)lib/crti.o: crti.o $(INSTALL) -d $(TOPDIR)lib/ cp crti.o $(TOPDIR)lib/ crtn.o: crtn.S - $(CC) $(SAFECFLAGS) -c crtn.S -o crtn.o + $(CC) $(CFLAGS) -c crtn.S -o crtn.o $(TOPDIR)lib/crtn.o: crtn.o $(INSTALL) -d $(TOPDIR)lib/ diff --git a/libc/sysdeps/linux/cris/Makefile b/libc/sysdeps/linux/cris/Makefile index 73680a6ad..095e8815c 100644 --- a/libc/sysdeps/linux/cris/Makefile +++ b/libc/sysdeps/linux/cris/Makefile @@ -35,11 +35,6 @@ COBJS=$(patsubst %.c,%.o, $(CSRC)) OBJS=$(SOBJS) $(COBJS) -ifeq ($(strip $(UCLIBC_HAS_SOFT_FLOAT)),y) -SAFECFLAGS += $(call check_gcc,-msoft-float,) -endif - - all: $(OBJS) $(LIBC) $(LIBC): ar-target @@ -62,14 +57,14 @@ $(COBJS): %.o : %.c ifeq ($(strip $(UCLIBC_CTOR_DTOR)),y) crti.o: crti.S - $(CC) $(SAFECFLAGS) -c crti.S -o crti.o + $(CC) $(CFLAGS) -c crti.S -o crti.o $(TOPDIR)lib/crti.o: crti.o $(INSTALL) -d $(TOPDIR)lib/ cp crti.o $(TOPDIR)lib/ crtn.o: crtn.S - $(CC) $(SAFECFLAGS) -c crtn.S -o crtn.o + $(CC) $(CFLAGS) -c crtn.S -o crtn.o $(TOPDIR)lib/crtn.o: crtn.o $(INSTALL) -d $(TOPDIR)lib/ diff --git a/libc/sysdeps/linux/e1/Makefile b/libc/sysdeps/linux/e1/Makefile index d23016108..3718c8919 100644 --- a/libc/sysdeps/linux/e1/Makefile +++ b/libc/sysdeps/linux/e1/Makefile @@ -38,10 +38,6 @@ COBJS=$(patsubst %.c,%.o, $(CSRC)) OBJS=$(SOBJS) $(MOBJ) $(COBJS) $(CRT0_OBJ) -ifeq ($(strip $(UCLIBC_HAS_SOFT_FLOAT)),y) -SAFECFLAGS += $(call check_gcc,-msoft-float,) -endif - all: $(OBJS) $(LIBC) $(LIBC): ar-target @@ -64,14 +60,14 @@ $(COBJS): %.o : %.c ifeq ($(strip $(UCLIBC_CTOR_DTOR)),y) crti.o: crti.S - $(CC) $(SAFECFLAGS) -c crti.S -o crti.o + $(CC) $(CFLAGS) -c crti.S -o crti.o $(TOPDIR)lib/crti.o: crti.o $(INSTALL) -d $(TOPDIR)lib/ cp crti.o $(TOPDIR)lib/ crtn.o: crtn.S - $(CC) $(SAFECFLAGS) -c crtn.S -o crtn.o + $(CC) $(CFLAGS) -c crtn.S -o crtn.o $(TOPDIR)lib/crtn.o: crtn.o $(INSTALL) -d $(TOPDIR)lib/ diff --git a/libc/sysdeps/linux/h8300/Makefile b/libc/sysdeps/linux/h8300/Makefile index c57feb32c..141a68f69 100644 --- a/libc/sysdeps/linux/h8300/Makefile +++ b/libc/sysdeps/linux/h8300/Makefile @@ -35,10 +35,6 @@ COBJS=$(patsubst %.c,%.o, $(CSRC)) OBJS=$(SOBJS) $(COBJS) -ifeq ($(strip $(UCLIBC_HAS_SOFT_FLOAT)),y) -SAFECFLAGS += $(call check_gcc,-msoft-float,) -endif - all: $(OBJS) $(LIBC) $(LIBC): ar-target @@ -61,14 +57,14 @@ $(COBJS): %.o : %.c ifeq ($(strip $(UCLIBC_CTOR_DTOR)),y) crti.o: crti.S - $(CC) $(SAFECFLAGS) -c crti.S -o crti.o + $(CC) $(CFLAGS) -c crti.S -o crti.o $(TOPDIR)lib/crti.o: crti.o $(INSTALL) -d $(TOPDIR)lib/ cp crti.o $(TOPDIR)lib/ crtn.o: crtn.S - $(CC) $(SAFECFLAGS) -c crtn.S -o crtn.o + $(CC) $(CFLAGS) -c crtn.S -o crtn.o $(TOPDIR)lib/crtn.o: crtn.o $(INSTALL) -d $(TOPDIR)lib/ diff --git a/libc/sysdeps/linux/i386/Makefile b/libc/sysdeps/linux/i386/Makefile index 8ca4f3c6c..ddfc1fbd7 100644 --- a/libc/sysdeps/linux/i386/Makefile +++ b/libc/sysdeps/linux/i386/Makefile @@ -37,14 +37,6 @@ COBJS=$(patsubst %.c,%.o, $(CSRC)) OBJS=$(SOBJS) $(COBJS) -ifeq ($(strip $(UCLIBC_PROFILING)),y) -SAFECFLAGS := $(filter-out -g,$(CFLAGS)) -endif -ifeq ($(strip $(UCLIBC_HAS_SOFT_FLOAT)),y) -SAFECFLAGS += $(call check_gcc,-msoft-float,) -endif - - all: $(OBJS) $(LIBC) $(LIBC): ar-target @@ -67,20 +59,20 @@ $(COBJS): %.o : %.c ifeq ($(strip $(UCLIBC_PROFILING)),y) gmon-start.S: ../common/gmon-start.c - $(CC) $(SAFECFLAGS) -c $< -S -o $*.S + $(CC) $(CFLAGS) -c $< -S -o $*.S gcrt1.o: $(CRT0_DEPS) endif ifeq ($(strip $(UCLIBC_CTOR_DTOR)),y) crti.o: crti.S - $(CC) $(SAFECFLAGS) -c crti.S -o crti.o + $(CC) $(CFLAGS) -c crti.S -o crti.o $(TOPDIR)lib/crti.o: crti.o $(INSTALL) -d $(TOPDIR)lib/ cp crti.o $(TOPDIR)lib/ crtn.o: crtn.S - $(CC) $(SAFECFLAGS) -c crtn.S -o crtn.o + $(CC) $(CFLAGS) -c crtn.S -o crtn.o $(TOPDIR)lib/crtn.o: crtn.o $(INSTALL) -d $(TOPDIR)lib/ diff --git a/libc/sysdeps/linux/i960/Makefile b/libc/sysdeps/linux/i960/Makefile index 3efcc8e28..416084c11 100644 --- a/libc/sysdeps/linux/i960/Makefile +++ b/libc/sysdeps/linux/i960/Makefile @@ -35,11 +35,6 @@ COBJS=$(patsubst %.c,%.o, $(CSRC)) OBJS=$(SOBJS) $(COBJS) -ifeq ($(strip $(UCLIBC_HAS_SOFT_FLOAT)),y) -SAFECFLAGS += $(call check_gcc,-msoft-float,) -endif - - all: $(OBJS) $(LIBC) $(LIBC): ar-target @@ -62,14 +57,14 @@ $(COBJS): %.o : %.c ifeq ($(strip $(UCLIBC_CTOR_DTOR)),y) crti.o: crti.S - $(CC) $(SAFECFLAGS) -c crti.S -o crti.o + $(CC) $(CFLAGS) -c crti.S -o crti.o $(TOPDIR)lib/crti.o: crti.o $(INSTALL) -d $(TOPDIR)lib/ cp crti.o $(TOPDIR)lib/ crtn.o: crtn.S - $(CC) $(SAFECFLAGS) -c crtn.S -o crtn.o + $(CC) $(CFLAGS) -c crtn.S -o crtn.o $(TOPDIR)lib/crtn.o: crtn.o $(INSTALL) -d $(TOPDIR)lib/ diff --git a/libc/sysdeps/linux/m68k/Makefile b/libc/sysdeps/linux/m68k/Makefile index e8421b306..f4d6d1527 100644 --- a/libc/sysdeps/linux/m68k/Makefile +++ b/libc/sysdeps/linux/m68k/Makefile @@ -39,12 +39,6 @@ COBJS=$(patsubst %.c,%.o, $(CSRC)) OBJS=$(SOBJS) $(MOBJ) $(COBJS) -ifeq ($(strip $(UCLIBC_HAS_SOFT_FLOAT)),y) -SAFECFLAGS += $(call check_gcc,-msoft-float,) -endif - - - all: $(OBJS) $(LIBC) $(LIBC): ar-target @@ -67,14 +61,14 @@ $(COBJS): %.o : %.c ifeq ($(strip $(UCLIBC_CTOR_DTOR)),y) crti.o: crti.S - $(CC) $(SAFECFLAGS) -c crti.S -o crti.o + $(CC) $(CFLAGS) -c crti.S -o crti.o $(TOPDIR)lib/crti.o: crti.o $(INSTALL) -d $(TOPDIR)lib/ cp crti.o $(TOPDIR)lib/ crtn.o: crtn.S - $(CC) $(SAFECFLAGS) -c crtn.S -o crtn.o + $(CC) $(CFLAGS) -c crtn.S -o crtn.o $(TOPDIR)lib/crtn.o: crtn.o $(INSTALL) -d $(TOPDIR)lib/ diff --git a/libc/sysdeps/linux/microblaze/Makefile b/libc/sysdeps/linux/microblaze/Makefile index f808739e3..ce499c2ce 100644 --- a/libc/sysdeps/linux/microblaze/Makefile +++ b/libc/sysdeps/linux/microblaze/Makefile @@ -40,11 +40,6 @@ COBJS = $(patsubst %.c,%.o, $(CSRC)) OBJS = $(SOBJS) $(COBJS) -ifeq ($(strip $(UCLIBC_HAS_SOFT_FLOAT)),y) -SAFECFLAGS += $(call check_gcc,-msoft-float,) -endif - - all: $(OBJS) $(LIBC) $(LIBC): ar-target @@ -67,14 +62,14 @@ $(COBJS): %.o : %.c ifeq ($(strip $(UCLIBC_CTOR_DTOR)),y) crti.o: crti.S - $(CC) $(SAFECFLAGS) -c crti.S -o crti.o + $(CC) $(CFLAGS) -c crti.S -o crti.o $(TOPDIR)lib/crti.o: crti.o $(INSTALL) -d $(TOPDIR)lib/ cp crti.o $(TOPDIR)lib/ crtn.o: crtn.S - $(CC) $(SAFECFLAGS) -c crtn.S -o crtn.o + $(CC) $(CFLAGS) -c crtn.S -o crtn.o $(TOPDIR)lib/crtn.o: crtn.o $(INSTALL) -d $(TOPDIR)lib/ diff --git a/libc/sysdeps/linux/mips/Makefile b/libc/sysdeps/linux/mips/Makefile index 6b5d9c2ae..97ec0f88a 100644 --- a/libc/sysdeps/linux/mips/Makefile +++ b/libc/sysdeps/linux/mips/Makefile @@ -32,11 +32,6 @@ COBJS=$(patsubst %.c,%.o, $(CSRC)) OBJS=$(SOBJS) $(MOBJ) $(COBJS) -ifeq ($(strip $(UCLIBC_HAS_SOFT_FLOAT)),y) -SAFECFLAGS += $(call check_gcc,-msoft-float,) -endif - - all: $(OBJS) $(LIBC) $(LIBC): ar-target @@ -60,14 +55,14 @@ $(COBJS): %.o : %.c ifeq ($(strip $(UCLIBC_CTOR_DTOR)),y) crti.o: crti.S - $(CC) $(SAFECFLAGS) -c crti.S -o crti.o + $(CC) $(CFLAGS) -c crti.S -o crti.o $(TOPDIR)lib/crti.o: crti.o $(INSTALL) -d $(TOPDIR)lib/ cp crti.o $(TOPDIR)lib/ crtn.o: crtn.S - $(CC) $(SAFECFLAGS) -c crtn.S -o crtn.o + $(CC) $(CFLAGS) -c crtn.S -o crtn.o $(TOPDIR)lib/crtn.o: crtn.o $(INSTALL) -d $(TOPDIR)lib/ diff --git a/libc/sysdeps/linux/powerpc/Makefile b/libc/sysdeps/linux/powerpc/Makefile index 02c4492fe..90158b8fe 100644 --- a/libc/sysdeps/linux/powerpc/Makefile +++ b/libc/sysdeps/linux/powerpc/Makefile @@ -37,14 +37,6 @@ COBJS=$(patsubst %.c,%.o, $(CSRC)) OBJS=$(SOBJS) $(COBJS) -ifeq ($(strip $(UCLIBC_PROFILING)),y) -SAFECFLAGS := $(filter-out -g,$(CFLAGS)) -endif -ifeq ($(strip $(UCLIBC_HAS_SOFT_FLOAT)),y) -SAFECFLAGS += $(call check_gcc,-msoft-float,) -endif - - all: $(OBJS) $(LIBC) $(LIBC): ar-target @@ -67,21 +59,21 @@ $(COBJS): %.o : %.c ifeq ($(strip $(UCLIBC_PROFILING)),y) gmon-start.S: ../common/gmon-start.c - $(CC) $(SAFECFLAGS) -c $< -S -o $*.S + $(CC) $(CFLAGS) -c $< -S -o $*.S gcrt1.o: $(CRT0_DEPS) endif ifeq ($(strip $(UCLIBC_CTOR_DTOR)),y) crti.o: crti.S - $(CC) $(SAFECFLAGS) -c crti.S -o crti.o + $(CC) $(CFLAGS) -c crti.S -o crti.o $(TOPDIR)lib/crti.o: crti.o $(INSTALL) -d $(TOPDIR)lib/ cp crti.o $(TOPDIR)lib/ crtn.o: crtn.S - $(CC) $(SAFECFLAGS) -c crtn.S -o crtn.o + $(CC) $(CFLAGS) -c crtn.S -o crtn.o $(TOPDIR)lib/crtn.o: crtn.o $(INSTALL) -d $(TOPDIR)lib/ diff --git a/libc/sysdeps/linux/sh/Makefile b/libc/sysdeps/linux/sh/Makefile index 3999b51f6..f0eaa19fe 100644 --- a/libc/sysdeps/linux/sh/Makefile +++ b/libc/sysdeps/linux/sh/Makefile @@ -36,14 +36,6 @@ COBJS=$(patsubst %.c,%.o, $(CSRC)) OBJS=$(SOBJS) $(MOBJ) $(COBJS) -ifeq ($(strip $(UCLIBC_PROFILING)),y) -SAFECFLAGS := $(filter-out -g,$(CFLAGS)) -endif -ifeq ($(strip $(UCLIBC_HAS_SOFT_FLOAT)),y) -SAFECFLAGS += $(call check_gcc,-msoft-float,) -endif - - all: $(OBJS) $(LIBC) $(LIBC): ar-target @@ -66,20 +58,20 @@ $(COBJS): %.o : %.c ifeq ($(strip $(UCLIBC_PROFILING)),y) gmon-start.S: ../common/gmon-start.c - $(CC) $(SAFECFLAGS) -c $< -S -o $*.S + $(CC) $(CFLAGS) -c $< -S -o $*.S gcrt1.o: $(CRT0_DEPS) endif ifeq ($(strip $(UCLIBC_CTOR_DTOR)),y) crti.o: crti.S - $(CC) $(SAFECFLAGS) -c crti.S -o crti.o + $(CC) $(CFLAGS) -c crti.S -o crti.o $(TOPDIR)lib/crti.o: crti.o $(INSTALL) -d $(TOPDIR)lib/ cp crti.o $(TOPDIR)lib/ crtn.o: crtn.S - $(CC) $(SAFECFLAGS) -c crtn.S -o crtn.o + $(CC) $(CFLAGS) -c crtn.S -o crtn.o $(TOPDIR)lib/crtn.o: crtn.o $(INSTALL) -d $(TOPDIR)lib/ diff --git a/libc/sysdeps/linux/sh64/Makefile b/libc/sysdeps/linux/sh64/Makefile index da9549401..27463c6f2 100644 --- a/libc/sysdeps/linux/sh64/Makefile +++ b/libc/sysdeps/linux/sh64/Makefile @@ -37,11 +37,6 @@ COBJS = $(patsubst %.c,%.o, $(CSRC)) OBJS = $(SOBJS) $(COBJS) -ifeq ($(strip $(UCLIBC_HAS_SOFT_FLOAT)),y) -SAFECFLAGS += $(call check_gcc,-msoft-float,) -endif - - all: $(OBJS) $(LIBC) $(LIBC): ar-target @@ -64,14 +59,14 @@ $(COBJS): %.o : %.c ifeq ($(strip $(UCLIBC_CTOR_DTOR)),y) crti.o: crti.S - $(CC) $(SAFECFLAGS) -c crti.S -o crti.o + $(CC) $(CFLAGS) -c crti.S -o crti.o $(TOPDIR)lib/crti.o: crti.o $(INSTALL) -d $(TOPDIR)lib/ cp crti.o $(TOPDIR)lib/ crtn.o: crtn.S - $(CC) $(SAFECFLAGS) -c crtn.S -o crtn.o + $(CC) $(CFLAGS) -c crtn.S -o crtn.o $(TOPDIR)lib/crtn.o: crtn.o $(INSTALL) -d $(TOPDIR)lib/ diff --git a/libc/sysdeps/linux/sparc/Makefile b/libc/sysdeps/linux/sparc/Makefile index 26127baea..01705c024 100644 --- a/libc/sysdeps/linux/sparc/Makefile +++ b/libc/sysdeps/linux/sparc/Makefile @@ -33,11 +33,6 @@ COBJS=$(patsubst %.c,%.o, $(CSRC)) OBJS=$(SOBJS) $(MOBJ) $(COBJS) -ifeq ($(strip $(UCLIBC_HAS_SOFT_FLOAT)),y) -SAFECFLAGS += $(call check_gcc,-msoft-float,) -endif - - all: $(OBJS) $(LIBC) $(LIBC): ar-target @@ -60,14 +55,14 @@ $(COBJS): %.o : %.c ifeq ($(strip $(UCLIBC_CTOR_DTOR)),y) crti.o: crti.S - $(CC) $(SAFECFLAGS) -c crti.S -o crti.o + $(CC) $(CFLAGS) -c crti.S -o crti.o $(TOPDIR)lib/crti.o: crti.o $(INSTALL) -d $(TOPDIR)lib/ cp crti.o $(TOPDIR)lib/ crtn.o: crtn.S - $(CC) $(SAFECFLAGS) -c crtn.S -o crtn.o + $(CC) $(CFLAGS) -c crtn.S -o crtn.o $(TOPDIR)lib/crtn.o: crtn.o $(INSTALL) -d $(TOPDIR)lib/ diff --git a/libc/sysdeps/linux/v850/Makefile b/libc/sysdeps/linux/v850/Makefile index a2a23d47f..510743609 100644 --- a/libc/sysdeps/linux/v850/Makefile +++ b/libc/sysdeps/linux/v850/Makefile @@ -37,11 +37,6 @@ COBJS = $(patsubst %.c,%.o, $(CSRC)) OBJS = $(SOBJS) $(COBJS) -ifeq ($(strip $(UCLIBC_HAS_SOFT_FLOAT)),y) -SAFECFLAGS += $(call check_gcc,-msoft-float,) -endif - - all: $(OBJS) $(LIBC) $(LIBC): ar-target @@ -64,14 +59,14 @@ $(COBJS): %.o : %.c ifeq ($(strip $(UCLIBC_CTOR_DTOR)),y) crti.o: crti.S - $(CC) $(SAFECFLAGS) -c crti.S -o crti.o + $(CC) $(CFLAGS) -c crti.S -o crti.o $(TOPDIR)lib/crti.o: crti.o $(INSTALL) -d $(TOPDIR)lib/ cp crti.o $(TOPDIR)lib/ crtn.o: crtn.S - $(CC) $(SAFECFLAGS) -c crtn.S -o crtn.o + $(CC) $(CFLAGS) -c crtn.S -o crtn.o $(TOPDIR)lib/crtn.o: crtn.o $(INSTALL) -d $(TOPDIR)lib/ -- cgit v1.2.3