summaryrefslogtreecommitdiff
path: root/gcc/config
diff options
context:
space:
mode:
Diffstat (limited to 'gcc/config')
-rw-r--r--gcc/config/fixed-bit.h83
-rw-r--r--gcc/config/frv/t-linux2
-rw-r--r--gcc/config/i386/t-cygming2
-rw-r--r--gcc/config/i386/t-linux2
-rw-r--r--gcc/config/mips/t-slibgcc-irix2
-rw-r--r--gcc/config/rs6000/t-aix432
-rw-r--r--gcc/config/rs6000/t-aix522
-rw-r--r--gcc/config/sparc/t-linux2
-rw-r--r--gcc/config/t-slibgcc-elf-ver2
-rw-r--r--gcc/config/t-slibgcc-sld2
10 files changed, 55 insertions, 46 deletions
diff --git a/gcc/config/fixed-bit.h b/gcc/config/fixed-bit.h
index 562772d71cf..620742c34b6 100644
--- a/gcc/config/fixed-bit.h
+++ b/gcc/config/fixed-bit.h
@@ -445,35 +445,39 @@ typedef union
#define IBITS IBITS2(MODE_NAME)
#define I_F_BITS (FBITS + IBITS)
-#define FIXED_OP(OP,MODE,NUM) OP ## MODE ## NUM
-
-#define FIXED_SATURATE1_TEMP(NAME) FIXED_OP(__saturate1,NAME,)
-#define FIXED_SATURATE2_TEMP(NAME) FIXED_OP(__saturate2,NAME,)
-#define FIXED_MULHELPER_TEMP(NAME) FIXED_OP(__mulhelper,NAME,)
-#define FIXED_DIVHELPER_TEMP(NAME) FIXED_OP(__divhelper,NAME,)
-#define FIXED_ASHLHELPER_TEMP(NAME) FIXED_OP(__ashlhelper,NAME,)
-#define FIXED_ADD_TEMP(NAME) FIXED_OP(__add,NAME,3)
-#define FIXED_SSADD_TEMP(NAME) FIXED_OP(__ssadd,NAME,3)
-#define FIXED_USADD_TEMP(NAME) FIXED_OP(__usadd,NAME,3)
-#define FIXED_SUB_TEMP(NAME) FIXED_OP(__sub,NAME,3)
-#define FIXED_SSSUB_TEMP(NAME) FIXED_OP(__sssub,NAME,3)
-#define FIXED_USSUB_TEMP(NAME) FIXED_OP(__ussub,NAME,3)
-#define FIXED_MUL_TEMP(NAME) FIXED_OP(__mul,NAME,3)
-#define FIXED_SSMUL_TEMP(NAME) FIXED_OP(__ssmul,NAME,3)
-#define FIXED_USMUL_TEMP(NAME) FIXED_OP(__usmul,NAME,3)
-#define FIXED_DIV_TEMP(NAME) FIXED_OP(__div,NAME,3)
-#define FIXED_UDIV_TEMP(NAME) FIXED_OP(__udiv,NAME,3)
-#define FIXED_SSDIV_TEMP(NAME) FIXED_OP(__ssdiv,NAME,3)
-#define FIXED_USDIV_TEMP(NAME) FIXED_OP(__usdiv,NAME,3)
-#define FIXED_NEG_TEMP(NAME) FIXED_OP(__neg,NAME,2)
-#define FIXED_SSNEG_TEMP(NAME) FIXED_OP(__ssneg,NAME,2)
-#define FIXED_USNEG_TEMP(NAME) FIXED_OP(__usneg,NAME,2)
-#define FIXED_ASHL_TEMP(NAME) FIXED_OP(__ashl,NAME,3)
-#define FIXED_ASHR_TEMP(NAME) FIXED_OP(__ashr,NAME,3)
-#define FIXED_LSHR_TEMP(NAME) FIXED_OP(__lshr,NAME,3)
-#define FIXED_SSASHL_TEMP(NAME) FIXED_OP(__ssashl,NAME,3)
-#define FIXED_USASHL_TEMP(NAME) FIXED_OP(__usashl,NAME,3)
-#define FIXED_CMP_TEMP(NAME) FIXED_OP(__cmp,NAME,2)
+#ifdef LIBGCC2_GNU_PREFIX
+#define FIXED_OP(OP,MODE,NUM) __gnu_ ## OP ## MODE ## NUM
+#else
+#define FIXED_OP(OP,MODE,NUM) __ ## OP ## MODE ## NUM
+#endif
+
+#define FIXED_SATURATE1_TEMP(NAME) FIXED_OP(saturate1,NAME,)
+#define FIXED_SATURATE2_TEMP(NAME) FIXED_OP(saturate2,NAME,)
+#define FIXED_MULHELPER_TEMP(NAME) FIXED_OP(mulhelper,NAME,)
+#define FIXED_DIVHELPER_TEMP(NAME) FIXED_OP(divhelper,NAME,)
+#define FIXED_ASHLHELPER_TEMP(NAME) FIXED_OP(ashlhelper,NAME,)
+#define FIXED_ADD_TEMP(NAME) FIXED_OP(add,NAME,3)
+#define FIXED_SSADD_TEMP(NAME) FIXED_OP(ssadd,NAME,3)
+#define FIXED_USADD_TEMP(NAME) FIXED_OP(usadd,NAME,3)
+#define FIXED_SUB_TEMP(NAME) FIXED_OP(sub,NAME,3)
+#define FIXED_SSSUB_TEMP(NAME) FIXED_OP(sssub,NAME,3)
+#define FIXED_USSUB_TEMP(NAME) FIXED_OP(ussub,NAME,3)
+#define FIXED_MUL_TEMP(NAME) FIXED_OP(mul,NAME,3)
+#define FIXED_SSMUL_TEMP(NAME) FIXED_OP(ssmul,NAME,3)
+#define FIXED_USMUL_TEMP(NAME) FIXED_OP(usmul,NAME,3)
+#define FIXED_DIV_TEMP(NAME) FIXED_OP(div,NAME,3)
+#define FIXED_UDIV_TEMP(NAME) FIXED_OP(udiv,NAME,3)
+#define FIXED_SSDIV_TEMP(NAME) FIXED_OP(ssdiv,NAME,3)
+#define FIXED_USDIV_TEMP(NAME) FIXED_OP(usdiv,NAME,3)
+#define FIXED_NEG_TEMP(NAME) FIXED_OP(neg,NAME,2)
+#define FIXED_SSNEG_TEMP(NAME) FIXED_OP(ssneg,NAME,2)
+#define FIXED_USNEG_TEMP(NAME) FIXED_OP(usneg,NAME,2)
+#define FIXED_ASHL_TEMP(NAME) FIXED_OP(ashl,NAME,3)
+#define FIXED_ASHR_TEMP(NAME) FIXED_OP(ashr,NAME,3)
+#define FIXED_LSHR_TEMP(NAME) FIXED_OP(lshr,NAME,3)
+#define FIXED_SSASHL_TEMP(NAME) FIXED_OP(ssashl,NAME,3)
+#define FIXED_USASHL_TEMP(NAME) FIXED_OP(usashl,NAME,3)
+#define FIXED_CMP_TEMP(NAME) FIXED_OP(cmp,NAME,2)
#if defined (MODE_NAME)
#if defined (DINT_C_TYPE)
@@ -1146,14 +1150,19 @@ extern FIXED_C_TYPE FIXED_USASHL (FIXED_C_TYPE, word_type);
#define TO_HAVE_PADDING_BITS (TO_PADDING_BITS > 0)
#endif /* TO_TYPE == 4 */
-#define FIXED_CONVERT_OP(OP,FROM,TO) OP ## FROM ## TO
-#define FIXED_CONVERT_OP2(OP,FROM,TO) OP ## FROM ## TO ## 2
-#define FRACT_TEMP(N1,N2) FIXED_CONVERT_OP(__fract,N1,N2)
-#define FRACT2_TEMP(N1,N2) FIXED_CONVERT_OP2(__fract,N1,N2)
-#define SATFRACT_TEMP(N1,N2) FIXED_CONVERT_OP(__satfract,N1,N2)
-#define SATFRACT2_TEMP(N1,N2) FIXED_CONVERT_OP2(__satfract,N1,N2)
-#define FRACTUNS_TEMP(N1,N2) FIXED_CONVERT_OP(__fractuns,N1,N2)
-#define SATFRACTUNS_TEMP(N1,N2) FIXED_CONVERT_OP(__satfractuns,N1,N2)
+#ifdef LIBGCC2_GNU_PREFIX
+#define FIXED_CONVERT_OP(OP,FROM,TO) __gnu_ ## OP ## FROM ## TO
+#define FIXED_CONVERT_OP2(OP,FROM,TO) __gnu_ ## OP ## FROM ## TO ## 2
+#else
+#define FIXED_CONVERT_OP(OP,FROM,TO) __ ## OP ## FROM ## TO
+#define FIXED_CONVERT_OP2(OP,FROM,TO) __ ## OP ## FROM ## TO ## 2
+#endif
+#define FRACT_TEMP(N1,N2) FIXED_CONVERT_OP(fract,N1,N2)
+#define FRACT2_TEMP(N1,N2) FIXED_CONVERT_OP2(fract,N1,N2)
+#define SATFRACT_TEMP(N1,N2) FIXED_CONVERT_OP(satfract,N1,N2)
+#define SATFRACT2_TEMP(N1,N2) FIXED_CONVERT_OP2(satfract,N1,N2)
+#define FRACTUNS_TEMP(N1,N2) FIXED_CONVERT_OP(fractuns,N1,N2)
+#define SATFRACTUNS_TEMP(N1,N2) FIXED_CONVERT_OP(satfractuns,N1,N2)
/* Define conversions from fixed-point to fixed-point. */
#if FROM_TYPE == 4 && TO_TYPE == 4
diff --git a/gcc/config/frv/t-linux b/gcc/config/frv/t-linux
index 13eb5369ed3..5b094518a1d 100644
--- a/gcc/config/frv/t-linux
+++ b/gcc/config/frv/t-linux
@@ -29,5 +29,5 @@ EXTRA_MULTILIB_PARTS =
CRTSTUFF_T_CFLAGS = -fPIC
TARGET_LIBGCC2_CFLAGS = -fPIC
-SHLIB_MAPFILES = $(srcdir)/libgcc-std.ver \
+SHLIB_MAPFILES = $$(libgcc_objdir)/libgcc-std.ver \
$(srcdir)/config/frv/libgcc-frv.ver
diff --git a/gcc/config/i386/t-cygming b/gcc/config/i386/t-cygming
index c4807a0a97b..af2c9e41c4d 100644
--- a/gcc/config/i386/t-cygming
+++ b/gcc/config/i386/t-cygming
@@ -113,4 +113,4 @@ SHLIB_MKMAP = $(srcdir)/mkmap-flat.awk
# We'd like to use SHLIB_SONAME here too, but shlib_base_name
# does not get substituted before mkmap-flat.awk is run.
SHLIB_MKMAP_OPTS = -v pe_dll=libgcc_s_$(EH_MODEL)-$(SHLIB_SOVERSION)$(SHLIB_EXT)
-SHLIB_MAPFILES = $(srcdir)/libgcc-std.ver
+SHLIB_MAPFILES = $$(libgcc_objdir)/libgcc-std.ver
diff --git a/gcc/config/i386/t-linux b/gcc/config/i386/t-linux
index 4c6bb51e3b8..500d932fec8 100644
--- a/gcc/config/i386/t-linux
+++ b/gcc/config/i386/t-linux
@@ -1,5 +1,5 @@
# On 64bit we do not need any exports for glibc for 64-bit libgcc_s.
# Need to support TImode for x86. Override the settings from
# t-slibgcc-elf-ver and t-linux
-SHLIB_MAPFILES = $(srcdir)/libgcc-std.ver \
+SHLIB_MAPFILES = $$(libgcc_objdir)/libgcc-std.ver \
$(srcdir)/config/i386/libgcc-glibc.ver
diff --git a/gcc/config/mips/t-slibgcc-irix b/gcc/config/mips/t-slibgcc-irix
index 6227ccef3fa..e9f168e49d2 100644
--- a/gcc/config/mips/t-slibgcc-irix
+++ b/gcc/config/mips/t-slibgcc-irix
@@ -49,4 +49,4 @@ SHLIB_INSTALL = \
$(LN_S) $(SHLIB_SONAME) \
$$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SOLINK)
SHLIB_MKMAP = $(srcdir)/mkmap-flat.awk
-SHLIB_MAPFILES = $(srcdir)/libgcc-std.ver
+SHLIB_MAPFILES = $$(libgcc_objdir)/libgcc-std.ver
diff --git a/gcc/config/rs6000/t-aix43 b/gcc/config/rs6000/t-aix43
index 3cac73bd923..705e053122d 100644
--- a/gcc/config/rs6000/t-aix43
+++ b/gcc/config/rs6000/t-aix43
@@ -82,7 +82,7 @@ SHLIB_INSTALL = \
$$(DESTDIR)$$(slibdir)@shlib_slibdir_qual@/
SHLIB_LIBS = -lc `case @multilib_dir@ in *pthread*) echo -lpthread ;; esac`
SHLIB_MKMAP = $(srcdir)/mkmap-flat.awk
-SHLIB_MAPFILES = $(srcdir)/libgcc-std.ver $(srcdir)/config/rs6000/libgcc-ppc64.ver
+SHLIB_MAPFILES = $$(libgcc_objdir)/libgcc-std.ver $(srcdir)/config/rs6000/libgcc-ppc64.ver
SHLIB_NM_FLAGS = -Bpg -X32_64
# GCC 128-bit long double support routines.
diff --git a/gcc/config/rs6000/t-aix52 b/gcc/config/rs6000/t-aix52
index 0b4540278ce..e918a2e13a1 100644
--- a/gcc/config/rs6000/t-aix52
+++ b/gcc/config/rs6000/t-aix52
@@ -63,7 +63,7 @@ SHLIB_INSTALL = \
$$(DESTDIR)$$(slibdir)@shlib_slibdir_qual@/
SHLIB_LIBS = -lc `case @multilib_dir@ in *pthread*) echo -lpthread ;; esac`
SHLIB_MKMAP = $(srcdir)/mkmap-flat.awk
-SHLIB_MAPFILES = $(srcdir)/libgcc-std.ver $(srcdir)/config/rs6000/libgcc-ppc64.ver
+SHLIB_MAPFILES = $$(libgcc_objdir)/libgcc-std.ver $(srcdir)/config/rs6000/libgcc-ppc64.ver
SHLIB_NM_FLAGS = -Bpg -X32_64
# GCC 128-bit long double support routines.
diff --git a/gcc/config/sparc/t-linux b/gcc/config/sparc/t-linux
index a3e513087f5..30daa376614 100644
--- a/gcc/config/sparc/t-linux
+++ b/gcc/config/sparc/t-linux
@@ -1,5 +1,5 @@
# Override t-slibgcc-elf-ver to export some libgcc symbols with
# the symbol versions that glibc used.
# Avoid the t-linux version file.
-SHLIB_MAPFILES = $(srcdir)/libgcc-std.ver \
+SHLIB_MAPFILES = $$(libgcc_objdir)/libgcc-std.ver \
$(srcdir)/config/sparc/libgcc-sparc-glibc.ver
diff --git a/gcc/config/t-slibgcc-elf-ver b/gcc/config/t-slibgcc-elf-ver
index d5ef9ca163f..b90f4fcf3a3 100644
--- a/gcc/config/t-slibgcc-elf-ver
+++ b/gcc/config/t-slibgcc-elf-ver
@@ -53,4 +53,4 @@ SHLIB_INSTALL = \
rm -f $$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SOLINK); \
$(SHLIB_INSTALL_SOLINK)
SHLIB_MKMAP = $(srcdir)/mkmap-symver.awk
-SHLIB_MAPFILES = $(srcdir)/libgcc-std.ver
+SHLIB_MAPFILES = $$(libgcc_objdir)/libgcc-std.ver
diff --git a/gcc/config/t-slibgcc-sld b/gcc/config/t-slibgcc-sld
index 3a343f5b9ee..013a0d70e9e 100644
--- a/gcc/config/t-slibgcc-sld
+++ b/gcc/config/t-slibgcc-sld
@@ -47,4 +47,4 @@ SHLIB_INSTALL = \
$(LN_S) $(SHLIB_SONAME) \
$$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SOLINK)
SHLIB_MKMAP = $(srcdir)/mkmap-symver.awk
-SHLIB_MAPFILES = $(srcdir)/libgcc-std.ver
+SHLIB_MAPFILES = $$(libgcc_objdir)/libgcc-std.ver
View Lorry Controller Status