Fix warnings building linux-atomic.c and fptr.c on hppa64-linux
The file fptr.c is specific to 32-bit hppa-linux and should not be included in LIB2ADD on hppa64-linux. There is a builtin type mismatch in linux-atomic.c using the type long long unsigned int for 64-bit atomic operations on hppa64-linux. 2021-10-27 John David Anglin <danglin@gcc.gnu.org> libgcc/ChangeLog: * config.host (hppa*64*-*-linux*): Don't add pa/t-linux to tmake_file. * config/pa/linux-atomic.c: Define u8, u16 and u64 types. Use them in FETCH_AND_OP_2, OP_AND_FETCH_2, COMPARE_AND_SWAP_2, SYNC_LOCK_TEST_AND_SET_2 and SYNC_LOCK_RELEASE_1 macros. * config/pa/t-linux64 (LIB1ASMSRC): New define. (LIB1ASMFUNCS): Revise. (HOST_LIBGCC2_CFLAGS): Add "-DLINUX=1".
This commit is contained in:
John David Anglin
parent
99b1021d21
commit
a1957c9755
|
|
@ -619,7 +619,7 @@ h8300-*-linux*)
|
|||
tm_file="$tm_file h8300/h8300-lib.h"
|
||||
;;
|
||||
hppa*64*-*-linux*)
|
||||
tmake_file="$tmake_file pa/t-linux pa/t-linux64"
|
||||
tmake_file="$tmake_file pa/t-linux64"
|
||||
extra_parts="crtbegin.o crtbeginS.o crtbeginT.o crtend.o crtendS.o"
|
||||
;;
|
||||
hppa*-*-linux*)
|
||||
|
|
|
|||
|
|
@ -28,6 +28,14 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
|||
#define EBUSY 16
|
||||
#define ENOSYS 251
|
||||
|
||||
typedef unsigned char u8;
|
||||
typedef short unsigned int u16;
|
||||
#ifdef __LP64__
|
||||
typedef long unsigned int u64;
|
||||
#else
|
||||
typedef long long unsigned int u64;
|
||||
#endif
|
||||
|
||||
/* PA-RISC 2.0 supports out-of-order execution for loads and stores.
|
||||
Thus, we need to synchonize memory accesses. For more info, see:
|
||||
"Advanced Performance Features of the 64-bit PA-8000" by Doug Hunt.
|
||||
|
|
@ -117,26 +125,26 @@ __kernel_cmpxchg2 (volatile void *mem, const void *oldval, const void *newval,
|
|||
return tmp; \
|
||||
}
|
||||
|
||||
FETCH_AND_OP_2 (add, , +, long long unsigned int, 8, 3)
|
||||
FETCH_AND_OP_2 (sub, , -, long long unsigned int, 8, 3)
|
||||
FETCH_AND_OP_2 (or, , |, long long unsigned int, 8, 3)
|
||||
FETCH_AND_OP_2 (and, , &, long long unsigned int, 8, 3)
|
||||
FETCH_AND_OP_2 (xor, , ^, long long unsigned int, 8, 3)
|
||||
FETCH_AND_OP_2 (nand, ~, &, long long unsigned int, 8, 3)
|
||||
FETCH_AND_OP_2 (add, , +, u64, 8, 3)
|
||||
FETCH_AND_OP_2 (sub, , -, u64, 8, 3)
|
||||
FETCH_AND_OP_2 (or, , |, u64, 8, 3)
|
||||
FETCH_AND_OP_2 (and, , &, u64, 8, 3)
|
||||
FETCH_AND_OP_2 (xor, , ^, u64, 8, 3)
|
||||
FETCH_AND_OP_2 (nand, ~, &, u64, 8, 3)
|
||||
|
||||
FETCH_AND_OP_2 (add, , +, short unsigned int, 2, 1)
|
||||
FETCH_AND_OP_2 (sub, , -, short unsigned int, 2, 1)
|
||||
FETCH_AND_OP_2 (or, , |, short unsigned int, 2, 1)
|
||||
FETCH_AND_OP_2 (and, , &, short unsigned int, 2, 1)
|
||||
FETCH_AND_OP_2 (xor, , ^, short unsigned int, 2, 1)
|
||||
FETCH_AND_OP_2 (nand, ~, &, short unsigned int, 2, 1)
|
||||
FETCH_AND_OP_2 (add, , +, u16, 2, 1)
|
||||
FETCH_AND_OP_2 (sub, , -, u16, 2, 1)
|
||||
FETCH_AND_OP_2 (or, , |, u16, 2, 1)
|
||||
FETCH_AND_OP_2 (and, , &, u16, 2, 1)
|
||||
FETCH_AND_OP_2 (xor, , ^, u16, 2, 1)
|
||||
FETCH_AND_OP_2 (nand, ~, &, u16, 2, 1)
|
||||
|
||||
FETCH_AND_OP_2 (add, , +, unsigned char, 1, 0)
|
||||
FETCH_AND_OP_2 (sub, , -, unsigned char, 1, 0)
|
||||
FETCH_AND_OP_2 (or, , |, unsigned char, 1, 0)
|
||||
FETCH_AND_OP_2 (and, , &, unsigned char, 1, 0)
|
||||
FETCH_AND_OP_2 (xor, , ^, unsigned char, 1, 0)
|
||||
FETCH_AND_OP_2 (nand, ~, &, unsigned char, 1, 0)
|
||||
FETCH_AND_OP_2 (add, , +, u8, 1, 0)
|
||||
FETCH_AND_OP_2 (sub, , -, u8, 1, 0)
|
||||
FETCH_AND_OP_2 (or, , |, u8, 1, 0)
|
||||
FETCH_AND_OP_2 (and, , &, u8, 1, 0)
|
||||
FETCH_AND_OP_2 (xor, , ^, u8, 1, 0)
|
||||
FETCH_AND_OP_2 (nand, ~, &, u8, 1, 0)
|
||||
|
||||
#define OP_AND_FETCH_2(OP, PFX_OP, INF_OP, TYPE, WIDTH, INDEX) \
|
||||
TYPE HIDDEN \
|
||||
|
|
@ -154,26 +162,26 @@ FETCH_AND_OP_2 (nand, ~, &, unsigned char, 1, 0)
|
|||
return PFX_OP (tmp INF_OP val); \
|
||||
}
|
||||
|
||||
OP_AND_FETCH_2 (add, , +, long long unsigned int, 8, 3)
|
||||
OP_AND_FETCH_2 (sub, , -, long long unsigned int, 8, 3)
|
||||
OP_AND_FETCH_2 (or, , |, long long unsigned int, 8, 3)
|
||||
OP_AND_FETCH_2 (and, , &, long long unsigned int, 8, 3)
|
||||
OP_AND_FETCH_2 (xor, , ^, long long unsigned int, 8, 3)
|
||||
OP_AND_FETCH_2 (nand, ~, &, long long unsigned int, 8, 3)
|
||||
OP_AND_FETCH_2 (add, , +, u64, 8, 3)
|
||||
OP_AND_FETCH_2 (sub, , -, u64, 8, 3)
|
||||
OP_AND_FETCH_2 (or, , |, u64, 8, 3)
|
||||
OP_AND_FETCH_2 (and, , &, u64, 8, 3)
|
||||
OP_AND_FETCH_2 (xor, , ^, u64, 8, 3)
|
||||
OP_AND_FETCH_2 (nand, ~, &, u64, 8, 3)
|
||||
|
||||
OP_AND_FETCH_2 (add, , +, short unsigned int, 2, 1)
|
||||
OP_AND_FETCH_2 (sub, , -, short unsigned int, 2, 1)
|
||||
OP_AND_FETCH_2 (or, , |, short unsigned int, 2, 1)
|
||||
OP_AND_FETCH_2 (and, , &, short unsigned int, 2, 1)
|
||||
OP_AND_FETCH_2 (xor, , ^, short unsigned int, 2, 1)
|
||||
OP_AND_FETCH_2 (nand, ~, &, short unsigned int, 2, 1)
|
||||
OP_AND_FETCH_2 (add, , +, u16, 2, 1)
|
||||
OP_AND_FETCH_2 (sub, , -, u16, 2, 1)
|
||||
OP_AND_FETCH_2 (or, , |, u16, 2, 1)
|
||||
OP_AND_FETCH_2 (and, , &, u16, 2, 1)
|
||||
OP_AND_FETCH_2 (xor, , ^, u16, 2, 1)
|
||||
OP_AND_FETCH_2 (nand, ~, &, u16, 2, 1)
|
||||
|
||||
OP_AND_FETCH_2 (add, , +, unsigned char, 1, 0)
|
||||
OP_AND_FETCH_2 (sub, , -, unsigned char, 1, 0)
|
||||
OP_AND_FETCH_2 (or, , |, unsigned char, 1, 0)
|
||||
OP_AND_FETCH_2 (and, , &, unsigned char, 1, 0)
|
||||
OP_AND_FETCH_2 (xor, , ^, unsigned char, 1, 0)
|
||||
OP_AND_FETCH_2 (nand, ~, &, unsigned char, 1, 0)
|
||||
OP_AND_FETCH_2 (add, , +, u8, 1, 0)
|
||||
OP_AND_FETCH_2 (sub, , -, u8, 1, 0)
|
||||
OP_AND_FETCH_2 (or, , |, u8, 1, 0)
|
||||
OP_AND_FETCH_2 (and, , &, u8, 1, 0)
|
||||
OP_AND_FETCH_2 (xor, , ^, u8, 1, 0)
|
||||
OP_AND_FETCH_2 (nand, ~, &, u8, 1, 0)
|
||||
|
||||
#define FETCH_AND_OP_WORD(OP, PFX_OP, INF_OP) \
|
||||
unsigned int HIDDEN \
|
||||
|
|
@ -254,9 +262,9 @@ typedef unsigned char bool;
|
|||
return (failure == 0); \
|
||||
}
|
||||
|
||||
COMPARE_AND_SWAP_2 (long long unsigned int, 8, 3)
|
||||
COMPARE_AND_SWAP_2 (short unsigned int, 2, 1)
|
||||
COMPARE_AND_SWAP_2 (unsigned char, 1, 0)
|
||||
COMPARE_AND_SWAP_2 (u64, 8, 3)
|
||||
COMPARE_AND_SWAP_2 (u16, 2, 1)
|
||||
COMPARE_AND_SWAP_2 (u8, 1, 0)
|
||||
|
||||
unsigned int HIDDEN
|
||||
__sync_val_compare_and_swap_4 (volatile void *ptr, unsigned int oldval,
|
||||
|
|
@ -304,9 +312,9 @@ TYPE HIDDEN \
|
|||
return oldval; \
|
||||
}
|
||||
|
||||
SYNC_LOCK_TEST_AND_SET_2 (long long unsigned int, 8, 3)
|
||||
SYNC_LOCK_TEST_AND_SET_2 (short unsigned int, 2, 1)
|
||||
SYNC_LOCK_TEST_AND_SET_2 (unsigned char, 1, 0)
|
||||
SYNC_LOCK_TEST_AND_SET_2 (u64, 8, 3)
|
||||
SYNC_LOCK_TEST_AND_SET_2 (u16, 2, 1)
|
||||
SYNC_LOCK_TEST_AND_SET_2 (u8, 1, 0)
|
||||
|
||||
unsigned int HIDDEN
|
||||
__sync_lock_test_and_set_4 (volatile void *ptr, unsigned int val)
|
||||
|
|
@ -336,9 +344,9 @@ __sync_lock_test_and_set_4 (volatile void *ptr, unsigned int val)
|
|||
} while (failure != 0); \
|
||||
}
|
||||
|
||||
SYNC_LOCK_RELEASE_1 (long long unsigned int, 8, 3)
|
||||
SYNC_LOCK_RELEASE_1 (short unsigned int, 2, 1)
|
||||
SYNC_LOCK_RELEASE_1 (unsigned char, 1, 0)
|
||||
SYNC_LOCK_RELEASE_1 (u64, 8, 3)
|
||||
SYNC_LOCK_RELEASE_1 (u16, 2, 1)
|
||||
SYNC_LOCK_RELEASE_1 (u8, 1, 0)
|
||||
|
||||
void HIDDEN
|
||||
__sync_lock_release_4 (volatile void *ptr)
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
# Plug millicode routines into libgcc.a We want these on both native and
|
||||
# cross compiles.
|
||||
# FIXME: Explain.
|
||||
LIB1ASMFUNCS := $(filter-out _dyncall, $(LIB1ASMFUNCS))
|
||||
LIB1ASMSRC = pa/milli64.S
|
||||
LIB1ASMFUNCS = _divI _divU _remI _remU _div_const _mulI
|
||||
|
||||
HOST_LIBGCC2_CFLAGS += -Dpa64=1 -DELF=1 -DLINUX=1
|
||||
|
||||
LIB2ADD_ST = $(srcdir)/config/pa/linux-atomic.c
|
||||
|
||||
HOST_LIBGCC2_CFLAGS += -Dpa64=1 -DELF=1
|
||||
|
|
|
|||
Loading…
Reference in New Issue