Skip to content

Commit ba75605

Browse files
nicolasnoblenicolasnoble
authored
Merge pull request #1652 from grumpycoders/toolchain-upgrade
Upgrading gcc/gdb.
2 parents 9966742 + 642479b commit ba75605

File tree

19 files changed

+117
-74
lines changed

19 files changed

+117
-74
lines changed

‎src/mips/common/hardware/irq.h

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,26 @@ SOFTWARE.
2929
#include <stdint.h>
3030

3131
enum IRQ {
32-
IRQ_VBLANK = 1 << 0,
33-
IRQ_GPU = 1 << 1,
34-
IRQ_CDROM = 1 << 2,
35-
IRQ_DMA = 1 << 3,
36-
IRQ_TIMER0 = 1 << 4,
37-
IRQ_TIMER1 = 1 << 5,
38-
IRQ_TIMER2 = 1 << 6,
39-
IRQ_CONTROLLER = 1 << 7,
40-
IRQ_SIO = 1 << 8,
41-
IRQ_SPU = 1 << 9,
42-
IRQ_PIO = 1 << 10,
32+
IRQ_VBLANK_NUMBER = 0,
33+
IRQ_VBLANK = 1 << IRQ_VBLANK_NUMBER,
34+
IRQ_GPU_NUMBER = 1,
35+
IRQ_GPU = 1 << IRQ_GPU_NUMBER,
36+
IRQ_CDROM_NUMBER = 2,
37+
IRQ_CDROM = 1 << IRQ_CDROM_NUMBER,
38+
IRQ_DMA_NUMBER = 3,
39+
IRQ_DMA = 1 << IRQ_DMA_NUMBER,
40+
IRQ_TIMER0_NUMBER = 4,
41+
IRQ_TIMER0 = 1 << IRQ_TIMER0_NUMBER,
42+
IRQ_TIMER1_NUMBER = 5,
43+
IRQ_TIMER1 = 1 << IRQ_TIMER1_NUMBER,
44+
IRQ_TIMER2_NUMBER = 6,
45+
IRQ_TIMER2 = 1 << IRQ_TIMER2_NUMBER,
46+
IRQ_CONTROLLER_NUMBER = 7,
47+
IRQ_CONTROLLER = 1 << IRQ_CONTROLLER_NUMBER,
48+
IRQ_SIO_NUMBER = 8,
49+
IRQ_SIO = 1 << IRQ_SIO_NUMBER,
50+
IRQ_SPU_NUMBER = 9,
51+
IRQ_SPU = 1 << IRQ_SPU_NUMBER,
52+
IRQ_PIO_NUMBER = 10,
53+
IRQ_PIO = 1 << IRQ_PIO_NUMBER,
4354
};

‎src/mips/openbios/card/device.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -630,7 +630,7 @@ static const struct Device s_cardDevice = {
630630
.flags = 0x14,
631631
.blockSize = 0x80,
632632
.desc = "MEMORY CARD",
633-
.init = psxdummy,
633+
.init = (void (*)())psxdummy,
634634
.open = dev_bu_open,
635635
.action = psxdummy,
636636
.close = dev_bu_close,

‎src/mips/openbios/cdrom/cdrom.c

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,7 @@ void initializeCDRomHandlersAndEvents() {
5353

5454
static void initializeSoftwareAndHardware() {
5555
initializeCDRomHandlersAndEvents();
56-
while (!syscall_cdromInnerInit())
57-
;
56+
while (!syscall_cdromInnerInit());
5857
}
5958

6059
void initCDRom() {
@@ -78,8 +77,7 @@ int cdromBlockGetStatus() {
7877
uint8_t status;
7978

8079
int cyclesToWait = 9;
81-
while (!syscall_cdromGetStatus(&status) && (--cyclesToWait > 0))
82-
;
80+
while (!syscall_cdromGetStatus(&status) && (--cyclesToWait > 0));
8381
if (cyclesToWait < 1) {
8482
syscall_exception(0x44, 0x1f);
8583
return -1;
@@ -101,7 +99,7 @@ static const struct Device s_cdromDevice = {
10199
.flags = 0x14,
102100
.blockSize = 0x800,
103101
.desc = "CD-ROM",
104-
.init = psxdummy,
102+
.init = (void (*)())psxdummy,
105103
.open = dev_cd_open,
106104
.action = psxdummy,
107105
.close = psxdummy,

‎src/mips/openbios/handlers/irq.c

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -77,48 +77,48 @@ static __attribute__((section(".ramtext"))) int IRQVerifier(void) {
7777
// guaranteed to not lose any IRQs.
7878
if ((IMASK & IREG & IRQ_CDROM) != 0) {
7979
deliverEvent(EVENT_CDROM, 0x1000);
80-
if (s_IRQsAutoAck[IRQ_CDROM]) IREG &= ~IRQ_CDROM;
80+
if (s_IRQsAutoAck[IRQ_CDROM_NUMBER]) IREG &= ~IRQ_CDROM;
8181
}
8282
if ((IMASK & IREG & IRQ_SPU) != 0) {
8383
deliverEvent(EVENT_SPU, 0x1000);
84-
if (s_IRQsAutoAck[IRQ_SPU]) IREG &= ~IRQ_SPU;
84+
if (s_IRQsAutoAck[IRQ_SPU_NUMBER]) IREG &= ~IRQ_SPU;
8585
}
8686
if ((IMASK & IREG & IRQ_GPU) != 0) {
8787
deliverEvent(EVENT_GPU, 0x1000);
88-
if (s_IRQsAutoAck[IRQ_GPU]) IREG &= ~IRQ_GPU;
88+
if (s_IRQsAutoAck[IRQ_GPU_NUMBER]) IREG &= ~IRQ_GPU;
8989
}
9090
if ((IMASK & IREG & IRQ_PIO) != 0) {
9191
deliverEvent(EVENT_PIO, 0x1000);
92-
if (s_IRQsAutoAck[IRQ_PIO]) IREG &= ~IRQ_PIO;
92+
if (s_IRQsAutoAck[IRQ_PIO_NUMBER]) IREG &= ~IRQ_PIO;
9393
}
9494
if ((IMASK & IREG & IRQ_SIO) != 0) {
9595
deliverEvent(EVENT_SIO, 0x1000);
96-
if (s_IRQsAutoAck[IRQ_SIO]) IREG &= ~IRQ_SIO;
96+
if (s_IRQsAutoAck[IRQ_SIO_NUMBER]) IREG &= ~IRQ_SIO;
9797
}
9898
if ((IMASK & IREG & IRQ_VBLANK) != 0) {
9999
deliverEvent(EVENT_VBLANK, 0x1000);
100-
if (s_IRQsAutoAck[IRQ_VBLANK]) IREG &= ~IRQ_VBLANK;
100+
if (s_IRQsAutoAck[IRQ_VBLANK_NUMBER]) IREG &= ~IRQ_VBLANK;
101101
}
102102
if ((IMASK & IREG & IRQ_TIMER0) != 0) {
103103
deliverEvent(EVENT_RTC0, 0x1000);
104-
if (s_IRQsAutoAck[IRQ_TIMER0]) IREG &= ~IRQ_TIMER0;
104+
if (s_IRQsAutoAck[IRQ_TIMER0_NUMBER]) IREG &= ~IRQ_TIMER0;
105105
}
106106
if ((IMASK & IREG & IRQ_TIMER1) != 0) {
107107
deliverEvent(EVENT_RTC1, 0x1000);
108-
if (s_IRQsAutoAck[IRQ_TIMER1]) IREG &= ~IRQ_TIMER1;
108+
if (s_IRQsAutoAck[IRQ_TIMER1_NUMBER]) IREG &= ~IRQ_TIMER1;
109109
}
110110
if ((IMASK & IREG & IRQ_TIMER2) != 0) {
111111
// Keeping this copy/paste mistake this way to avoid breaking stuff.
112112
deliverEvent(EVENT_RTC1, 0x1000);
113-
if (s_IRQsAutoAck[IRQ_TIMER2]) IREG &= ~IRQ_TIMER2;
113+
if (s_IRQsAutoAck[IRQ_TIMER2_NUMBER]) IREG &= ~IRQ_TIMER2;
114114
}
115115
if ((IMASK & IREG & IRQ_CONTROLLER) != 0) {
116116
deliverEvent(EVENT_CONTROLLER, 0x1000);
117-
if (s_IRQsAutoAck[IRQ_CONTROLLER]) IREG &= ~IRQ_CONTROLLER;
117+
if (s_IRQsAutoAck[IRQ_CONTROLLER_NUMBER]) IREG &= ~IRQ_CONTROLLER;
118118
}
119119
if ((IMASK & IREG & IRQ_DMA) != 0) {
120120
deliverEvent(EVENT_DMA, 0x1000);
121-
if (s_IRQsAutoAck[IRQ_DMA]) IREG &= ~IRQ_DMA;
121+
if (s_IRQsAutoAck[IRQ_DMA_NUMBER]) IREG &= ~IRQ_DMA;
122122
}
123123
return 0;
124124
}

‎src/mips/openbios/main/main.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ SOFTWARE.
2828

2929
#include <alloca.h>
3030
#include <ctype.h>
31+
#include <stdint.h>
3132
#include <string.h>
3233

3334
#include "common/hardware/cop0.h"
@@ -130,7 +131,8 @@ static char s_binaryPath[128];
130131
// the tabulation character ('\t', or character 9) or a space.
131132
// Last but not least, the retail bios will screw things up
132133
// fairly badly if the file isn't terminated using CRLFs.
133-
static void findWordItem(const char *systemCnf, uint32_t *item, const char *name) {
134+
static void findWordItem(const char *systemCnf, void *item_, const char *name) {
135+
uint32_t *item = (uint32_t *)item_;
134136
char c;
135137
const unsigned size = strlen(name);
136138
while (strncmp(systemCnf, name, size) != 0) {
@@ -378,7 +380,7 @@ static void boot(char *systemCnfPath, char *binaryPath) {
378380
psxprintf("EXEC:PC0(%08x) T_ADDR(%08x) T_SIZE(%08x)\n", s_binaryInfo.pc, s_binaryInfo.text_addr,
379381
s_binaryInfo.text_size);
380382
psxprintf("boot address : %08x %08x\nExecute !\n\n", s_binaryInfo.pc, s_configuration.stackBase);
381-
s_binaryInfo.stack_start = s_configuration.stackBase;
383+
s_binaryInfo.stack_start = (uintptr_t)s_configuration.stackBase;
382384
s_binaryInfo.stack_size = 0;
383385
// the original format string says S_SIZE(%08), which is obviously wrong...
384386
psxprintf(" S_ADDR(%08x) S_SIZE(%08x)\n", s_configuration.stackBase, 0);

‎src/mips/openbios/patches/hash.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ static inline uint32_t hashone(uint32_t a) {
3737
return a;
3838
}
3939

40-
uint32_t patch_hash(const uint32_t* ptr, uint8_t* maskPtr, unsigned len) {
40+
uint32_t patch_hash(const uint32_t* ptr, const void* maskPtr_, unsigned len) {
41+
const uint8_t* maskPtr = (const uint8_t*)maskPtr_;
4142
uint32_t hash = 0x5810d659;
4243
uint32_t mask = 1;
4344

‎src/mips/openbios/patches/hash.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@ SOFTWARE.
2828

2929
#include <stdint.h>
3030

31-
uint32_t patch_hash(const uint32_t* ptr, uint8_t* mask, unsigned len);
31+
uint32_t patch_hash(const uint32_t* ptr, const void* mask, unsigned len);

‎src/mips/openbios/patches/patch_pad_1.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,13 +99,13 @@ enum patch_behavior patch_pad_1_execute(uint32_t *ra) {
9999
ptr <<= 16;
100100
addend = ra[4] & 0xffff;
101101
ptr += addend;
102-
*((uint32_t *)ptr) = patch_startPad;
102+
*((uint32_t *)ptr) = (uint32_t)patch_startPad;
103103

104104
ptr = ra[6] & 0xffff;
105105
ptr <<= 16;
106106
addend = ra[7] & 0xffff;
107107
ptr += addend;
108-
*((uint32_t *)ptr) = patch_stopPad;
108+
*((uint32_t *)ptr) = (uint32_t)patch_stopPad;
109109

110110
ra[2] = 11 | 0x10000000;
111111
ra[3] = 0;

‎src/mips/openbios/patches/patch_pad_2.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,13 +98,13 @@ enum patch_behavior patch_pad_2_execute(uint32_t *ra) {
9898
ptr <<= 16;
9999
addend = ra[3] & 0xffff;
100100
ptr += addend;
101-
*((uint32_t *)ptr) = patch_startPad;
101+
*((uint32_t *)ptr) = (uint32_t)patch_startPad;
102102

103103
ptr = ra[4] & 0xffff;
104104
ptr <<= 16;
105105
addend = ra[7] & 0xffff;
106106
ptr += addend;
107-
*((uint32_t *)ptr) = patch_stopPad;
107+
*((uint32_t *)ptr) = (uint32_t)patch_stopPad;
108108

109109
ra[2] = 10 | 0x10000000;
110110
ra[3] = 0;

‎src/mips/openbios/patches/patches.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,9 +169,9 @@ void patch_hook(uint32_t* ra, enum patch_table table) {
169169
// already patched, bail out
170170
if ((ra[0] == 0) && (ra[1] == 0) && (ra[3] == 0)) return;
171171

172-
uint32_t* hash_mask = NULL;
172+
const uint32_t* hash_mask = NULL;
173173

174-
struct patch* patches = NULL;
174+
const struct patch* patches = NULL;
175175
unsigned size = 0;
176176
char t = 'x';
177177
switch (table) {

‎src/mips/openbios/patches/send_pad_1.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ enum patch_behavior send_pad_1_execute(uint32_t* ra) {
116116
ptr <<= 16;
117117
addend = ra[8] & 0xffff;
118118
ptr += addend;
119-
*((uint32_t*)ptr) = patch_setPadOutputData;
119+
*((uint32_t*)ptr) = (uint32_t)patch_setPadOutputData;
120120

121121
ra[2] = 15 | 0x10000000;
122122
ra[3] = 0;

‎src/mips/openbios/patches/send_pad_2.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ enum patch_behavior send_pad_2_execute(uint32_t* ra) {
115115
ptr <<= 16;
116116
addend = ra[7] & 0xffff;
117117
ptr += addend;
118-
*((uint32_t*)ptr) = patch_setPadOutputData;
118+
*((uint32_t*)ptr) = (uint32_t)patch_setPadOutputData;
119119

120120
ra[2] = 12 | 0x10000000;
121121
ra[3] = 0;

‎src/mips/openbios/tty/tty.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,12 @@ static const struct Device s_ttyDevice = {
6060
.write = psxdummy,
6161
.erase = psxdummy,
6262
.undelete = psxdummy,
63-
.firstFile = psxdummy,
64-
.nextFile = psxdummy,
63+
.firstFile = (struct DirEntry * (*)(struct File *, const char *, struct DirEntry *)) psxdummy,
64+
.nextFile = (struct DirEntry * (*)(struct File *, struct DirEntry *)) psxdummy,
6565
.format = psxdummy,
6666
.chdir = psxdummy,
6767
.rename = psxdummy,
68-
.deinit = psxdummy,
68+
.deinit = (void (*)())psxdummy,
6969
.check = psxdummy,
7070
};
7171

@@ -76,7 +76,7 @@ static const struct Device s_dummyDevice = {
7676
.flags = 1,
7777
.blockSize = 1,
7878
.desc = "CONSOLE",
79-
.init = psxdummy,
79+
.init = (void (*)()) psxdummy,
8080
.open = psxdummy,
8181
.action = psxdummy,
8282
.close = psxdummy,
@@ -85,12 +85,12 @@ static const struct Device s_dummyDevice = {
8585
.write = psxdummy,
8686
.erase = psxdummy,
8787
.undelete = psxdummy,
88-
.firstFile = psxdummy,
89-
.nextFile = psxdummy,
88+
.firstFile = (struct DirEntry * (*)(struct File *, const char *, struct DirEntry *)) psxdummy,
89+
.nextFile = (struct DirEntry * (*)(struct File *, struct DirEntry *)) psxdummy,
9090
.format = psxdummy,
9191
.chdir = psxdummy,
9292
.rename = psxdummy,
93-
.deinit = psxdummy,
93+
.deinit = (void (*)())psxdummy,
9494
.check = psxdummy,
9595
};
9696

‎tools/linux-mips/spawn-compiler.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ make
2121
make install-strip
2222
cd ..
2323

24-
wget https://ftp.gnu.org/gnu/gcc/gcc-13.2.0/gcc-13.2.0.tar.gz
25-
tar xvfz gcc-13.2.0.tar.gz
26-
cd gcc-13.2.0
24+
wget https://ftp.gnu.org/gnu/gcc/gcc-14.1.0/gcc-14.1.0.tar.gz
25+
tar xvfz gcc-14.1.0.tar.gz
26+
cd gcc-14.1.0
2727
./contrib/download_prerequisites
2828
mkdir build
2929
cd build

‎tools/macos-mips/mipsel-none-elf-gcc.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
class MipselNoneElfGcc < Formula
22
desc "The GNU compiler collection for mipsel"
33
homepage "https://gcc.gnu.org"
4-
url "https://ftp.gnu.org/gnu/gcc/gcc-13.2.0/gcc-13.2.0.tar.xz"
5-
sha256 "e275e76442a6067341a27f04c5c6b83d8613144004c0413528863dc6b5c743da"
4+
url "https://ftp.gnu.org/gnu/gcc/gcc-14.1.0/gcc-14.1.0.tar.xz"
5+
sha256 "e283c654987afe3de9d8080bc0bd79534b5ca0d681a73a11ff2b5d3767426840"
66

77
depends_on "gmp"
88
depends_on "mipsel-none-elf-binutils"

‎tools/vscode-extension/scripts/mipsel-none-elf-gcc.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
class MipselNoneElfGcc < Formula
22
desc "The GNU compiler collection for mipsel"
33
homepage "https://gcc.gnu.org"
4-
url "https://ftp.gnu.org/gnu/gcc/gcc-13.2.0/gcc-13.2.0.tar.xz"
5-
sha256 "e275e76442a6067341a27f04c5c6b83d8613144004c0413528863dc6b5c743da"
4+
url "https://ftp.gnu.org/gnu/gcc/gcc-14.1.0/gcc-14.1.0.tar.xz"
5+
sha256 "e283c654987afe3de9d8080bc0bd79534b5ca0d681a73a11ff2b5d3767426840"
66

77
depends_on "gmp"
88
depends_on "mipsel-none-elf-binutils"

‎tools/vscode-extension/scripts/mipsel-none-elf-gdb.rb

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
class MipselNoneElfGdb < Formula
2+
desc "GDB: The GNU Project Debugger compiled for Mips"
3+
homepage "https://sourceware.org/gdb/"
4+
url "https://ftp.gnu.org/gnu/gdb/gdb-14.2.tar.xz"
5+
sha256 "2d4dd8061d8ded12b6c63f55e45344881e8226105f4d2a9b234040efa5ce7772"
6+
7+
# inspired by https://github.com/orgs/Homebrew/discussions/1114#discussioncomment-8863715
8+
9+
depends_on "texinfo" => :build
10+
depends_on "gmp"
11+
depends_on "mpfr"
12+
depends_on "python@3.10"
13+
14+
def install
15+
mkdir "mipsel-none-elf-gdb-build" do
16+
system "../configure", "--target=mipsel-none-elf",
17+
"--prefix=#{prefix}",
18+
"--enable-tui=yes",
19+
"--without-isl",
20+
"--disable-werror"
21+
system "make"
22+
system "make", "install"
23+
end
24+
end
25+
26+
# not sure what to test...
27+
# test do
28+
# assert_match "f()", shell_output("#{bin}/mipsel-none-elf-c++filt _Z1fv")
29+
# end
30+
31+
end

‎tools/win32-gdb/Dockerfile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# escape=`
22

3-
# Dockerfile to generate the Windows gdb-multiarch-14.1.zip package.
3+
# Dockerfile to generate the Windows gdb-multiarch-14.2.zip package.
44

55
FROM mcr.microsoft.com/windows/servercore:ltsc2022
66
WORKDIR C:\windows\temp
@@ -45,23 +45,23 @@ RUN C:\msys64\usr\bin\bash.exe -l -c 'pacman -S --needed --noconfirm mingw-w64-x
4545
RUN C:\msys64\usr\bin\bash.exe -l -c 'pacman -S --needed --noconfirm mingw-w64-x86_64-python mingw-w64-x86_64-readline'
4646
RUN C:\msys64\usr\bin\bash.exe -l -c 'pacman -Scc --noconfirm'
4747

48-
ARG GDB=https://ftp.gnu.org/gnu/gdb/gdb-14.1.tar.xz
48+
ARG GDB=https://ftp.gnu.org/gnu/gdb/gdb-14.2.tar.xz
4949

5050
RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; `
51-
Invoke-WebRequest $env:GDB -OutFile "C:\Windows\Temp\gdb-14.1.tar.xz"; `
52-
Start-Process -FilePath "C:\7-Zip\7z.exe" -ArgumentList e, "C:\Windows\Temp\gdb-14.1.tar.xz", `-oC:\Windows\Temp\ -NoNewWindow -PassThru -Wait; `
53-
Start-Process -FilePath "C:\7-Zip\7z.exe" -ArgumentList x, "C:\Windows\Temp\gdb-14.1.tar", `-oC:\ -NoNewWindow -PassThru -Wait; `
51+
Invoke-WebRequest $env:GDB -OutFile "C:\Windows\Temp\gdb-14.2.tar.xz"; `
52+
Start-Process -FilePath "C:\7-Zip\7z.exe" -ArgumentList e, "C:\Windows\Temp\gdb-14.2.tar.xz", `-oC:\Windows\Temp\ -NoNewWindow -PassThru -Wait; `
53+
Start-Process -FilePath "C:\7-Zip\7z.exe" -ArgumentList x, "C:\Windows\Temp\gdb-14.2.tar", `-oC:\ -NoNewWindow -PassThru -Wait; `
5454
Remove-Item @('C:\Windows\Temp\*', 'C:\Users\*\Appdata\Local\Temp\*') -Force -Recurse;
5555

5656
ENV MSYSTEM MINGW64
5757

58-
RUN C:\msys64\usr\bin\bash.exe -l -c 'mkdir /BUILD && cd /BUILD && /c/gdb-14.1/configure --disable-gdbtk --disable-shared --disable-readline --with-system-readline --with-expat --with-system-zlib --without-guile --without-babeltrace --enable-tui --with-lzma --without-python --with-xxhash --with-mpfr=/mingw64 --enable-64-bit-bfd --enable-targets=all --disable-sim --prefix=/DIST || (cat /BUILD/config.log && exit 1)'
58+
RUN C:\msys64\usr\bin\bash.exe -l -c 'mkdir /BUILD && cd /BUILD && /c/gdb-14.2/configure --disable-gdbtk --disable-shared --disable-readline --with-system-readline --with-expat --with-system-zlib --without-guile --without-babeltrace --enable-tui --with-lzma --without-python --with-xxhash --with-mpfr=/mingw64 --enable-64-bit-bfd --enable-targets=all --disable-sim --prefix=/DIST || (cat /BUILD/config.log && exit 1)'
5959

6060
RUN C:\msys64\usr\bin\bash.exe -l -c 'LOADLIBES=-lws2_32\ -lbcrypt make -C /BUILD all'
6161
RUN C:\msys64\usr\bin\bash.exe -l -c 'make -C /BUILD install-strip'
6262
RUN C:\msys64\usr\bin\bash.exe -l -c 'cd /DIST/bin && ldd *.exe | cut -f2 -d\> | cut -f2 -d\ | grep mingw64 | while read f ; do cp $f . ; done'
63-
RUN C:\msys64\usr\bin\bash.exe -l -c 'cp /c/gdb-14.1/COPYING* /DIST'
63+
RUN C:\msys64\usr\bin\bash.exe -l -c 'cp /c/gdb-14.2/COPYING* /DIST'
6464
RUN C:\msys64\usr\bin\bash.exe -l -c 'cp /DIST/bin/gdb.exe /DIST/bin/gdb-multiarch.exe'
65-
RUN C:\msys64\usr\bin\bash.exe -l -c 'cd /DIST && zip /c/gdb-multiarch-14.1.zip . -r'
65+
RUN C:\msys64\usr\bin\bash.exe -l -c 'cd /DIST && zip /c/gdb-multiarch-14.2.zip . -r'
6666

6767
CMD C:\msys64\usr\bin\bash.exe -l

0 commit comments

Comments
 (0)